mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-21 05:18:06 +01:00
wmaker: Moved global var with list of cursors to the preferences variable
As the cursor choice for each action is actually a user choice, it is logical to put this into the structure, instead of a poorly defined 'extern' in every file.
This commit is contained in:
committed by
Carlos R. Mafra
parent
2c20413831
commit
b48b3370e2
@@ -30,8 +30,6 @@
|
||||
#include "wcore.h"
|
||||
|
||||
/****** Global Variables ******/
|
||||
/* cursors */
|
||||
extern Cursor wCursor[WCUR_LAST];
|
||||
extern XContext wWinContext;
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
@@ -51,7 +49,7 @@ WCoreWindow *wCoreCreateTopLevel(WScreen *screen, int x, int y, int width, int h
|
||||
|
||||
vmask = CWBorderPixel | CWCursor | CWEventMask | CWOverrideRedirect | CWColormap;
|
||||
attribs.override_redirect = True;
|
||||
attribs.cursor = wCursor[WCUR_DEFAULT];
|
||||
attribs.cursor = wPreferences.cursor[WCUR_DEFAULT];
|
||||
attribs.background_pixmap = None;
|
||||
attribs.background_pixel = screen->black_pixel;
|
||||
attribs.border_pixel = border_pixel;
|
||||
@@ -102,7 +100,7 @@ WCoreWindow *wCoreCreate(WCoreWindow *parent, int x, int y, int width, int heigh
|
||||
core = wmalloc(sizeof(WCoreWindow));
|
||||
|
||||
vmask = CWBorderPixel | CWCursor | CWEventMask | CWColormap;
|
||||
attribs.cursor = wCursor[WCUR_DEFAULT];
|
||||
attribs.cursor = wPreferences.cursor[WCUR_DEFAULT];
|
||||
attribs.background_pixmap = None;
|
||||
attribs.background_pixel = parent->screen_ptr->black_pixel;
|
||||
attribs.event_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask |
|
||||
|
||||
Reference in New Issue
Block a user