Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup indentation with clang-format and changed a few variable names

Browse Source
This commit is contained in:
o9000
2015-11-20 23:28:37 +01:00
parent c0e62e2e79
commit 4a6937826c
51 changed files with 4145 additions and 3789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/launcher/apps-common.c
View File

@@ -52,7 +52,9 @@ void expand_exec(DesktopEntry *entry, const char *path)
// %c -> Name
// %k -> path
if (entry->exec) {
char *exec2 = calloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) + (entry->icon ? strlen(entry->icon) : 1) + 100, 1);
char *exec2 = calloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) +
(entry->icon ? strlen(entry->icon) : 1) + 100,
1);
char *p, *q;
// p will never point to an escaped char
for (p = entry->exec, q = exec2; *p; p++, q++) {
@@ -63,12 +65,14 @@ void expand_exec(DesktopEntry *entry, const char *path)
if (*p == '%') // For % we delete the backslash, i.e. write % over it
q--;
*q = *p;
if (!*p) break;
if (!*p)
break;
continue;
}
if (*p == '%') {
p++;
if (!*p) break;
if (!*p)
break;
if (*p == 'i' && entry->icon != NULL) {
sprintf(q, "--icon '%s'", entry->icon);
q += strlen("--icon ''");
@@ -113,16 +117,19 @@ int read_desktop_file(const char *path, DesktopEntry *entry)
return 0;
}
gchar **languages = (gchar **)g_get_language_names();
const gchar **languages = (const gchar **)g_get_language_names();
// lang_index is the index of the language for the best Name key in the language vector
// lang_index_default is a constant that encodes the Name key without a language
int lang_index, lang_index_default;
#define LANG_DBG 0
if (LANG_DBG) printf("Languages:");
if (LANG_DBG)
printf("Languages:");
for (i = 0; languages[i]; i++) {
if (LANG_DBG) printf(" %s", languages[i]);
if (LANG_DBG)
printf(" %s", languages[i]);
}
if (LANG_DBG) printf("\n");
if (LANG_DBG)
printf("\n");
lang_index_default = i;
// we currently do not know about any Name key at all, so use an invalid index
lang_index = lang_index_default + 1;
@@ -160,7 +167,7 @@ int read_desktop_file(const char *path, DesktopEntry *entry)
}
}
}
fclose (fp);
fclose(fp);
// From this point:
// entry->name, entry->icon, entry->exec will never be empty strings (can be NULL though)

163
src/launcher/icon-theme-common.c
View File

