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

Small move

This commit is contained in:
QC 2015-02-14 19:42:04 +01:00
parent 8347963ed8
commit b6652a0221
3 changed files with 65 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/x11-helper.h
View File

@ -115,4 +115,21 @@ void x11_set_window_opacity ( Display *display, Window box, unsigned int opacity
* * Cache
*/
void x11_setup ( Display *display );
/**
* @param display Connection to the X server.
*
* This function tries to create a 32bit TrueColor colormap.
* If this fails, it falls back to the default for the connected display.
*/
void create_visual_and_colormap ( Display *display );
/**
* @param display Connection to the X server.
* @param name String representing the color.
*
* Allocate a pixel value for an X named color
*/
unsigned int color_get ( Display *display, const char *const name );
#endif

59
source/rofi.c
View File

@ -44,11 +44,11 @@
#include <sys/wait.h>
#include <sys/types.h>
#include "helper.h"
#include "x11-helper.h"
#include "rofi.h"
#include "xrmoptions.h"
#include "helper.h"
#include "textbox.h"
#include "x11-helper.h"
#include "xrmoptions.h"
// Switchers.
#include "dialogs/run-dialog.h"
#include "dialogs/ssh-dialog.h"
@ -130,59 +130,6 @@ Window main_window = None;
GC gc = NULL;
Colormap map = None;
XVisualInfo vinfo;
int truecolor = FALSE;
/**
* @param display Connection to the X server.
*
* This function tries to create a 32bit TrueColor colormap.
* If this fails, it falls back to the default for the connected display.
*/
static void create_visual_and_colormap ( Display *display )
{
int screen = DefaultScreen ( display );
// Try to create TrueColor map
if ( XMatchVisualInfo ( display, screen, 32, TrueColor, &vinfo ) ) {
// Visual found, lets try to create map.
map = XCreateColormap ( display, DefaultRootWindow ( display ), vinfo.visual, AllocNone );
truecolor = TRUE;
}
// Failed to create map.
// Use the defaults then.
if ( map == None ) {
truecolor = FALSE;
// Two fields we use.
vinfo.visual = DefaultVisual ( display, screen );
vinfo.depth = DefaultDepth ( display, screen );
map = DefaultColormap ( display, screen );
}
}
/**
* @param display Connection to the X server.
* @param name String representing the color.
*
* Allocate a pixel value for an X named color
*/
static unsigned int color_get ( Display *display, const char *const name )
{
XColor color = { 0, 0, 0, 0, 0, 0 };
// Special format.
if ( strncmp ( name, "argb:", 5 ) == 0 ) {
color.pixel = strtoul ( &name[5], NULL, 16 );
color.red = ( ( color.pixel & 0x00FF0000 ) >> 16 ) * 255;
color.green = ( ( color.pixel & 0x0000FF00 ) >> 8 ) * 255;
color.blue = ( ( color.pixel & 0x000000FF ) ) * 255;
if ( !truecolor ) {
// This will drop alpha part.
return XAllocColor ( display, map, &color ) ? color.pixel : None;
}
return color.pixel;
}
else {
return XAllocNamedColor ( display, map, name, &color, &color ) ? color.pixel : None;
}
}
/**
* @param display Connection to the X server.

45
source/x11-helper.c
View File

@ -407,3 +407,48 @@ void x11_setup ( Display *display )
x11_figure_out_numlock_mask ( display );
x11_create_frequently_used_atoms ( display );
}
extern Colormap map;
extern XVisualInfo vinfo;
int truecolor = FALSE;
void create_visual_and_colormap ( Display *display )
{
int screen = DefaultScreen ( display );
// Try to create TrueColor map
if ( XMatchVisualInfo ( display, screen, 32, TrueColor, &vinfo ) ) {
// Visual found, lets try to create map.
map = XCreateColormap ( display, DefaultRootWindow ( display ), vinfo.visual, AllocNone );
truecolor = TRUE;
}
// Failed to create map.
// Use the defaults then.
if ( map == None ) {
truecolor = FALSE;
// Two fields we use.
vinfo.visual = DefaultVisual ( display, screen );
vinfo.depth = DefaultDepth ( display, screen );
map = DefaultColormap ( display, screen );
}
}
unsigned int color_get ( Display *display, const char *const name )
{
XColor color = { 0, 0, 0, 0, 0, 0 };
// Special format.
if ( strncmp ( name, "argb:", 5 ) == 0 ) {
color.pixel = strtoul ( &name[5], NULL, 16 );
color.red = ( ( color.pixel & 0x00FF0000 ) >> 16 ) * 255;
color.green = ( ( color.pixel & 0x0000FF00 ) >> 8 ) * 255;
color.blue = ( ( color.pixel & 0x000000FF ) ) * 255;
if ( !truecolor ) {
// This will drop alpha part.
return XAllocColor ( display, map, &color ) ? color.pixel : None;
}
return color.pixel;
}
else {
return XAllocNamedColor ( display, map, name, &color, &color ) ? color.pixel : None;
}
}