#include "bindmaps.h"
#include "return.h"
#include "conf.h"
+#include "group.h"
static void set_clientwin_state(WClientWin *cwin, int state);
}
-#define SIZEHINT_PROPS (CLIENTWIN_PROP_MAXSIZE| \
- CLIENTWIN_PROP_MINSIZE| \
- CLIENTWIN_PROP_ASPECT| \
- CLIENTWIN_PROP_IGNORE_RSZINC)
+#define SIZEHINT_PROPS (CLIENTWIN_PROP_MAXSIZE| \
+ CLIENTWIN_PROP_MINSIZE| \
+ CLIENTWIN_PROP_ASPECT| \
+ CLIENTWIN_PROP_RSZINC| \
+ CLIENTWIN_PROP_I_MAXSIZE| \
+ CLIENTWIN_PROP_I_MINSIZE| \
+ CLIENTWIN_PROP_I_ASPECT| \
+ CLIENTWIN_PROP_I_RSZINC)
+
+
+#define DO_SZH(NAME, FLAG, IFLAG, SZHFLAG, W, H, C) \
+ if(extl_table_is_bool_set(tab, "ignore_" NAME)){ \
+ cwin->flags|=IFLAG; \
+ }else if(extl_table_gets_t(tab, NAME, &tab2)){ \
+ if(extl_table_gets_i(tab2, "w", &i1) && \
+ extl_table_gets_i(tab2, "h", &i2)){ \
+ cwin->size_hints.W=i1; \
+ cwin->size_hints.H=i2; \
+ C \
+ cwin->size_hints.flags|=SZHFLAG; \
+ cwin->flags|=FLAG; \
+ } \
+ extl_unref_table(tab2); \
+ }
static void clientwin_get_winprops(WClientWin *cwin)
if(extl_table_is_bool_set(tab, "acrobatic"))
cwin->flags|=CLIENTWIN_PROP_ACROBATIC;
- if(extl_table_gets_t(tab, "max_size", &tab2)){
- if(extl_table_gets_i(tab2, "w", &i1) &&
- extl_table_gets_i(tab2, "h", &i2)){
- cwin->size_hints.max_width=i1;
- cwin->size_hints.max_height=i2;
- cwin->size_hints.flags|=PMaxSize;
- cwin->flags|=CLIENTWIN_PROP_MAXSIZE;
- }
- extl_unref_table(tab2);
- }
-
- if(extl_table_gets_t(tab, "min_size", &tab2)){
- if(extl_table_gets_i(tab2, "w", &i1) &&
- extl_table_gets_i(tab2, "h", &i2)){
- cwin->size_hints.min_width=i1;
- cwin->size_hints.min_height=i2;
- cwin->size_hints.flags|=PMinSize;
- cwin->flags|=CLIENTWIN_PROP_MINSIZE;
- }
- extl_unref_table(tab2);
- }
-
- if(extl_table_gets_t(tab, "aspect", &tab2)){
- if(extl_table_gets_i(tab2, "w", &i1) &&
- extl_table_gets_i(tab2, "h", &i2)){
- cwin->size_hints.min_aspect.x=i1;
- cwin->size_hints.max_aspect.x=i1;
- cwin->size_hints.min_aspect.y=i2;
- cwin->size_hints.max_aspect.y=i2;
- cwin->size_hints.flags|=PAspect;
- cwin->flags|=CLIENTWIN_PROP_ASPECT;
- }
- extl_unref_table(tab2);
- }
-
- if(extl_table_is_bool_set(tab, "ignore_resizeinc"))
- cwin->flags|=CLIENTWIN_PROP_IGNORE_RSZINC;
-
+ DO_SZH("max_size", CLIENTWIN_PROP_MAXSIZE, CLIENTWIN_PROP_I_MAXSIZE,
+ PMaxSize, max_width, max_height, );
+
+ DO_SZH("min_size", CLIENTWIN_PROP_MINSIZE, CLIENTWIN_PROP_I_MINSIZE,
+ PMinSize, min_width, min_height, );
+
+ DO_SZH("resizeinc", CLIENTWIN_PROP_RSZINC, CLIENTWIN_PROP_I_RSZINC,
+ PResizeInc, width_inc, height_inc, );
+
+ DO_SZH("aspect", CLIENTWIN_PROP_ASPECT, CLIENTWIN_PROP_I_ASPECT,
+ PAspect, min_aspect.x, min_aspect.y,
+ { cwin->size_hints.max_aspect.x=i1;
+ cwin->size_hints.max_aspect.y=i2;
+ });
+
if(extl_table_is_bool_set(tab, "ignore_cfgrq"))
cwin->flags|=CLIENTWIN_PROP_IGNORE_CFGRQ;
xwindow_get_sizehints(cwin->win, &(cwin->size_hints));
- if(cwin->flags&CLIENTWIN_PROP_MAXSIZE){
+ if(cwin->flags&CLIENTWIN_PROP_I_MAXSIZE){
+ cwin->size_hints.flags&=~PMaxSize;
+ }else if(cwin->flags&CLIENTWIN_PROP_MAXSIZE){
cwin->size_hints.max_width=tmp.max_width;
cwin->size_hints.max_height=tmp.max_height;
cwin->size_hints.flags|=PMaxSize;
}
-
- if(cwin->flags&CLIENTWIN_PROP_MINSIZE){
+
+ if(cwin->flags&CLIENTWIN_PROP_I_MINSIZE){
+ cwin->size_hints.flags&=~PMinSize;
+ }else if(cwin->flags&CLIENTWIN_PROP_MINSIZE){
cwin->size_hints.min_width=tmp.min_width;
cwin->size_hints.min_height=tmp.min_height;
cwin->size_hints.flags|=PMinSize;
}
- if(cwin->flags&CLIENTWIN_PROP_ASPECT){
+ if(cwin->flags&CLIENTWIN_PROP_I_ASPECT){
+ cwin->size_hints.flags&=~PAspect;
+ }else if(cwin->flags&CLIENTWIN_PROP_ASPECT){
cwin->size_hints.min_aspect=tmp.min_aspect;
cwin->size_hints.max_aspect=tmp.max_aspect;
cwin->size_hints.flags|=PAspect;
}
- if(cwin->flags&CLIENTWIN_PROP_IGNORE_RSZINC)
+ if(cwin->flags&CLIENTWIN_PROP_I_RSZINC){
cwin->size_hints.flags&=~PResizeInc;
+ }else if(cwin->flags&CLIENTWIN_PROP_RSZINC){
+ cwin->size_hints.width_inc=tmp.width_inc;
+ cwin->size_hints.height_inc=tmp.height_inc;
+ cwin->size_hints.flags|=PResizeInc;
+ }
}
param.geom=REGION_GEOM(cwin);
param.maprq=maprq;
- param.userpos=(cwin->size_hints.flags&USPosition);
param.switchto=(init_state!=IconicState && clientwin_get_switchto(cwin));
param.jumpto=extl_table_is_bool_set(cwin->proptab, "jumpto");
param.gravity=(cwin->size_hints.flags&PWinGravity
: ForgetGravity);
param.tfor=clientwin_get_transient_for(cwin);
+ if(!extl_table_gets_b(cwin->proptab, "userpos", ¶m.userpos))
+ param.userpos=(cwin->size_hints.flags&USPosition);
+
if(cwin->flags&SIZEHINT_PROPS){
/* If size hints have been messed with, readjust requested geometry
* here. If programs themselves give incompatible geometries and
static void clientwin_do_unmapped(WClientWin *cwin, Window win)
{
- region_dispose_((WRegion*)cwin);
+ cwin->flags|=CLIENTWIN_UNMAP_RQ;
+
+ /* First try a graceful chain-dispose */
+ if(!region_rqdispose((WRegion*)cwin)){
+ /* But force dispose anyway */
+ region_dispose((WRegion*)cwin);
+ }
hook_call(clientwin_unmapped_hook, &win, mrsh_u_c, mrsh_u_extl);
}
}
-bool clientwin_rqclose(WClientWin *cwin, bool relocate_ignored)
+void clientwin_rqclose(WClientWin *cwin, bool relocate_ignored)
{
/* Ignore relocate parameter -- client windows can always be
* destroyed by the application in any case, so way may just as
if(cwin->flags&CLIENTWIN_P_WM_DELETE){
send_clientmsg(cwin->win, ioncore_g.atom_wm_delete,
ioncore_get_timestamp());
- return TRUE;
}else{
warn(TR("Client does not support the WM_DELETE protocol."));
- return FALSE;
}
}
/*{{{ ConfigureRequest */
-void clientwin_handle_configure_request(WClientWin *cwin,
- XConfigureRequestEvent *ev)
+static bool check_fs_cfgrq(WClientWin *cwin, XConfigureRequestEvent *ev)
{
- if(ev->value_mask&CWBorderWidth)
- cwin->orig_bw=ev->border_width;
-
- if(cwin->flags&CLIENTWIN_PROP_IGNORE_CFGRQ){
- sendconfig_clientwin(cwin);
- return;
- }
-
/* check full screen request */
if((ev->value_mask&(CWWidth|CWHeight))==(CWWidth|CWHeight)){
- bool sw=clientwin_fullscreen_may_switchto(cwin);
- if(clientwin_check_fullscreen_request(cwin, ev->width, ev->height, sw))
- return;
+ WRegion *grp=region_groupleader_of((WRegion*)cwin);
+ WScreen *scr=clientwin_fullscreen_chkrq(cwin, ev->width, ev->height);
+
+ if(scr!=NULL && REGION_MANAGER(grp)!=(WRegion*)scr){
+ bool sw=clientwin_fullscreen_may_switchto(cwin);
+
+ cwin->flags|=CLIENTWIN_FS_RQ;
+
+ if(!region_fullscreen_scr(grp, scr, sw))
+ cwin->flags&=~CLIENTWIN_FS_RQ;
+ }
+
+ return TRUE;
}
- cwin->flags|=CLIENTWIN_NEED_CFGNTFY;
+ return FALSE;
+}
+
+static bool check_normal_cfgrq(WClientWin *cwin, XConfigureRequestEvent *ev)
+{
if(ev->value_mask&(CWX|CWY|CWWidth|CWHeight)){
WRQGeomParams rq=RQGEOMPARAMS_INIT;
int gdx=0, gdy=0;
}
region_rqgeom((WRegion*)cwin, &rq, NULL);
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+
+void clientwin_handle_configure_request(WClientWin *cwin,
+ XConfigureRequestEvent *ev)
+{
+ if(ev->value_mask&CWBorderWidth)
+ cwin->orig_bw=ev->border_width;
+
+ cwin->flags|=CLIENTWIN_NEED_CFGNTFY;
+
+ if(!(cwin->flags&CLIENTWIN_PROP_IGNORE_CFGRQ)){
+ if(!check_fs_cfgrq(cwin, ev))
+ check_normal_cfgrq(cwin, ev);
}
if(cwin->flags&CLIENTWIN_NEED_CFGNTFY){
projects / ion3.git / blobdiff