diff -Naur pwm-1.0/dock.c pwm-1.0-p8/dock.c --- pwm-1.0/dock.c Sat Mar 29 17:37:43 2003 +++ pwm-1.0-p8/dock.c Sun Mar 30 11:32:47 2003 @@ -14,8 +14,12 @@ #include "binding.h" +/* #define DOCKWIN_W 64 #define DOCKWIN_H 64 +*/ +#define DOCKWIN_W GRDATA->dockwin_w +#define DOCKWIN_H GRDATA->dockwin_h static int create_x=0; diff -Naur pwm-1.0/dock.h pwm-1.0-p8/dock.h --- pwm-1.0/dock.h Sat Mar 29 17:37:43 2003 +++ pwm-1.0-p8/dock.h Sun Mar 30 11:47:31 2003 @@ -28,6 +28,8 @@ } WDock; extern void set_dock_params(const char *geom, bool horiz); +extern void set_dock_stacking(const char *stacking); +extern void set_dock_sticky(const char *sticky); extern bool add_dockwin(struct _WClientWin *cwin); extern void remove_dockwin(struct _WClientWin *cwin); extern struct _WClientWin *dockwin_at(WDock *dock, int x, int y); diff -Naur pwm-1.0/draw.h pwm-1.0-p8/draw.h --- pwm-1.0/draw.h Sat Mar 29 18:22:52 2003 +++ pwm-1.0-p8/draw.h Sun Mar 30 11:38:56 2003 @@ -39,7 +39,8 @@ int bar_min_width; float bar_max_width_q; int tab_min_width; - + int dockwin_w, dockwin_h; + WColorGroup act_tab_colors, act_tab_sel_colors; WColorGroup act_base_colors, act_sel_colors; WColorGroup tab_colors, tab_sel_colors; diff -Naur pwm-1.0/readconfig.c pwm-1.0-p8/readconfig.c --- pwm-1.0/readconfig.c Sat Mar 29 18:19:10 2003 +++ pwm-1.0-p8/readconfig.c Sun Mar 30 11:45:30 2003 @@ -16,6 +16,7 @@ #include "binding.h" #include "winprops.h" #include "frameid.h" +#include "dock.h" static uint default_mod=0; @@ -633,7 +634,29 @@ return TRUE; } + + +static int opt_screen_dock_s(Tokenizer *tokz, int n, Token *toks) +{ + int i,j; + + if(tmp_screen==NULL) + return TRUE; + i=TOK_LONG_VAL(&(toks[1])); + j=TOK_LONG_VAL(&(toks[2])); + + if(i<0 || j<0){ + warn_obj_line(tokz->name, toks[1].line, "Erroneous values"); + return FALSE; + } + + GRDATA->dockwin_w=i; + GRDATA->dockwin_h=j; + + return TRUE; +} + static bool do_colorgroup(Tokenizer *tokz, Token *toks, WColorGroup *cg) { @@ -1029,6 +1052,7 @@ {"font", "s", opt_screen_font, NULL}, {"border_w", "ll", opt_screen_border_w, NULL}, {"bar_w", "ldl", opt_screen_bar_w, NULL}, + {"dock_s", "ll", opt_screen_dock_s, NULL}, {"act_tab_colors", "ssss", opt_screen_act_tab_colors, NULL}, {"act_tab_sel_colors", "ssss", opt_screen_act_tab_sel_colors, NULL}, {"act_base_colors", "ssss", opt_screen_act_base_colors, NULL},