PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-07-31 21:59:25 -04:00
Code Releases Activity

Remove globals

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

21
source/rofi.c
View file

@ -258,9 +258,7 @@ static void find_arg_int ( int argc, char *argv[], char *key, unsigned int *val
unsigned int NumlockMask = 0;
Display *display = NULL;
Screen *screen;
Window root;
int screen_id;
//Window root;
static int ( *xerror )( Display *, XErrorEvent * );
@ -414,6 +412,7 @@ typedef struct
// malloc a pixel value for an X named color
static unsigned int color_get ( const char *const name )
{
int screen_id = DefaultScreen ( display );
XColor color;
Colormap map = DefaultColormap ( display, screen_id );
return XAllocNamedColor ( display, map, name, &color, &color ) ? color.pixel : None;
@ -640,6 +639,7 @@ void monitor_dimensions ( Screen *screen, int x, int y, workarea *mon )
// determine which monitor holds the active window, or failing that the mouse pointer
void monitor_active ( workarea *mon )
{
Screen *screen = DefaultScreenOfDisplay ( display );
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) );
#if 0
@ -1061,6 +1061,8 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
}
else
{
Screen *screen = DefaultScreenOfDisplay ( display );
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) );
box = XCreateSimpleWindow ( display, root, x, 0, w, 300,
config.menu_bw, color_get ( config.menu_bc ),
color_get ( config.menu_bg ) );
@ -1545,6 +1547,8 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
SwitcherMode run_switcher_window ( char **input )
{
Screen *screen = DefaultScreenOfDisplay ( display );
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) );
SwitcherMode retv = MODE_EXIT;
// find window list
Atom type;
@ -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
void grab_key ( unsigned int modmask, KeySym key )
{
Screen *screen = DefaultScreenOfDisplay ( display );
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) );
KeyCode keycode = XKeysymToKeycode ( display, key );
XUngrabKey ( display, keycode, AnyModifier, root );
@ -1894,9 +1900,12 @@ void grab_key ( unsigned int modmask, KeySym key )
#ifdef HAVE_I3_IPC_H
static inline void display_get_i3_path ( Display *display )
{
config_i3_mode = 0;
Screen *screen = DefaultScreenOfDisplay ( display );
Window root = RootWindow ( display, XScreenNumberOfScreen ( screen ) );
Atom atom = XInternAtom ( display, I3_SOCKET_PATH_PROP, True );
config_i3_mode = 0;
if ( atom != None )
{
i3_socket_path = window_get_text_prop ( root, atom );
@ -2128,9 +2137,7 @@ int main ( int argc, char *argv[] )
// Set up X interaction.
signal ( SIGCHLD, catch_exit );
screen = DefaultScreenOfDisplay ( display );
screen_id = DefaultScreen ( display );
root = DefaultRootWindow ( display );
// Set error handle
XSync ( display, False );
xerror = XSetErrorHandler ( display_oops );