jazzman/xoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support menu <xft_font> in xoatrc

Browse Source
This commit is contained in:
Sean Pringle
2015-01-10 20:38:51 +10:00
parent a8edef46dd
commit 8b944ac4c0
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.c
View File

@@ -34,9 +34,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define CONFIG_TITLE_FOCUS "title_focus" #define CONFIG_TITLE_FOCUS "title_focus"
#define CONFIG_TITLE_ELLIPSIS "title_ellipsis" #define CONFIG_TITLE_ELLIPSIS "title_ellipsis"
#define CONFIG_LAYOUTS "layouts" #define CONFIG_LAYOUTS "layouts"
#define CONFIG_MENU "menu"
#define CONFIG_UINT_NAMES CONFIG_BORDER "|" CONFIG_GAP "|" CONFIG_TITLE_ELLIPSIS #define CONFIG_UINT_NAMES CONFIG_BORDER "|" CONFIG_GAP "|" CONFIG_TITLE_ELLIPSIS
#define CONFIG_STR_NAMES CONFIG_BORDER_BLUR "|" CONFIG_BORDER_FOCUS "|" CONFIG_BORDER_URGENT "|" CONFIG_TITLE "|" CONFIG_TITLE_BLUR "|" CONFIG_TITLE_FOCUS #define CONFIG_STR_NAMES CONFIG_BORDER_BLUR "|" CONFIG_BORDER_FOCUS "|" CONFIG_BORDER_URGENT "|" CONFIG_TITLE "|" CONFIG_TITLE_BLUR "|" CONFIG_TITLE_FOCUS "|" CONFIG_MENU
#define CONFIG_ACTIONS "action_move_direction|action_focus_direction|action_move|action_focus|action_close|action_cycle|action_raise_nth|action_command|action_find_or_start|action_move_monitor|action_focus_monitor|action_fullscreen|action_maximize_vert|action_maximize_horz|action_maximize|action_menu" #define CONFIG_ACTIONS "action_move_direction|action_focus_direction|action_move|action_focus|action_close|action_cycle|action_raise_nth|action_command|action_find_or_start|action_move_monitor|action_focus_monitor|action_fullscreen|action_maximize_vert|action_maximize_horz|action_maximize|action_menu"
@@ -79,6 +80,7 @@ configure()
settings.title_blur = strdup(TITLE_BLUR); settings.title_blur = strdup(TITLE_BLUR);
settings.title_focus = strdup(TITLE_FOCUS); settings.title_focus = strdup(TITLE_FOCUS);
settings.title_ellipsis = TITLE_ELLIPSIS; settings.title_ellipsis = TITLE_ELLIPSIS;
settings.menu = TITLE ? strdup(TITLE): "sans";
settings.layout_count = sizeof(layouts) / sizeof(Layout); settings.layout_count = sizeof(layouts) / sizeof(Layout);
settings.layouts = calloc(settings.layout_count, sizeof(Layout)); settings.layouts = calloc(settings.layout_count, sizeof(Layout));
@@ -137,6 +139,7 @@ configure()
CONFIG_TITLE, CONFIG_TITLE,
CONFIG_TITLE_BLUR, CONFIG_TITLE_BLUR,
CONFIG_TITLE_FOCUS, CONFIG_TITLE_FOCUS,
CONFIG_MENU,
}; };
char **values[] = { char **values[] = {
&settings.border_blur, &settings.border_blur,
@@ -145,6 +148,7 @@ configure()
&settings.title, &settings.title,
&settings.title_blur, &settings.title_blur,
&settings.title_focus, &settings.title_focus,
&settings.menu,
}; };
for (i = 0; i < sizeof(names) / sizeof(char*); i++) for (i = 0; i < sizeof(names) / sizeof(char*); i++)
{ {

1
xoat.c
View File

@@ -122,6 +122,7 @@ typedef struct _Settings {
char *title_blur; char *title_blur;
char *title_focus; char *title_focus;
unsigned int title_ellipsis; unsigned int title_ellipsis;
char *menu;
unsigned int layout_count; unsigned int layout_count;
Layout *layouts; Layout *layouts;