wcore set vmask in one step
authorRodolfo García Peñas (kix) <kix@kix.es>
Sat, 6 Oct 2012 16:18:43 +0000 (6 18:18 +0200)
committerCarlos R. Mafra <crmafra@gmail.com>
Mon, 8 Oct 2012 14:17:15 +0000 (8 15:17 +0100)
This patch set the vmask in one line.

- vmask = CWBorderPixel | CWCursor | CWEventMask | CWOverrideRedirect;
- vmask |= CWColormap;

Is similar to:

+ vmask = CWBorderPixel | CWCursor | CWEventMask | CWOverrideRedirect | CWColormap;

And vmask is not used between the two original lines, therefore we can do the
initialization in only one line.

src/wcore.c

index ce57942..1abe842 100644 (file)
@@ -51,7 +51,7 @@ WCoreWindow *wCoreCreateTopLevel(WScreen *screen, int x, int y, int width, int h
 
        core = wmalloc(sizeof(WCoreWindow));
 
-       vmask = CWBorderPixel | CWCursor | CWEventMask | CWOverrideRedirect;
+       vmask = CWBorderPixel | CWCursor | CWEventMask | CWOverrideRedirect | CWColormap;
        attribs.override_redirect = True;
        attribs.cursor = wCursor[WCUR_DEFAULT];
        attribs.background_pixmap = None;
@@ -61,7 +61,6 @@ WCoreWindow *wCoreCreateTopLevel(WScreen *screen, int x, int y, int width, int h
                             ButtonReleaseMask | ButtonMotionMask |
                             ExposureMask | EnterWindowMask | LeaveWindowMask;
 
-       vmask |= CWColormap;
        attribs.colormap = colormap;
 
        core->window = XCreateWindow(dpy, screen->root_win, x, y, width, height,
@@ -99,14 +98,13 @@ WCoreWindow *wCoreCreate(WCoreWindow *parent, int x, int y, int width, int heigh
 
        core = wmalloc(sizeof(WCoreWindow));
 
-       vmask = CWBorderPixel | CWCursor | CWEventMask;
+       vmask = CWBorderPixel | CWCursor | CWEventMask | CWColormap;
        attribs.cursor = wCursor[WCUR_DEFAULT];
        attribs.background_pixmap = None;
        attribs.background_pixel = parent->screen_ptr->black_pixel;
        attribs.event_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask |
                             ButtonReleaseMask | ButtonMotionMask |
                             ExposureMask | EnterWindowMask | LeaveWindowMask;
-       vmask |= CWColormap;
        attribs.colormap = parent->screen_ptr->w_colormap;
        core->window = XCreateWindow(dpy, parent->window, x, y, width, height, 0,
                          parent->screen_ptr->w_depth, CopyFromParent,