1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-25 13:55:34 -05:00

Cleanup, integrate opacity.

This commit is contained in:
Dave Davenport 2014-06-05 08:11:01 +02:00
parent 9fbd7fc99c
commit d361b6c445
2 changed files with 5 additions and 10 deletions

View file

@ -142,6 +142,4 @@ int token_match ( char **tokens, const char *input,
__attribute__( ( unused ) ) int index, __attribute__( ( unused ) ) int index,
__attribute__( ( unused ) ) void *data ); __attribute__( ( unused ) ) void *data );
void config_sanity_check ( void );
void config_print ( void );
#endif #endif

View file

@ -67,12 +67,8 @@
#include "xrmoptions.h" #include "xrmoptions.h"
#define LINE_MARGIN 4 #define LINE_MARGIN 4
#define OPAQUE 0xffffffff
#define OPACITY "_NET_WM_WINDOW_OPACITY"
#ifdef HAVE_I3_IPC_H #ifdef HAVE_I3_IPC_H
#define I3_SOCKET_PATH_PROP "I3_SOCKET_PATH" #define I3_SOCKET_PATH_PROP "I3_SOCKET_PATH"
// This setting is no longer user configurable, but partial to this file: // This setting is no longer user configurable, but partial to this file:
@ -256,7 +252,8 @@ static int ( *xerror )( Display *, XErrorEvent * );
X ( _NET_WM_STATE_SKIP_TASKBAR ), \ X ( _NET_WM_STATE_SKIP_TASKBAR ), \
X ( _NET_WM_STATE_SKIP_PAGER ), \ X ( _NET_WM_STATE_SKIP_PAGER ), \
X ( _NET_WM_STATE_ABOVE ), \ X ( _NET_WM_STATE_ABOVE ), \
X ( _NET_WM_DESKTOP ) X ( _NET_WM_DESKTOP ), \
X ( _NET_WM_WINDOW_OPACITY )
enum { EWMH_ATOMS ( ATOM_ENUM ), NETATOMS }; enum { EWMH_ATOMS ( ATOM_ENUM ), NETATOMS };
const char *netatom_names[] = { EWMH_ATOMS ( ATOM_CHAR ) }; const char *netatom_names[] = { EWMH_ATOMS ( ATOM_CHAR ) };
@ -957,8 +954,8 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
XStoreName ( display, box, "rofi" ); XStoreName ( display, box, "rofi" );
// Hack to set window opacity. // Hack to set window opacity.
unsigned int opacity_set = ( unsigned int ) ( ( config.window_opacity / 100.0 ) * OPAQUE ); unsigned int opacity_set = ( unsigned int ) ( ( config.window_opacity / 100.0 ) * UINT32_MAX);
XChangeProperty ( display, box, XInternAtom ( display, OPACITY, False ), XChangeProperty ( display, box, netatoms[_NET_WM_WINDOW_OPACITY],
XA_CARDINAL, 32, PropModeReplace, XA_CARDINAL, 32, PropModeReplace,
( unsigned char * ) &opacity_set, 1L ); ( unsigned char * ) &opacity_set, 1L );
} }
@ -1886,7 +1883,7 @@ static void cleanup ()
* *
* This functions exits the program with 1 when it finds an invalid configuration. * This functions exits the program with 1 when it finds an invalid configuration.
*/ */
void config_sanity_check ( void ) static void config_sanity_check ( void )
{ {
if ( config.menu_lines == 0 ) { if ( config.menu_lines == 0 ) {
fprintf ( stderr, "config.menu_lines is invalid. You need at least one visible line.\n" ); fprintf ( stderr, "config.menu_lines is invalid. You need at least one visible line.\n" );