PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

Remove globals

This commit is contained in:
Qball Cow 2014-05-26 10:32:26 +02:00
parent e63de1220a
commit dfa2915ef0
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/rofi.c
View File

@ -139,7 +139,7 @@ static char **tokenize ( const char *input )
char **tr = realloc ( retv, sizeof ( char* ) * ( num_tokens + 2 ) ); char **tr = realloc ( retv, sizeof ( char* ) * ( num_tokens + 2 ) );
if ( tr != NULL ) if ( tr != NULL )
{ {
retv = tr; retv = tr;
retv[num_tokens + 1] = NULL; retv[num_tokens + 1] = NULL;
retv[num_tokens] = token; retv[num_tokens] = token;
num_tokens++; num_tokens++;
@ -258,11 +258,9 @@ static void find_arg_int ( int argc, char *argv[], char *key, unsigned int *val
unsigned int NumlockMask = 0; unsigned int NumlockMask = 0;
Display *display = NULL; Display *display = NULL;
Screen *screen; //Window root;
Window root;
int screen_id;
static int ( *xerror )( Display *, XErrorEvent * ); static int ( *xerror )( Display *, XErrorEvent * );
#define ATOM_ENUM( x ) x #define ATOM_ENUM( x ) x
#define ATOM_CHAR( x ) # x #define ATOM_CHAR( x ) # x
@ -414,6 +412,7 @@ typedef struct
// malloc a pixel value for an X named color // malloc a pixel value for an X named color
static unsigned int color_get ( const char *const name ) static unsigned int color_get ( const char *const name )
{ {
int screen_id = DefaultScreen ( display );
XColor color; XColor color;
Colormap map = DefaultColormap ( display, screen_id ); Colormap map = DefaultColormap ( display, screen_id );
return XAllocNamedColor ( display, map, name, &color, &color ) ? color.pixel : None; return XAllocNamedColor ( display, map, name, &color, &color ) ? color.pixel : None;
@ -640,7 +639,8 @@ void monitor_dimensions ( Screen *screen, int x, int y, workarea *mon )
// determine which monitor holds the active window, or failing that the mouse pointer // determine which monitor holds the active window, or failing that the mouse pointer
void monitor_active ( workarea *mon ) void monitor_active ( workarea *mon )
{ {
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) ); Screen *screen = DefaultScreenOfDisplay ( display );
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) );
#if 0 #if 0
// Comment this code out as it seems to break things. // Comment this code out as it seems to break things.
@ -1061,6 +1061,8 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
} }
else else
{ {
Screen *screen = DefaultScreenOfDisplay ( display );
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) );
box = XCreateSimpleWindow ( display, root, x, 0, w, 300, box = XCreateSimpleWindow ( display, root, x, 0, w, 300,
config.menu_bw, color_get ( config.menu_bc ), config.menu_bw, color_get ( config.menu_bc ),
color_get ( config.menu_bg ) ); color_get ( config.menu_bg ) );
@ -1545,7 +1547,9 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
SwitcherMode run_switcher_window ( char **input ) SwitcherMode run_switcher_window ( char **input )
{ {
SwitcherMode retv = MODE_EXIT; Screen *screen = DefaultScreenOfDisplay ( display );
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) );
SwitcherMode retv = MODE_EXIT;
// find window list // find window list
Atom type; Atom type;
int nwins; int nwins;
@ -1868,6 +1872,8 @@ void parse_key ( char *combo, unsigned int *mod, KeySym *key )
// bind a key combination on a root window, compensating for Lock* states // bind a key combination on a root window, compensating for Lock* states
void grab_key ( unsigned int modmask, KeySym key ) void grab_key ( unsigned int modmask, KeySym key )
{ {
Screen *screen = DefaultScreenOfDisplay ( display );
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) );
KeyCode keycode = XKeysymToKeycode ( display, key ); KeyCode keycode = XKeysymToKeycode ( display, key );
XUngrabKey ( display, keycode, AnyModifier, root ); XUngrabKey ( display, keycode, AnyModifier, root );
@ -1894,8 +1900,11 @@ void grab_key ( unsigned int modmask, KeySym key )
#ifdef HAVE_I3_IPC_H #ifdef HAVE_I3_IPC_H
static inline void display_get_i3_path ( Display *display ) static inline void display_get_i3_path ( Display *display )
{ {
Screen *screen = DefaultScreenOfDisplay ( display );
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) );
Atom atom = XInternAtom ( display, I3_SOCKET_PATH_PROP, True );
config_i3_mode = 0; config_i3_mode = 0;
Atom atom = XInternAtom ( display, I3_SOCKET_PATH_PROP, True );
if ( atom != None ) if ( atom != None )
{ {
@ -2128,9 +2137,7 @@ int main ( int argc, char *argv[] )
// Set up X interaction. // Set up X interaction.
signal ( SIGCHLD, catch_exit ); signal ( SIGCHLD, catch_exit );
screen = DefaultScreenOfDisplay ( display );
screen_id = DefaultScreen ( display );
root = DefaultRootWindow ( display );
// Set error handle // Set error handle
XSync ( display, False ); XSync ( display, False );
xerror = XSetErrorHandler ( display_oops ); xerror = XSetErrorHandler ( display_oops );

2
source/textbox.c
View File

@ -73,7 +73,7 @@ textbox* textbox_create ( Window parent,
tb->w = MAX ( 1, w ); tb->w = MAX ( 1, w );
tb->h = MAX ( 1, h ); tb->h = MAX ( 1, h );
unsigned int cp = ( tbft == NORMAL ) ? color_bg.pixel : color_hlbg.pixel; unsigned int cp = ( tbft == NORMAL ) ? color_bg.pixel : color_hlbg.pixel;
tb->window = XCreateSimpleWindow ( display, tb->parent, tb->x, tb->y, tb->w, tb->h, 0, None, cp ); tb->window = XCreateSimpleWindow ( display, tb->parent, tb->x, tb->y, tb->w, tb->h, 0, None, cp );