Hi, I am sending this mail with the patch gziped because my email server is down. I have a lot of parches here, but I think this should be de first, because is simply dead code.
Cheers, kix >From d3cca5c5421cfc40b3ad617b68d979a6bc910b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]> Date: Wed, 27 Mar 2013 00:51:59 +0100 Subject: [PATCH] Removed old window clip balloon code This code was used to create the window where the workspace name was showed to the user. The code now use the standar balloon system, therefore this code is not used anymore and can be removed. --- src/defaults.c | 7 +------ src/screen.c | 17 ----------------- src/screen.h | 2 -- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/defaults.c b/src/defaults.c index f04e9be..ddb5b12 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -2383,12 +2383,7 @@ static int setIconTile(WScreen * scr, WDefaultEntry * entry, WTexture ** texture scr->icon_back_texture = wTextureMakeSolid(scr, &((*texture)->any.color)); - if (scr->clip_balloon) - XSetWindowBackground(dpy, scr->clip_balloon, (*texture)->any.color.pixel); - - /* - * Free the texture as nobody else will use it, nor refer to it. - */ + /* Free the texture as nobody else will use it, nor refer to it. */ if (!entry->addr) wTextureDestroy(scr, *texture); diff --git a/src/screen.c b/src/screen.c index bc8f3fa..b462337 100644 --- a/src/screen.c +++ b/src/screen.c @@ -465,17 +465,6 @@ static void createInternalWindows(WScreen * scr) XCreateWindow(dpy, scr->root_win, 0, 0, wPreferences.icon_size, wPreferences.icon_size, 0, scr->w_depth, CopyFromParent, scr->w_visual, vmask, &attribs); - /* workspace name balloon for clip */ - vmask = CWBackPixel | CWSaveUnder | CWOverrideRedirect | CWColormap | CWBorderPixel; - attribs.save_under = True; - attribs.override_redirect = True; - attribs.colormap = scr->w_colormap; - attribs.background_pixel = scr->icon_back_texture->normal.pixel; - attribs.border_pixel = 0; /* do not care */ - scr->clip_balloon = - XCreateWindow(dpy, scr->root_win, 0, 0, 10, 10, 0, scr->w_depth, - CopyFromParent, scr->w_visual, vmask, &attribs); - /* workspace name */ vmask = CWBackPixel | CWSaveUnder | CWOverrideRedirect | CWColormap | CWBorderPixel; attribs.save_under = True; @@ -486,12 +475,6 @@ static void createInternalWindows(WScreen * scr) scr->workspace_name = XCreateWindow(dpy, scr->root_win, 0, 0, 10, 10, 0, scr->w_depth, CopyFromParent, scr->w_visual, vmask, &attribs); - - /* - * If the window is clicked without having ButtonPress selected, the - * resulting event will have event.xbutton.window == root. - */ - XSelectInput(dpy, scr->clip_balloon, ButtonPressMask); } /* diff --git a/src/screen.h b/src/screen.h index 52a0c42..84fa42b 100644 --- a/src/screen.h +++ b/src/screen.h @@ -224,8 +224,6 @@ typedef struct _WScreen { WAppIconChain *global_icons; /* for omnipresent icons chain in clip */ int global_icon_count; /* How many global icons do we have */ - Window clip_balloon; /* window for workspace name */ - int keymove_tick; struct RContext *rcontext; /* wrlib context */ -- 1.7.10.4 -- Rodolfo García "kix" http://www.kix.es/ ham: EA4ERH @ IN80ER
0001-Removed-old-window-clip-balloon-code.patch.gz
Description: GNU Zip compressed data