@@ -38,7 +38,6 @@ typedef struct IconThemeDir {
int threshold;
} IconThemeDir;
int parse_theme_line(char *line, char **key, char **value)
{
return parse_dektop_line(line, key, value);
@@ -67,7 +66,7 @@ const GSList *get_icon_locations()
return icon_locations;
}
IconTheme *make_theme(char *name)
IconTheme *make_theme(const char *name)
{
IconTheme *theme = calloc(1, sizeof(IconTheme));
theme->name = strdup(name);
@@ -76,8 +75,8 @@ IconTheme *make_theme(char *name)
return theme;
}
//TODO Use UTF8 when parsing the file
IconTheme *load_theme_from_index(char *file_name, char *name)
// TODO Use UTF8 when parsing the file
IconTheme *load_theme_from_index(const char *file_name, const char *name)
{
IconTheme *theme;
FILE *f;
@@ -168,9 +167,8 @@ IconTheme *load_theme_from_index(char *file_name, char *name)
current_dir = NULL;
line[line_len - 1] = '\0';
char *dir_name = line + 1;
GSList* dir_item = theme->list_directories;
while (dir_item != NULL)
{
GSList *dir_item = theme->list_directories;
while (dir_item != NULL) {
IconThemeDir *dir = dir_item->data;
if (strcmp(dir->name, dir_name) == 0) {
current_dir = dir;
@@ -186,7 +184,7 @@ IconTheme *load_theme_from_index(char *file_name, char *name)
return theme;
}
void load_theme_from_fs_dir(IconTheme *theme, char *dir_name)
void load_theme_from_fs_dir(IconTheme *theme, const char *dir_name)
{
gchar *file_name = g_build_filename(dir_name, "index.theme", NULL);
if (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
@@ -226,12 +224,11 @@ void load_theme_from_fs_dir(IconTheme *theme, char *dir_name)
}
}
IconTheme *load_theme_from_fs(char *name, IconTheme *theme)
IconTheme *load_theme_from_fs(const char *name, IconTheme *theme)
{
gchar *dir_name = NULL;
const GSList *location;
for (location = get_icon_locations(); location; location = g_slist_next(location)) {
gchar *path = (gchar*) location->data;
for (const GSList *location = get_icon_locations(); location; location = g_slist_next(location)) {
gchar *path = (gchar *)location->data;
dir_name = g_build_filename(path, name, NULL);
if (g_file_test(dir_name, G_FILE_TEST_IS_DIR)) {
if (!theme) {
@@ -246,7 +243,7 @@ IconTheme *load_theme_from_fs(char *name, IconTheme *theme)
return theme;
}
IconTheme *load_theme(char *name)
IconTheme *load_theme(const char *name)
{
// Look for name/index.theme in $HOME/.icons, /usr/share/icons, /usr/share/pixmaps (stop at the first found)
// Parse index.theme -> list of IconThemeDir with attributes
@@ -256,9 +253,8 @@ IconTheme *load_theme(char *name)
return NULL;
gchar *file_name = NULL;
const GSList *location;
for (location = get_icon_locations(); location; location = g_slist_next(location)) {
gchar *path = (gchar*) location->data;
for (const GSList *location = get_icon_locations(); location; location = g_slist_next(location)) {
gchar *path = (gchar *)location->data;
file_name = g_build_filename(path, name, "index.theme", NULL);
if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) {
g_free(file_name);
@@ -283,14 +279,12 @@ void free_icon_theme(IconTheme *theme)
return;
free(theme->name);
theme->name = NULL;
GSList *l_inherits;
for (l_inherits = theme->list_inherits; l_inherits ; l_inherits = l_inherits->next) {
for (GSList *l_inherits = theme->list_inherits; l_inherits; l_inherits = l_inherits->next) {
free(l_inherits->data);
}
g_slist_free(theme->list_inherits);
theme->list_inherits = NULL;
GSList *l_dir;
for (l_dir = theme->list_directories; l_dir ; l_dir = l_dir->next) {
for (GSList *l_dir = theme->list_directories; l_dir; l_dir = l_dir->next) {
IconThemeDir *dir = (IconThemeDir *)l_dir->data;
free(dir->name);
free(l_dir->data);
@@ -303,15 +297,14 @@ void free_themes(IconThemeWrapper *themes)
{
if (!themes)
return;
GSList *l;
for (l = themes->themes; l ; l = l->next) {
IconTheme *theme = (IconTheme*) l->data;
for (GSList *l = themes->themes; l; l = l->next) {
IconTheme *theme = (IconTheme *)l->data;
free_icon_theme(theme);
free(theme);
}
g_slist_free(themes->themes);
for (l = themes->themes_fallback; l ; l = l->next) {
IconTheme *theme = (IconTheme*) l->data;
for (GSList *l = themes->themes_fallback; l; l = l->next) {
IconTheme *theme = (IconTheme *)l->data;
free_icon_theme(theme);
free(theme);
}
@@ -328,21 +321,24 @@ void test_launcher_read_theme_file()
return;
}
printf("Loaded theme: %s\n", theme->name);
GSList* item = theme->list_inherits;
while (item != NULL)
{
printf("Inherits:%s\n", (char*)item->data);
GSList *item = theme->list_inherits;
while (item != NULL) {
printf("Inherits:%s\n", (char *)item->data);
item = g_slist_next(item);
}
item = theme->list_directories;
while (item != NULL)
{
while (item != NULL) {
IconThemeDir *dir = item->data;
printf("Dir:%s Size=%d MinSize=%d MaxSize=%d Threshold=%d Type=%s\n",
dir->name, dir->size, dir->min_size, dir->max_size, dir->threshold,
dir->type == ICON_DIR_TYPE_FIXED ? "Fixed" :
dir->type == ICON_DIR_TYPE_SCALABLE ? "Scalable" :
dir->type == ICON_DIR_TYPE_THRESHOLD ? "Threshold" : "?????");
dir->name,
dir->size,
dir->min_size,
dir->max_size,
dir->threshold,
dir->type == ICON_DIR_TYPE_FIXED ? "Fixed" : dir->type == ICON_DIR_TYPE_SCALABLE
? "Scalable"
: dir->type == ICON_DIR_TYPE_THRESHOLD ? "Threshold"
: "?????");
item = g_slist_next(item);
}
fprintf(stdout, "\033[0m");
@@ -350,7 +346,7 @@ void test_launcher_read_theme_file()
gboolean str_list_contains(const GSList *list, const char *value)
{
const GSList* item = list;
const GSList *item = list;
while (item != NULL) {
if (g_str_equal(item->data, value)) {
return TRUE;
@@ -369,18 +365,17 @@ void load_themes_helper(const char *name, GSList **themes, GSList **queued)
// Load wrapper->themes
while (queue) {
char *name = queue->data;
queue = g_slist_remove(queue, name);
char *queued_name = queue->data;
queue = g_slist_remove(queue, queued_name);
fprintf(stderr, " '%s',", name);
IconTheme *theme = load_theme(name);
fprintf(stderr, " '%s',", queued_name);
IconTheme *theme = load_theme(queued_name);
if (theme != NULL) {
*themes = g_slist_append(*themes, theme);
GSList* item = theme->list_inherits;
GSList *item = theme->list_inherits;
int pos = 0;
while (item != NULL)
{
while (item != NULL) {
char *parent = item->data;
if (!str_list_contains(*queued, parent)) {
queue = g_slist_insert(queue, strdup(parent), pos);
@@ -391,13 +386,13 @@ void load_themes_helper(const char *name, GSList **themes, GSList **queued)
}
}
free(name);
free(queued_name);
}
fprintf(stderr, "\n");
// Free the queue
GSList *l;
for (l = queue; l ; l = l->next)
for (l = queue; l; l = l->next)
free(l->data);
g_slist_free(queue);
}
@@ -420,14 +415,13 @@ IconThemeWrapper *load_themes(const char *icon_theme_name)
// Load wrapper->themes_fallback
const GSList *location;
for (location = get_icon_locations(); location; location = g_slist_next(location)) {
gchar *path = (gchar*) location->data;
gchar *path = (gchar *)location->data;
GDir *d = g_dir_open(path, 0, NULL);
if (d) {
const gchar *name;
while ((name = g_dir_read_name(d))) {
gchar *file_name = g_build_filename(path, name, "index.theme", NULL);
if (g_file_test(file_name, G_FILE_TEST_EXISTS) &&
!g_file_test(file_name, G_FILE_TEST_IS_DIR)) {
if (g_file_test(file_name, G_FILE_TEST_EXISTS) && !g_file_test(file_name, G_FILE_TEST_IS_DIR)) {
load_themes_helper(name, &wrapper->themes_fallback, &queued);
}
g_free(file_name);
@@ -438,7 +432,7 @@ IconThemeWrapper *load_themes(const char *icon_theme_name)
// Free the queued list
GSList *l;
for (l = queued; l ; l = l->next)
for (l = queued; l; l = l->next)
free(l->data);
g_slist_free(queued);
@@ -482,8 +476,8 @@ int directory_size_distance(IconThemeDir *dir, int size)
gint compare_theme_directories(gconstpointer a, gconstpointer b, gpointer size_query)
{
int size = GPOINTER_TO_INT(size_query);
const IconThemeDir *da = (const IconThemeDir*)a;
const IconThemeDir *db = (const IconThemeDir*)b;
const IconThemeDir *da = (const IconThemeDir *)a;
const IconThemeDir *db = (const IconThemeDir *)b;
return abs(da->size - size) - abs(db->size - size);
}
@@ -509,9 +503,8 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
extensions = g_slist_append(extensions, ".svg");
#endif
// if the icon name already contains one of the extensions (e.g. vlc.png instead of vlc) add a special entry
GSList *ext;
for (ext = extensions; ext; ext = g_slist_next(ext)) {
char *extension = (char*) ext->data;
for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
char *extension = (char *)ext->data;
if (strlen(icon_name) > strlen(extension) &&
strcmp(extension, icon_name + strlen(icon_name) - strlen(extension)) == 0) {
extensions = g_slist_append(extensions, "");
@@ -540,33 +533,33 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
char *file_name = calloc(file_name_size, 1);
for (theme = themes; theme; theme = g_slist_next(theme)) {
((IconTheme*)theme->data)->list_directories = g_slist_sort_with_data(((IconTheme*)theme->data)->list_directories,
compare_theme_directories,
GINT_TO_POINTER(size));
((IconTheme *)theme->data)->list_directories =
g_slist_sort_with_data(((IconTheme *)theme->data)->list_directories,
compare_theme_directories,
GINT_TO_POINTER(size));
GSList *dir;
for (dir = ((IconTheme*)theme->data)->list_directories; dir; dir = g_slist_next(dir)) {
for (dir = ((IconTheme *)theme->data)->list_directories; dir; dir = g_slist_next(dir)) {
// Closest match
gboolean possible = directory_size_distance((IconThemeDir*)dir->data, size) < minimal_size &&
gboolean possible = directory_size_distance((IconThemeDir *)dir->data, size) < minimal_size &&
(!best_file_theme ? TRUE : theme == best_file_theme);
// Next larger match
possible = possible ||
(((IconThemeDir*)dir->data)->size >= size &&
(next_larger_size == -1 || ((IconThemeDir*)dir->data)->size < next_larger_size) &&
(!next_larger_theme ? 1 : theme == next_larger_theme));
possible = possible || (((IconThemeDir *)dir->data)->size >= size &&
(next_larger_size == -1 || ((IconThemeDir *)dir->data)->size < next_larger_size) &&
(!next_larger_theme ? 1 : theme == next_larger_theme));
if (!possible)
continue;
const GSList *base;
for (base = basenames; base; base = g_slist_next(base)) {
GSList *ext;
for (ext = extensions; ext; ext = g_slist_next(ext)) {
char *base_name = (char*) base->data;
char *theme_name = ((IconTheme*)theme->data)->name;
char *dir_name = ((IconThemeDir*)dir->data)->name;
char *extension = (char*) ext->data;
if (strlen(base_name) + strlen(theme_name) +
strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100 > file_name_size) {
file_name_size = strlen(base_name) + strlen(theme_name) +
strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100;
for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
char *base_name = (char *)base->data;
char *theme_name = ((IconTheme *)theme->data)->name;
char *dir_name = ((IconThemeDir *)dir->data)->name;
char *extension = (char *)ext->data;
if (strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) +
strlen(extension) + 100 >
file_name_size) {
file_name_size = strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) +
strlen(extension) + 100;
file_name = realloc(file_name, file_name_size);
}
file_name[0] = 0;
@@ -578,27 +571,28 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
if (DEBUG_ICON_SEARCH)
printf("found: %s\n", file_name);
// Closest match
if (directory_size_distance((IconThemeDir*)dir->data, size) < minimal_size && (!best_file_theme ? 1 : theme == best_file_theme)) {
if (directory_size_distance((IconThemeDir *)dir->data, size) < minimal_size &&
(!best_file_theme ? 1 : theme == best_file_theme)) {
if (best_file_name) {
free(best_file_name);
best_file_name = NULL;
}
best_file_name = strdup(file_name);
minimal_size = directory_size_distance((IconThemeDir*)dir->data, size);
minimal_size = directory_size_distance((IconThemeDir *)dir->data, size);
best_file_theme = theme;
if (DEBUG_ICON_SEARCH)
printf("best_file_name = %s; minimal_size = %d\n", best_file_name, minimal_size);
}
// Next larger match
if (((IconThemeDir*)dir->data)->size >= size &&
(next_larger_size == -1 || ((IconThemeDir*)dir->data)->size < next_larger_size) &&
if (((IconThemeDir *)dir->data)->size >= size &&
(next_larger_size == -1 || ((IconThemeDir *)dir->data)->size < next_larger_size) &&
(!next_larger_theme ? 1 : theme == next_larger_theme)) {
if (next_larger) {
free(next_larger);
next_larger = NULL;
}
next_larger = strdup(file_name);
next_larger_size = ((IconThemeDir*)dir->data)->size;
next_larger_size = ((IconThemeDir *)dir->data)->size;
next_larger_theme = theme;
if (DEBUG_ICON_SEARCH)
printf("next_larger = %s; next_larger_size = %d\n", next_larger, next_larger_size);
@@ -622,14 +616,11 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
// Look in unthemed icons
{
const GSList *base;
for (base = basenames; base; base = g_slist_next(base)) {
GSList *ext;
for (ext = extensions; ext; ext = g_slist_next(ext)) {
char *base_name = (char*) base->data;
char *extension = (char*) ext->data;
char *file_name = calloc(strlen(base_name) + strlen(icon_name) +
strlen(extension) + 100, 1);
for (const GSList *base = basenames; base; base = g_slist_next(base)) {
for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
char *base_name = (char *)base->data;
char *extension = (char *)ext->data;
file_name = calloc(strlen(base_name) + strlen(icon_name) + strlen(extension) + 100, 1);
// filename = directory/iconname.extension
sprintf(file_name, "%s/%s%s", base_name, icon_name, extension);
if (DEBUG_ICON_SEARCH)

2
src/launcher/icon-theme-common.h
View File

@@ -17,7 +17,7 @@ typedef struct IconThemeWrapper {
typedef struct IconTheme {
char *name;
GSList *list_inherits; // each item is a char* (theme name)
GSList *list_inherits; // each item is a char* (theme name)
GSList *list_directories; // each item is an IconThemeDir*
} IconTheme;

161
src/launcher/launcher.c
View File

@@ -74,7 +74,6 @@ void default_launcher()
launcher_icon_bg = NULL;
}
void init_launcher()
{
if (launcher_enabled) {
@@ -83,10 +82,9 @@ void init_launcher()
}
}
void init_launcher_panel(void *p)
{
Panel *panel =(Panel*)p;
Panel *panel = (Panel *)p;
Launcher *launcher = &panel->launcher;
launcher->area.parent = p;
@@ -95,7 +93,7 @@ void init_launcher_panel(void *p)
launcher->area.size_mode = LAYOUT_FIXED;
launcher->area._resize = resize_launcher;
launcher->area.resize_needed = 1;
launcher->area.redraw_needed = 1;
launcher->area.redraw_needed = TRUE;
if (!launcher->area.bg)
launcher->area.bg = &g_array_index(backgrounds, Background, 0);
@@ -106,14 +104,13 @@ void init_launcher_panel(void *p)
if (launcher->list_apps == NULL)
return;
launcher->area.on_screen = 1;
panel_refresh = 1;
launcher->area.on_screen = TRUE;
panel_refresh = TRUE;
launcher_load_themes(launcher);
launcher_load_icons(launcher);
}
void cleanup_launcher()
{
int i;
@@ -123,13 +120,13 @@ void cleanup_launcher()
xsettings_client_destroy(xsettings_client);
xsettings_client = NULL;
for (i = 0; i < nb_panel; i++) {
Panel *panel = &panel1[i];
for (i = 0; i < num_panels; i++) {
Panel *panel = &panels[i];
Launcher *launcher = &panel->launcher;
cleanup_launcher_theme(launcher);
}
for (l = panel_config.launcher.list_apps; l ; l = l->next) {
for (l = panel_config.launcher.list_apps; l; l = l->next) {
free(l->data);
}
g_slist_free(panel_config.launcher.list_apps);
@@ -144,13 +141,12 @@ void cleanup_launcher()
launcher_enabled = 0;
}
void cleanup_launcher_theme(Launcher *launcher)
{
free_area(&launcher->area);
GSList *l;
for (l = launcher->list_icons; l ; l = l->next) {
LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
for (l = launcher->list_icons; l; l = l->next) {
LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
if (launcherIcon) {
free_icon(launcherIcon->image);
free_icon(launcherIcon->image_hover);
@@ -169,13 +165,12 @@ void cleanup_launcher_theme(Launcher *launcher)
launcher->list_themes = NULL;
}
int resize_launcher(void *obj)
gboolean resize_launcher(void *obj)
{
Launcher *launcher = obj;
GSList *l;
int count, icon_size;
int icons_per_column=1, icons_per_row=1, marging=0;
int icons_per_column = 1, icons_per_row = 1, margin = 0;
if (panel_horizontal) {
icon_size = launcher->area.height;
@@ -187,7 +182,7 @@ int resize_launcher(void *obj)
icon_size = launcher_max_icon_size;
// Resize icons if necessary
for (l = launcher->list_icons; l ; l = l->next) {
for (l = launcher->list_icons; l; l = l->next) {
LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
if (launcherIcon->icon_size != icon_size || !launcherIcon->image) {
launcherIcon->icon_size = icon_size;
@@ -195,7 +190,8 @@ int resize_launcher(void *obj)
launcherIcon->area.height = launcherIcon->icon_size;
// Get the path for an icon file with the new size
char *new_icon_path = get_icon_path(launcher->list_themes, launcherIcon->icon_name, launcherIcon->icon_size);
char *new_icon_path =
get_icon_path(launcher->list_themes, launcherIcon->icon_name, launcherIcon->icon_size);
if (!new_icon_path) {
// Draw a blank icon
free_icon(launcherIcon->image);
@@ -234,46 +230,47 @@ int resize_launcher(void *obj)
}
if (panel_config.mouse_effects) {
launcherIcon->image_hover = adjust_icon(launcherIcon->image, panel_config.mouse_over_alpha, panel_config.mouse_over_saturation, panel_config.mouse_over_brightness);
launcherIcon->image_pressed = adjust_icon(launcherIcon->image, panel_config.mouse_pressed_alpha, panel_config.mouse_pressed_saturation, panel_config.mouse_pressed_brightness);
launcherIcon->image_hover = adjust_icon(launcherIcon->image,
panel_config.mouse_over_alpha,
panel_config.mouse_over_saturation,
panel_config.mouse_over_brightness);
launcherIcon->image_pressed = adjust_icon(launcherIcon->image,
panel_config.mouse_pressed_alpha,
panel_config.mouse_pressed_saturation,
panel_config.mouse_pressed_brightness);
}
}
count = g_slist_length(launcher->list_icons);
if (panel_horizontal) {
if (!count) {
launcher->area.width = 0;
} else {
int height = launcher->area.height - 2*launcher->area.bg->border.width - 2*launcher->area.paddingy;
int height = launcher->area.height - 2 * launcher->area.bg->border.width - 2 * launcher->area.paddingy;
// here icons_per_column always higher than 0
icons_per_column = (height+launcher->area.paddingx) / (icon_size+launcher->area.paddingx);
marging = height - (icons_per_column-1)*(icon_size+launcher->area.paddingx) - icon_size;
icons_per_row = count / icons_per_column + (count%icons_per_column != 0);
launcher->area.width = (2 * launcher->area.bg->border.width) +
(2 * launcher->area.paddingxlr) +
(icon_size * icons_per_row) +
((icons_per_row-1) * launcher->area.paddingx);
icons_per_column = (height + launcher->area.paddingx) / (icon_size + launcher->area.paddingx);
margin = height - (icons_per_column - 1) * (icon_size + launcher->area.paddingx) - icon_size;
icons_per_row = count / icons_per_column + (count % icons_per_column != 0);
launcher->area.width = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) +
(icon_size * icons_per_row) + ((icons_per_row - 1) * launcher->area.paddingx);
}
}
else {
} else {
if (!count) {
launcher->area.height = 0;
} else {
int width = launcher->area.width - 2*launcher->area.bg->border.width - 2*launcher->area.paddingy;
int width = launcher->area.width - 2 * launcher->area.bg->border.width - 2 * launcher->area.paddingy;
// here icons_per_row always higher than 0
icons_per_row = (width+launcher->area.paddingx) / (icon_size+launcher->area.paddingx);
marging = width - (icons_per_row-1)*(icon_size+launcher->area.paddingx) - icon_size;
icons_per_column = count / icons_per_row+ (count%icons_per_row != 0);
launcher->area.height = (2 * launcher->area.bg->border.width) +
(2 * launcher->area.paddingxlr) +
(icon_size * icons_per_column) +
((icons_per_column-1) * launcher->area.paddingx);
icons_per_row = (width + launcher->area.paddingx) / (icon_size + launcher->area.paddingx);
margin = width - (icons_per_row - 1) * (icon_size + launcher->area.paddingx) - icon_size;
icons_per_column = count / icons_per_row + (count % icons_per_row != 0);
launcher->area.height = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) +
(icon_size * icons_per_column) + ((icons_per_column - 1) * launcher->area.paddingx);
}
}
int i, posx, posy;
int start = launcher->area.bg->border.width + launcher->area.paddingy + marging/2;
int start = launcher->area.bg->border.width + launcher->area.paddingy + margin / 2;
if (panel_horizontal) {
posy = start;
posx = launcher->area.bg->border.width + launcher->area.paddingxlr;
@@ -282,16 +279,16 @@ int resize_launcher(void *obj)
posy = launcher->area.bg->border.width + launcher->area.paddingxlr;
}
for (i=1, l = launcher->list_icons; l ; i++, l = l->next) {
LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
for (i = 1, l = launcher->list_icons; l; i++, l = l->next) {
LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
launcherIcon->y = posy;
launcherIcon->x = posx;
launcherIcon->area.posy = ((Area*)launcherIcon->area.parent)->posy + launcherIcon->y;
launcherIcon->area.posx = ((Area*)launcherIcon->area.parent)->posx + launcherIcon->x;
launcherIcon->area.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
launcherIcon->area.width = launcherIcon->icon_size;
launcherIcon->area.height = launcherIcon->icon_size;
//printf("launcher %d : %d,%d\n", i, posx, posy);
// printf("launcher %d : %d,%d\n", i, posx, posy);
if (panel_horizontal) {
if (i % icons_per_column) {
posy += icon_size + launcher->area.paddingx;
@@ -316,22 +313,22 @@ int resize_launcher(void *obj)
// in a stack; we need to layout them in a kind of table
void launcher_icon_on_change_layout(void *obj)
{
LauncherIcon *launcherIcon = (LauncherIcon*)obj;
launcherIcon->area.posy = ((Area*)launcherIcon->area.parent)->posy + launcherIcon->y;
launcherIcon->area.posx = ((Area*)launcherIcon->area.parent)->posx + launcherIcon->x;
LauncherIcon *launcherIcon = (LauncherIcon *)obj;
launcherIcon->area.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
launcherIcon->area.width = launcherIcon->icon_size;
launcherIcon->area.height = launcherIcon->icon_size;
}
char* launcher_icon_get_tooltip_text(void *obj)
char *launcher_icon_get_tooltip_text(void *obj)
{
LauncherIcon *launcherIcon = (LauncherIcon*)obj;
LauncherIcon *launcherIcon = (LauncherIcon *)obj;
return strdup(launcherIcon->icon_tooltip);
}
void draw_launcher_icon(void *obj, cairo_t *c)
{
LauncherIcon *launcherIcon = (LauncherIcon*)obj;
LauncherIcon *launcherIcon = (LauncherIcon *)obj;
Imlib_Image image;
// Render
@@ -343,7 +340,7 @@ void draw_launcher_icon(void *obj, cairo_t *c)
else
image = launcherIcon->image;
} else {
image = launcherIcon->image;
image = launcherIcon->image;
}
imlib_context_set_image(image);
render_image(launcherIcon->area.pix, 0, 0);
@@ -353,19 +350,25 @@ Imlib_Image scale_icon(Imlib_Image original, int icon_size)
{
Imlib_Image icon_scaled;
if (original) {
imlib_context_set_image (original);
icon_scaled = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), icon_size, icon_size);
imlib_context_set_image(original);
icon_scaled =
imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), icon_size, icon_size);
imlib_context_set_image (icon_scaled);
imlib_context_set_image(icon_scaled);
imlib_image_set_has_alpha(1);
DATA32* data = imlib_image_get_data();
adjust_asb(data, icon_size, icon_size, launcher_alpha, (float)launcher_saturation/100, (float)launcher_brightness/100);
DATA32 *data = imlib_image_get_data();
adjust_asb(data,
icon_size,
icon_size,
launcher_alpha,
(float)launcher_saturation / 100,
(float)launcher_brightness / 100);
imlib_image_put_back_data(data);
imlib_context_set_image (icon_scaled);
imlib_context_set_image(icon_scaled);
} else {
icon_scaled = imlib_create_image(icon_size, icon_size);
imlib_context_set_image (icon_scaled);
imlib_context_set_image(icon_scaled);
imlib_context_set_color(255, 255, 255, 255);
imlib_image_fill_rectangle(0, 0, icon_size, icon_size);
}
@@ -380,18 +383,18 @@ void free_icon(Imlib_Image icon)
}
}
void launcher_action(LauncherIcon *icon, XEvent* evt)
void launcher_action(LauncherIcon *icon, XEvent *evt)
{
char *cmd = calloc(strlen(icon->cmd) + 10, 1);
sprintf(cmd, "(%s&)", icon->cmd);
#if HAVE_SN
SnLauncherContext* ctx = 0;
SnLauncherContext *ctx = 0;
Time time;
if (startup_notifications) {
ctx = sn_launcher_context_new(server.sn_dsp, server.screen);
sn_launcher_context_set_name(ctx, icon->icon_tooltip);
sn_launcher_context_set_description(ctx, "Application launched from tint2");
sn_launcher_context_set_binary_name (ctx, icon->cmd);
sn_launcher_context_set_binary_name(ctx, icon->cmd);
// Get a timestamp from the X event
if (evt->type == ButtonPress || evt->type == ButtonRelease) {
time = evt->xbutton.time;
@@ -408,7 +411,7 @@ void launcher_action(LauncherIcon *icon, XEvent* evt)
if (pid < 0) {
fprintf(stderr, "Could not fork\n");
} else if (pid == 0) {
// Child process
// Child process
#if HAVE_SN
if (startup_notifications) {
sn_launcher_context_setup_child_process(ctx);
@@ -426,10 +429,10 @@ void launcher_action(LauncherIcon *icon, XEvent* evt)
#endif // HAVE_SN
exit(1);
} else {
// Parent process
// Parent process
#if HAVE_SN
if (startup_notifications) {
g_tree_insert(server.pids, GINT_TO_POINTER (pid), ctx);
g_tree_insert(server.pids, GINT_TO_POINTER(pid), ctx);
}
#endif // HAVE_SN
}
@@ -440,7 +443,7 @@ void launcher_action(LauncherIcon *icon, XEvent* evt)
void launcher_load_icons(Launcher *launcher)
{
// Load apps (.desktop style launcher items)
GSList* app = launcher->list_apps;
GSList *app = launcher->list_apps;
while (app != NULL) {
DesktopEntry entry;
read_desktop_file(app->data, &entry);
@@ -451,11 +454,11 @@ void launcher_load_icons(Launcher *launcher)
launcherIcon->area.size_mode = LAYOUT_FIXED;
launcherIcon->area._resize = NULL;
launcherIcon->area.resize_needed = 0;
launcherIcon->area.redraw_needed = 1;
launcherIcon->area.redraw_needed = TRUE;
launcherIcon->area.has_mouse_over_effect = 1;
launcherIcon->area.has_mouse_press_effect = 1;
launcherIcon->area.bg = launcher_icon_bg;
launcherIcon->area.on_screen = 1;
launcherIcon->area.on_screen = TRUE;
launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
if (launcher_tooltip_enabled) {
launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
@@ -469,25 +472,19 @@ void launcher_load_icons(Launcher *launcher)
launcherIcon->icon_tooltip = entry.name ? strdup(entry.name) : strdup(entry.exec);
free_desktop_entry(&entry);
launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
add_area(&launcherIcon->area, (Area*)launcher);
add_area(&launcherIcon->area, (Area *)launcher);
}
app = g_slist_next(app);
}
}
// Populates the list_themes list
void launcher_load_themes(Launcher *launcher)
{
launcher->list_themes = load_themes(launcher_icon_theme_override
? (icon_theme_name_config
? icon_theme_name_config
: icon_theme_name_xsettings
? icon_theme_name_xsettings
: "hicolor")
: (icon_theme_name_xsettings
? icon_theme_name_xsettings
: icon_theme_name_config
? icon_theme_name_config
: "hicolor"));
launcher->list_themes =
load_themes(launcher_icon_theme_override
? (icon_theme_name_config ? icon_theme_name_config
: icon_theme_name_xsettings ? icon_theme_name_xsettings : "hicolor")
: (icon_theme_name_xsettings ? icon_theme_name_xsettings
: icon_theme_name_config ? icon_theme_name_config : "hicolor"));
}

12
src/launcher/launcher.h
View File

@@ -15,8 +15,8 @@
typedef struct Launcher {
// always start with area
Area area;
GSList *list_apps; // List of char*, each is a path to a app.desktop file
GSList *list_icons; // List of LauncherIcon*
GSList *list_apps; // List of char*, each is a path to a app.desktop file
GSList *list_icons; // List of LauncherIcon*
IconThemeWrapper *list_themes;
} Launcher;
@@ -41,7 +41,7 @@ extern int launcher_tooltip_enabled;
extern int launcher_alpha;
extern int launcher_saturation;
extern int launcher_brightness;
extern char *icon_theme_name_xsettings; // theme name
extern char *icon_theme_name_xsettings; // theme name
extern char *icon_theme_name_config;
extern int launcher_icon_theme_override;
extern XSettingsClient *xsettings_client;
@@ -57,14 +57,14 @@ void init_launcher_panel(void *panel);
void cleanup_launcher();
void cleanup_launcher_theme(Launcher *launcher);
int resize_launcher(void *obj);
void draw_launcher (void *obj, cairo_t *c);
gboolean resize_launcher(void *obj);
void draw_launcher(void *obj, cairo_t *c);
// Populates the list_icons list
void launcher_load_icons(Launcher *launcher);
// Populates the list_themes list
void launcher_load_themes(Launcher *launcher);
void launcher_action(LauncherIcon *icon, XEvent* e);
void launcher_action(LauncherIcon *icon, XEvent *e);
void test_launcher_read_desktop_file();
void test_launcher_read_theme_file();

251
src/launcher/xsettings-client.c
View File

@@ -15,7 +15,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Owen Taylor, Red Hat, Inc.
@@ -26,15 +26,14 @@
#include <string.h>
#include <X11/Xlib.h>
#include <X11/Xmd.h> /* For CARD16 */
#include <X11/Xmd.h> /* For CARD16 */
#include "xsettings-client.h"
#include "server.h"
#include "panel.h"
#include "launcher.h"
struct _XSettingsClient
{
struct _XSettingsClient {
Display *display;
int screen;
XSettingsNotifyFunc notify;
@@ -45,10 +44,9 @@ struct _XSettingsClient
XSettingsList *settings;
};
void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSetting *setting, void *data)
void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data)
{
//printf("xsettings_notify_cb\n");
// printf("xsettings_notify_cb\n");
if ((action == XSETTINGS_ACTION_NEW || action == XSETTINGS_ACTION_CHANGED) && name != NULL && setting != NULL) {
if (!strcmp(name, "Net/IconThemeName") && setting->type == XSETTINGS_TYPE_STRING) {
if (icon_theme_name_xsettings) {
@@ -57,10 +55,10 @@ void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSet
free(icon_theme_name_xsettings);
}
icon_theme_name_xsettings = strdup(setting->data.v_string);
int i;
for (i = 0 ; i < nb_panel ; i++) {
Launcher *launcher = &panel1[i].launcher;
for (i = 0; i < num_panels; i++) {
Launcher *launcher = &panels[i].launcher;
cleanup_launcher_theme(launcher);
launcher_load_themes(launcher);
launcher_load_icons(launcher);
@@ -70,8 +68,7 @@ void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSet
}
}
static void notify_changes (XSettingsClient *client, XSettingsList *old_list)
static void notify_changes(XSettingsClient *client, XSettingsList *old_list)
{
XSettingsList *old_iter = old_list;
XSettingsList *new_iter = client->settings;
@@ -83,21 +80,19 @@ static void notify_changes (XSettingsClient *client, XSettingsList *old_list)
int cmp;
if (old_iter && new_iter)
cmp = strcmp (old_iter->setting->name, new_iter->setting->name);
cmp = strcmp(old_iter->setting->name, new_iter->setting->name);
else if (old_iter)
cmp = -1;
else
cmp = 1;
if (cmp < 0) {
client->notify (old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
}
else if (cmp == 0) {
if (!xsettings_setting_equal (old_iter->setting, new_iter->setting))
client->notify (old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
}
else {
client->notify (new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
client->notify(old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
} else if (cmp == 0) {
if (!xsettings_setting_equal(old_iter->setting, new_iter->setting))
client->notify(old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
} else {
client->notify(new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
}
if (old_iter)
@@ -107,8 +102,7 @@ static void notify_changes (XSettingsClient *client, XSettingsList *old_list)
}
}
static int ignore_errors (Display *display, XErrorEvent *event)
static int ignore_errors(Display *display, XErrorEvent *event)
{
return True;
}
@@ -117,11 +111,11 @@ static char local_byte_order = '\0';
#define BYTES_LEFT(buffer) ((buffer)->data + (buffer)->len - (buffer)->pos)
static XSettingsResult fetch_card16 (XSettingsBuffer *buffer, CARD16 *result)
static XSettingsResult fetch_card16(XSettingsBuffer *buffer, CARD16 *result)
{
CARD16 x;
if (BYTES_LEFT (buffer) < 2)
if (BYTES_LEFT(buffer) < 2)
return XSETTINGS_ACCESS;
x = *(CARD16 *)buffer->pos;
@@ -135,25 +129,23 @@ static XSettingsResult fetch_card16 (XSettingsBuffer *buffer, CARD16 *result)
return XSETTINGS_SUCCESS;
}
static XSettingsResult fetch_ushort (XSettingsBuffer *buffer, unsigned short *result)
static XSettingsResult fetch_ushort(XSettingsBuffer *buffer, unsigned short *result)
{
CARD16 x;
XSettingsResult r;
XSettingsResult r;
r = fetch_card16 (buffer, &x);
r = fetch_card16(buffer, &x);
if (r == XSETTINGS_SUCCESS)
*result = x;
return r;
}
static XSettingsResult fetch_card32 (XSettingsBuffer *buffer, CARD32 *result)
static XSettingsResult fetch_card32(XSettingsBuffer *buffer, CARD32 *result)
{
CARD32 x;
if (BYTES_LEFT (buffer) < 4)
if (BYTES_LEFT(buffer) < 4)
return XSETTINGS_ACCESS;
x = *(CARD32 *)buffer->pos;
@@ -167,9 +159,9 @@ static XSettingsResult fetch_card32 (XSettingsBuffer *buffer, CARD32 *result)
return XSETTINGS_SUCCESS;
}
static XSettingsResult fetch_card8 (XSettingsBuffer *buffer, CARD8 *result)
static XSettingsResult fetch_card8(XSettingsBuffer *buffer, CARD8 *result)
{
if (BYTES_LEFT (buffer) < 1)
if (BYTES_LEFT(buffer) < 1)
return XSETTINGS_ACCESS;
*result = *(CARD8 *)buffer->pos;
@@ -178,9 +170,9 @@ static XSettingsResult fetch_card8 (XSettingsBuffer *buffer, CARD8 *result)
return XSETTINGS_SUCCESS;
}
#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
#define XSETTINGS_PAD(n, m) ((n + m - 1) & (~(m - 1)))
static XSettingsList *parse_settings (unsigned char *data, size_t len)
static XSettingsList *parse_settings(unsigned char *data, size_t len)
{
XSettingsBuffer buffer;
XSettingsResult result = XSETTINGS_SUCCESS;
@@ -190,26 +182,26 @@ static XSettingsList *parse_settings (unsigned char *data, size_t len)
CARD32 i;
XSettingsSetting *setting = NULL;
local_byte_order = xsettings_byte_order ();
local_byte_order = xsettings_byte_order();
buffer.byte_order = local_byte_order;
buffer.pos = buffer.data = data;
buffer.len = len;
result = fetch_card8 (&buffer, (CARD8*)&buffer.byte_order);
result = fetch_card8(&buffer, (CARD8 *)&buffer.byte_order);
if (buffer.byte_order != MSBFirst && buffer.byte_order != LSBFirst) {
fprintf (stderr, "Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
fprintf(stderr, "Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
result = XSETTINGS_FAILED;
goto out;
}
buffer.pos += 3;
result = fetch_card32 (&buffer, &serial);
result = fetch_card32(&buffer, &serial);
if (result != XSETTINGS_SUCCESS)
goto out;
result = fetch_card32 (&buffer, &n_entries);
result = fetch_card32(&buffer, &n_entries);
if (result != XSETTINGS_SUCCESS)
goto out;
@@ -219,131 +211,130 @@ static XSettingsList *parse_settings (unsigned char *data, size_t len)
CARD32 v_int;
size_t pad_len;
result = fetch_card8 (&buffer, &type);
result = fetch_card8(&buffer, &type);
if (result != XSETTINGS_SUCCESS)
goto out;
buffer.pos += 1;
result = fetch_card16 (&buffer, &name_len);
result = fetch_card16(&buffer, &name_len);
if (result != XSETTINGS_SUCCESS)
goto out;
pad_len = XSETTINGS_PAD(name_len, 4);
if (BYTES_LEFT (&buffer) < pad_len) {
if (BYTES_LEFT(&buffer) < pad_len) {
result = XSETTINGS_ACCESS;
goto out;
}
setting = calloc (1, sizeof *setting);
setting = calloc(1, sizeof *setting);
if (!setting) {
result = XSETTINGS_NO_MEM;
goto out;
}
setting->type = XSETTINGS_TYPE_INT; /* No allocated memory */
setting->name = calloc (name_len + 1, 1);
setting->name = calloc(name_len + 1, 1);
if (!setting->name) {
result = XSETTINGS_NO_MEM;
goto out;
}
memcpy (setting->name, buffer.pos, name_len);
memcpy(setting->name, buffer.pos, name_len);
setting->name[name_len] = '\0';
buffer.pos += pad_len;
result = fetch_card32 (&buffer, &v_int);
result = fetch_card32(&buffer, &v_int);
if (result != XSETTINGS_SUCCESS)
goto out;
setting->last_change_serial = v_int;
switch (type) {
case XSETTINGS_TYPE_INT:
result = fetch_card32 (&buffer, &v_int);
case XSETTINGS_TYPE_INT:
result = fetch_card32(&buffer, &v_int);
if (result != XSETTINGS_SUCCESS)
goto out;
setting->data.v_int = (INT32)v_int;
break;
case XSETTINGS_TYPE_STRING:
result = fetch_card32 (&buffer, &v_int);
case XSETTINGS_TYPE_STRING:
result = fetch_card32(&buffer, &v_int);
if (result != XSETTINGS_SUCCESS)
goto out;
pad_len = XSETTINGS_PAD (v_int, 4);
pad_len = XSETTINGS_PAD(v_int, 4);
if (v_int + 1 == 0 || /* Guard against wrap-around */
BYTES_LEFT (&buffer) < pad_len) {
BYTES_LEFT(&buffer) < pad_len) {
result = XSETTINGS_ACCESS;
goto out;
}
setting->data.v_string = calloc (v_int + 1, 1);
setting->data.v_string = calloc(v_int + 1, 1);
if (!setting->data.v_string) {
result = XSETTINGS_NO_MEM;
goto out;
}
memcpy (setting->data.v_string, buffer.pos, v_int);
memcpy(setting->data.v_string, buffer.pos, v_int);
setting->data.v_string[v_int] = '\0';
buffer.pos += pad_len;
break;
case XSETTINGS_TYPE_COLOR:
result = fetch_ushort (&buffer, &setting->data.v_color.red);
case XSETTINGS_TYPE_COLOR:
result = fetch_ushort(&buffer, &setting->data.v_color.red);
if (result != XSETTINGS_SUCCESS)
goto out;
result = fetch_ushort (&buffer, &setting->data.v_color.green);
result = fetch_ushort(&buffer, &setting->data.v_color.green);
if (result != XSETTINGS_SUCCESS)
goto out;
result = fetch_ushort (&buffer, &setting->data.v_color.blue);
result = fetch_ushort(&buffer, &setting->data.v_color.blue);
if (result != XSETTINGS_SUCCESS)
goto out;
result = fetch_ushort (&buffer, &setting->data.v_color.alpha);
result = fetch_ushort(&buffer, &setting->data.v_color.alpha);
if (result != XSETTINGS_SUCCESS)
goto out;
break;
default:
default:
/* Quietly ignore unknown types */
break;
}
setting->type = type;
result = xsettings_list_insert (&settings, setting);
result = xsettings_list_insert(&settings, setting);
if (result != XSETTINGS_SUCCESS)
goto out;
goto out;
setting = NULL;
}
out:
out:
if (result != XSETTINGS_SUCCESS) {
switch (result) {
case XSETTINGS_NO_MEM:
case XSETTINGS_NO_MEM:
fprintf(stderr, "Out of memory reading XSETTINGS property\n");
break;
case XSETTINGS_ACCESS:
case XSETTINGS_ACCESS:
fprintf(stderr, "Invalid XSETTINGS property (read off end)\n");
break;
case XSETTINGS_DUPLICATE_ENTRY:
fprintf (stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
case XSETTINGS_FAILED:
case XSETTINGS_SUCCESS:
case XSETTINGS_NO_ENTRY:
case XSETTINGS_DUPLICATE_ENTRY:
fprintf(stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
case XSETTINGS_FAILED:
case XSETTINGS_SUCCESS:
case XSETTINGS_NO_ENTRY:
break;
}
if (setting)
xsettings_setting_free (setting);
xsettings_setting_free(setting);
xsettings_list_free (settings);
xsettings_list_free(settings);
settings = NULL;
}
return settings;
}
static void read_settings (XSettingsClient *client)
static void read_settings(XSettingsClient *client)
{
Atom type;
int format;
@@ -352,55 +343,67 @@ static void read_settings (XSettingsClient *client)
unsigned char *data;
int result;
int (*old_handler) (Display *, XErrorEvent *);
int (*old_handler)(Display *, XErrorEvent *);
XSettingsList *old_list = client->settings;
client->settings = NULL;
old_handler = XSetErrorHandler (ignore_errors);
result = XGetWindowProperty (client->display, client->manager_window, server.atom._XSETTINGS_SETTINGS, 0, LONG_MAX, False, server.atom._XSETTINGS_SETTINGS, &type, &format, &n_items, &bytes_after, &data);
XSetErrorHandler (old_handler);
old_handler = XSetErrorHandler(ignore_errors);
result = XGetWindowProperty(client->display,
client->manager_window,
server.atom._XSETTINGS_SETTINGS,
0,
LONG_MAX,
False,
server.atom._XSETTINGS_SETTINGS,
&type,
&format,
&n_items,
&bytes_after,
&data);
XSetErrorHandler(old_handler);
if (result == Success && type == server.atom._XSETTINGS_SETTINGS) {
if (format != 8) {
fprintf (stderr, "Invalid format for XSETTINGS property %d", format);
}
else
client->settings = parse_settings (data, n_items);
XFree (data);
fprintf(stderr, "Invalid format for XSETTINGS property %d", format);
} else
client->settings = parse_settings(data, n_items);
XFree(data);
}
notify_changes (client, old_list);
xsettings_list_free (old_list);
notify_changes(client, old_list);
xsettings_list_free(old_list);
}
static void check_manager_window (XSettingsClient *client)
static void check_manager_window(XSettingsClient *client)
{
if (client->manager_window && client->watch)
client->watch (client->manager_window, False, 0, client->cb_data);
client->watch(client->manager_window, False, 0, client->cb_data);
XGrabServer (client->display);
XGrabServer(client->display);
client->manager_window = XGetSelectionOwner (server.dsp, server.atom._XSETTINGS_SCREEN);
client->manager_window = XGetSelectionOwner(server.dsp, server.atom._XSETTINGS_SCREEN);
if (client->manager_window)
XSelectInput (server.dsp, client->manager_window, PropertyChangeMask | StructureNotifyMask);
XSelectInput(server.dsp, client->manager_window, PropertyChangeMask | StructureNotifyMask);
XUngrabServer (client->display);
XFlush (client->display);
XUngrabServer(client->display);
XFlush(client->display);
if (client->manager_window && client->watch)
client->watch (client->manager_window, True, PropertyChangeMask | StructureNotifyMask, client->cb_data);
client->watch(client->manager_window, True, PropertyChangeMask | StructureNotifyMask, client->cb_data);
read_settings (client);
read_settings(client);
}
XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNotifyFunc notify, XSettingsWatchFunc watch, void *cb_data)
XSettingsClient *xsettings_client_new(Display *display,
int screen,
XSettingsNotifyFunc notify,
XSettingsWatchFunc watch,
void *cb_data)
{
XSettingsClient *client;
client = calloc (1, sizeof *client);
client = calloc(1, sizeof *client);
if (!client)
return NULL;
@@ -414,68 +417,60 @@ XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNo
client->settings = NULL;
if (client->watch)
client->watch (RootWindow (display, screen), True, StructureNotifyMask, client->cb_data);
client->watch(RootWindow(display, screen), True, StructureNotifyMask, client->cb_data);
check_manager_window (client);
check_manager_window(client);
if (client->manager_window == None) {
printf("NO XSETTINGS manager, tint2 use config 'launcher_icon_theme'.\n");
free (client);
free(client);
return NULL;
}
else
} else
return client;
}
void xsettings_client_destroy (XSettingsClient *client)
void xsettings_client_destroy(XSettingsClient *client)
{
if (client->watch)
client->watch (RootWindow (client->display, client->screen), False, 0, client->cb_data);
client->watch(RootWindow(client->display, client->screen), False, 0, client->cb_data);
if (client->manager_window && client->watch)
client->watch (client->manager_window, False, 0, client->cb_data);
client->watch(client->manager_window, False, 0, client->cb_data);
xsettings_list_free (client->settings);
free (client);
xsettings_list_free(client->settings);
free(client);
}
XSettingsResult xsettings_client_get_setting (XSettingsClient *client, const char *name, XSettingsSetting **setting)
XSettingsResult xsettings_client_get_setting(XSettingsClient *client, const char *name, XSettingsSetting **setting)
{
XSettingsSetting *search = xsettings_list_lookup (client->settings, name);
XSettingsSetting *search = xsettings_list_lookup(client->settings, name);
if (search) {
*setting = xsettings_setting_copy (search);
*setting = xsettings_setting_copy(search);
return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM;
}
else
} else
return XSETTINGS_NO_ENTRY;
}
Bool xsettings_client_process_event (XSettingsClient *client, XEvent *xev)
Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev)
{
/* The checks here will not unlikely cause us to reread
* the properties from the manager window a number of
* times when the manager changes from A->B. But manager changes
* are going to be pretty rare.
*/
if (xev->xany.window == RootWindow (server.dsp, server.screen)) {
if (xev->xany.window == RootWindow(server.dsp, server.screen)) {
if (xev->xany.type == ClientMessage && xev->xclient.message_type == server.atom.MANAGER) {
check_manager_window (client);
check_manager_window(client);
return True;
}
}
else if (xev->xany.window == client->manager_window) {
} else if (xev->xany.window == client->manager_window) {
if (xev->xany.type == DestroyNotify) {
check_manager_window (client);
check_manager_window(client);
return True;
}
else if (xev->xany.type == PropertyNotify) {
read_settings (client);
} else if (xev->xany.type == PropertyNotify) {
read_settings(client);
return True;
}
}
return False;
}

27
src/launcher/xsettings-client.h
View File

@@ -15,7 +15,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Owen Taylor, Red Hat, Inc.
@@ -32,23 +32,22 @@ extern "C" {
typedef struct _XSettingsClient XSettingsClient;
typedef enum
{
XSETTINGS_ACTION_NEW,
XSETTINGS_ACTION_CHANGED,
XSETTINGS_ACTION_DELETED
} XSettingsAction;
typedef enum { XSETTINGS_ACTION_NEW, XSETTINGS_ACTION_CHANGED, XSETTINGS_ACTION_DELETED } XSettingsAction;
typedef void (*XSettingsNotifyFunc) (const char *name, XSettingsAction action, XSettingsSetting *setting, void *cb_data);
typedef void (*XSettingsWatchFunc) (Window window, Bool is_start, long mask, void *cb_data);
typedef void (*XSettingsNotifyFunc)(const char *name, XSettingsAction action, XSettingsSetting *setting, void *cb_data);
typedef void (*XSettingsWatchFunc)(Window window, Bool is_start, long mask, void *cb_data);
XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNotifyFunc notify, XSettingsWatchFunc watch, void *cb_data);
void xsettings_client_destroy (XSettingsClient *client);
Bool xsettings_client_process_event (XSettingsClient *client, XEvent *xev);
XSettingsClient *xsettings_client_new(Display *display,
int screen,
XSettingsNotifyFunc notify,
XSettingsWatchFunc watch,
void *cb_data);
void xsettings_client_destroy(XSettingsClient *client);
Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev);
void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSetting *setting, void *data);
void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data);
XSettingsResult xsettings_client_get_setting (XSettingsClient *client, const char *name, XSettingsSetting **setting);
XSettingsResult xsettings_client_get_setting(XSettingsClient *client, const char *name, XSettingsSetting **setting);
#ifdef __cplusplus
}

115
src/launcher/xsettings-common.c
View File

@@ -24,31 +24,29 @@
#include "stdlib.h"
#include <X11/Xlib.h>
#include <X11/Xmd.h> /* For CARD32 */
#include <X11/Xmd.h> /* For CARD32 */
#include "xsettings-common.h"
XSettingsSetting *
xsettings_setting_copy (XSettingsSetting *setting)
XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting)
{
XSettingsSetting *result;
size_t str_len;
result = calloc (1, sizeof *result);
result = calloc(1, sizeof *result);
if (!result)
return NULL;
str_len = strlen (setting->name);
result->name = calloc (str_len + 1, 1);
str_len = strlen(setting->name);
result->name = calloc(str_len + 1, 1);
if (!result->name)
goto err;
memcpy (result->name, setting->name, str_len + 1);
memcpy(result->name, setting->name, str_len + 1);
result->type = setting->type;
switch (setting->type)
{
switch (setting->type) {
case XSETTINGS_TYPE_INT:
result->data.v_int = setting->data.v_int;
break;
@@ -56,12 +54,12 @@ xsettings_setting_copy (XSettingsSetting *setting)
result->data.v_color = setting->data.v_color;
break;
case XSETTINGS_TYPE_STRING:
str_len = strlen (setting->data.v_string);
result->data.v_string = calloc (str_len + 1, 1);
str_len = strlen(setting->data.v_string);
result->data.v_string = calloc(str_len + 1, 1);
if (!result->data.v_string)
goto err;
memcpy (result->data.v_string, setting->data.v_string, str_len + 1);
memcpy(result->data.v_string, setting->data.v_string, str_len + 1);
break;
default:
break;
@@ -73,31 +71,28 @@ xsettings_setting_copy (XSettingsSetting *setting)
err:
if (result->name)
free (result->name);
free (result);
free(result->name);
free(result);
return NULL;
}
XSettingsList *
xsettings_list_copy (XSettingsList *list)
XSettingsList *xsettings_list_copy(XSettingsList *list)
{
XSettingsList *new = NULL;
XSettingsList *old_iter = list;
XSettingsList *new_iter = NULL;
while (old_iter)
{
while (old_iter) {
XSettingsList *new_node;
new_node = calloc (1, sizeof *new_node);
new_node = calloc(1, sizeof *new_node);
if (!new_node)
goto error;
new_node->setting = xsettings_setting_copy (old_iter->setting);
if (!new_node->setting)
{
free (new_node);
new_node->setting = xsettings_setting_copy(old_iter->setting);
if (!new_node->setting) {
free(new_node);
goto error;
}
@@ -114,22 +109,19 @@ xsettings_list_copy (XSettingsList *list)
return new;
error:
xsettings_list_free (new);
xsettings_list_free(new);
return NULL;
}
int
xsettings_setting_equal (XSettingsSetting *setting_a,
XSettingsSetting *setting_b)
int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b)
{
if (setting_a->type != setting_b->type)
return 0;
if (strcmp (setting_a->name, setting_b->name) != 0)
if (strcmp(setting_a->name, setting_b->name) != 0)
return 0;
switch (setting_a->type)
{
switch (setting_a->type) {
case XSETTINGS_TYPE_INT:
return setting_a->data.v_int == setting_b->data.v_int;
case XSETTINGS_TYPE_COLOR:
@@ -138,7 +130,7 @@ xsettings_setting_equal (XSettingsSetting *setting_a,
setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
case XSETTINGS_TYPE_STRING:
return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0;
return strcmp(setting_a->data.v_string, setting_b->data.v_string) == 0;
default:
break;
}
@@ -146,55 +138,48 @@ xsettings_setting_equal (XSettingsSetting *setting_a,
return 0;
}
void
xsettings_setting_free (XSettingsSetting *setting)
void xsettings_setting_free(XSettingsSetting *setting)
{
if (setting->type == XSETTINGS_TYPE_STRING)
free (setting->data.v_string);
free(setting->data.v_string);
if (setting->name)
free (setting->name);
free(setting->name);
free (setting);
free(setting);
}
void
xsettings_list_free (XSettingsList *list)
void xsettings_list_free(XSettingsList *list)
{
while (list)
{
while (list) {
XSettingsList *next = list->next;
xsettings_setting_free (list->setting);
free (list);
xsettings_setting_free(list->setting);
free(list);
list = next;
}
}
XSettingsResult
xsettings_list_insert (XSettingsList **list,
XSettingsSetting *setting)
XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting)
{
XSettingsList *node;
XSettingsList *iter;
XSettingsList *last = NULL;
node = calloc (1, sizeof *node);
node = calloc(1, sizeof *node);
if (!node)
return XSETTINGS_NO_MEM;
node->setting = setting;
iter = *list;
while (iter)
{
int cmp = strcmp (setting->name, iter->setting->name);
while (iter) {
int cmp = strcmp(setting->name, iter->setting->name);
if (cmp < 0)
break;
else if (cmp == 0)
{
free (node);
else if (cmp == 0) {
free(node);
return XSETTINGS_DUPLICATE_ENTRY;
}
@@ -212,25 +197,21 @@ xsettings_list_insert (XSettingsList **list,
return XSETTINGS_SUCCESS;
}
XSettingsResult
xsettings_list_delete (XSettingsList **list,
const char *name)
XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name)
{
XSettingsList *iter;
XSettingsList *last = NULL;
iter = *list;
while (iter)
{
if (strcmp (name, iter->setting->name) == 0)
{
while (iter) {
if (strcmp(name, iter->setting->name) == 0) {
if (last)
last->next = iter->next;
else
*list = iter->next;
xsettings_setting_free (iter->setting);
free (iter);
xsettings_setting_free(iter->setting);
free(iter);
return XSETTINGS_SUCCESS;
}
@@ -242,16 +223,13 @@ xsettings_list_delete (XSettingsList **list,
return XSETTINGS_FAILED;
}
XSettingsSetting *
xsettings_list_lookup (XSettingsList *list,
const char *name)
XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name)
{
XSettingsList *iter;
iter = list;
while (iter)
{
if (strcmp (name, iter->setting->name) == 0)
while (iter) {
if (strcmp(name, iter->setting->name) == 0)
return iter->setting;
iter = iter->next;
@@ -260,8 +238,7 @@ xsettings_list_lookup (XSettingsList *list,
return NULL;
}
char
xsettings_byte_order (void)
char xsettings_byte_order(void)
{
CARD32 myint = 0x01020304;
return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;

102
src/launcher/xsettings-common.h
View File

@@ -15,7 +15,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Owen Taylor, Red Hat, Inc.
@@ -27,82 +27,72 @@
extern "C" {
#endif /* __cplusplus */
typedef struct _XSettingsBuffer XSettingsBuffer;
typedef struct _XSettingsColor XSettingsColor;
typedef struct _XSettingsList XSettingsList;
typedef struct _XSettingsBuffer XSettingsBuffer;
typedef struct _XSettingsColor XSettingsColor;
typedef struct _XSettingsList XSettingsList;
typedef struct _XSettingsSetting XSettingsSetting;
/* Types of settings possible. Enum values correspond to
* protocol values.
*/
typedef enum
{
XSETTINGS_TYPE_INT = 0,
XSETTINGS_TYPE_STRING = 1,
XSETTINGS_TYPE_COLOR = 2,
XSETTINGS_TYPE_NONE = 0xff
typedef enum {
XSETTINGS_TYPE_INT = 0,
XSETTINGS_TYPE_STRING = 1,
XSETTINGS_TYPE_COLOR = 2,
XSETTINGS_TYPE_NONE = 0xff
} XSettingsType;
typedef enum
{
XSETTINGS_SUCCESS,
XSETTINGS_NO_MEM,
XSETTINGS_ACCESS,
XSETTINGS_FAILED,
XSETTINGS_NO_ENTRY,
XSETTINGS_DUPLICATE_ENTRY
typedef enum {
XSETTINGS_SUCCESS,
XSETTINGS_NO_MEM,
XSETTINGS_ACCESS,
XSETTINGS_FAILED,
XSETTINGS_NO_ENTRY,
XSETTINGS_DUPLICATE_ENTRY
} XSettingsResult;
struct _XSettingsBuffer
{
char byte_order;
size_t len;
unsigned char *data;
unsigned char *pos;
struct _XSettingsBuffer {
char byte_order;
size_t len;
unsigned char *data;
unsigned char *pos;
};
struct _XSettingsColor
{
unsigned short red, green, blue, alpha;
struct _XSettingsColor {
unsigned short red, green, blue, alpha;
};
struct _XSettingsList
{
XSettingsSetting *setting;
XSettingsList *next;
struct _XSettingsList {
XSettingsSetting *setting;
XSettingsList *next;
};
struct _XSettingsSetting
{
char *name;
XSettingsType type;
union {
int v_int;
char *v_string;
XSettingsColor v_color;
} data;
struct _XSettingsSetting {
char *name;
XSettingsType type;
unsigned long last_change_serial;
union {
int v_int;
char *v_string;
XSettingsColor v_color;
} data;
unsigned long last_change_serial;
};
XSettingsSetting *xsettings_setting_copy (XSettingsSetting *setting);
void xsettings_setting_free (XSettingsSetting *setting);
int xsettings_setting_equal (XSettingsSetting *setting_a,
XSettingsSetting *setting_b);
XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting);
void xsettings_setting_free(XSettingsSetting *setting);
int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b);
void xsettings_list_free (XSettingsList *list);
XSettingsList *xsettings_list_copy (XSettingsList *list);
XSettingsResult xsettings_list_insert (XSettingsList **list,
XSettingsSetting *setting);
XSettingsSetting *xsettings_list_lookup (XSettingsList *list,
const char *name);
XSettingsResult xsettings_list_delete (XSettingsList **list,
const char *name);
void xsettings_list_free(XSettingsList *list);
XSettingsList *xsettings_list_copy(XSettingsList *list);
XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting);
XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name);
XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name);
char xsettings_byte_order (void);
char xsettings_byte_order(void);
#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
#define XSETTINGS_PAD(n, m) ((n + m - 1) & (~(m - 1)))
#ifdef __cplusplus
}