← Back to branch summary

~ubuntu-branches/debian/sid/openbox/sid

« back to all changes in this revision

Viewing changes to tests/icons.c

  • Committer: Bazaar Package Importer
  • Author(s): Nico Golde, Nico Golde, Eugenio Paolantonio
  • Date: 2011-10-03 22:59:30 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20111003225930-tdvyax5tx63dyoez
Tags: 3.5.0-1
http://bugs.debian.org/638783
http://bugs.debian.org/563891
http://bugs.debian.org/627912
[Nico Golde]
* New upstream release (Closes: #638783).
  - Fix crashes in the menu code (Closes: #563891).
* Add Brazilian translation to openbox.desktop,
  thanks Sérgio Cipolla (Closes: #627912).
* Remove 06_fix_swap_byte_order.patch, applied upstream.
* Bump debhelper dependency to >= 7.0.50~ due to override.
* Remove CHANGELOG from openbox.docs to prevent double installation.
* Add 02_fix_freedesktop_compliance.dpatch desktop file to
  /usr/share/applications.

[Eugenio Paolantonio]
* debian/patches:
  - Disabled 03_place_windows_in_quadrants.patch
  - Updated 01_rc.xml.patch and 06_fix_swap_byte_order.patch
  - Removed 04_fix_ftbfs_no-add-needed.patch and 20_24bits_support.patch
* debian/control:
  - Added myself to the Uploaders.
  - Build-Depends: removed libxau-dev, libxft-dev and python-xdg;
    added libimlib2-dev
  - openbox Suggests: added python-xdg
  - libobrender21 renamed to libobrender27
  - libobparser21 renamed to libobt0
* debian/rules:
  - Rewrote using a simpler debhelper syntax
  - Moved the install pass to openbox.install
* debian/*.{install,links,dirs}:
  - Updated.
* debian/openbox.xsession:
  - Removed. Openbox now ships it by default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/icons.c
70
70
    Pixmap p;
71
71
    Cursor cur;
72
72
    XEvent ev;
 
73
    unsigned int bs = sizeof(long);
73
74
 
74
75
    printf("Click on a window with an icon...\n");
75
76
 
132
133
        i[image]->byte_order = LSBFirst;
133
134
        i[image]->data = (char*)prop_return[image];
134
135
        for (j = 0; j < w*h; j++) {
135
 
            unsigned char alpha = (unsigned char)i[image]->data[j*4+3];
136
 
            unsigned char r = (unsigned char) i[image]->data[j*4+0];
137
 
            unsigned char g = (unsigned char) i[image]->data[j*4+1];
138
 
            unsigned char b = (unsigned char) i[image]->data[j*4+2];
 
136
            unsigned char alpha = (unsigned char)i[image]->data[j*bs+3];
 
137
            unsigned char r = (unsigned char) i[image]->data[j*bs+0];
 
138
            unsigned char g = (unsigned char) i[image]->data[j*bs+1];
 
139
            unsigned char b = (unsigned char) i[image]->data[j*bs+2];
139
140
 
140
141
            // background color
141
142
            unsigned char bgr = 0;