mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 12:28:22 +01:00
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.
This commit is contained in:
committed by
Carlos R. Mafra
parent
e47413eefd
commit
0da2b6e928
@@ -2394,12 +2394,7 @@ static int setIconTile(WScreen * scr, WDefaultEntry * entry, WTexture ** texture
|
|||||||
|
|
||||||
scr->icon_back_texture = wTextureMakeSolid(scr, &((*texture)->any.color));
|
scr->icon_back_texture = wTextureMakeSolid(scr, &((*texture)->any.color));
|
||||||
|
|
||||||
if (scr->clip_balloon)
|
/* Free the texture as nobody else will use it, nor refer to it. */
|
||||||
XSetWindowBackground(dpy, scr->clip_balloon, (*texture)->any.color.pixel);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Free the texture as nobody else will use it, nor refer to it.
|
|
||||||
*/
|
|
||||||
if (!entry->addr)
|
if (!entry->addr)
|
||||||
wTextureDestroy(scr, *texture);
|
wTextureDestroy(scr, *texture);
|
||||||
|
|
||||||
|
|||||||
17
src/screen.c
17
src/screen.c
@@ -465,17 +465,6 @@ static void createInternalWindows(WScreen * scr)
|
|||||||
XCreateWindow(dpy, scr->root_win, 0, 0, wPreferences.icon_size,
|
XCreateWindow(dpy, scr->root_win, 0, 0, wPreferences.icon_size,
|
||||||
wPreferences.icon_size, 0, scr->w_depth, CopyFromParent, scr->w_visual, vmask, &attribs);
|
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 */
|
/* workspace name */
|
||||||
vmask = CWBackPixel | CWSaveUnder | CWOverrideRedirect | CWColormap | CWBorderPixel;
|
vmask = CWBackPixel | CWSaveUnder | CWOverrideRedirect | CWColormap | CWBorderPixel;
|
||||||
attribs.save_under = True;
|
attribs.save_under = True;
|
||||||
@@ -486,12 +475,6 @@ static void createInternalWindows(WScreen * scr)
|
|||||||
scr->workspace_name =
|
scr->workspace_name =
|
||||||
XCreateWindow(dpy, scr->root_win, 0, 0, 10, 10, 0, scr->w_depth,
|
XCreateWindow(dpy, scr->root_win, 0, 0, 10, 10, 0, scr->w_depth,
|
||||||
CopyFromParent, scr->w_visual, vmask, &attribs);
|
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -229,8 +229,6 @@ typedef struct _WScreen {
|
|||||||
WAppIconChain *global_icons; /* for omnipresent icons chain in clip */
|
WAppIconChain *global_icons; /* for omnipresent icons chain in clip */
|
||||||
int global_icon_count; /* How many global icons do we have */
|
int global_icon_count; /* How many global icons do we have */
|
||||||
|
|
||||||
Window clip_balloon; /* window for workspace name */
|
|
||||||
|
|
||||||
int keymove_tick;
|
int keymove_tick;
|
||||||
struct RContext *rcontext; /* wrlib context */
|
struct RContext *rcontext; /* wrlib context */
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user