Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
borders.c ewins.c ewins.h mwm.c
Log Message:
Allow setting border on windows with borderless hint.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -3 -r1.281 -r1.282
--- borders.c 7 Jan 2006 07:20:57 -0000 1.281
+++ borders.c 20 Jan 2006 22:04:49 -0000 1.282
@@ -422,25 +422,25 @@
{
const Border *b;
-#if 0 /* Handled in iclass.c */
- /* Imlib2 will not render pixmaps with dimensions > 8192 */
- if (ewin->client.w > 8000 || ewin->client.h > 8000)
- ewin->state.no_border = 1;
-#endif
-
- if (ewin->state.no_border)
+ if (ewin->inh_wm.b.border)
{
b = FindItem("BORDERLESS", 0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
- }
- else
- {
- /* Quit if we already have a border that isn't an internal one */
- b = ewin->border;
- if (b && strncmp(b->name, "__", 2))
- goto done;
- b = WindowMatchEwinBorder(ewin);
+ goto done;
}
+ /* Quit if we already have a border that isn't an internal one */
+ b = ewin->border;
+ if (b && strncmp(b->name, "__", 2))
+ goto done;
+
+ b = NULL;
+
+ if (ewin->props.no_border)
+ b = FindItem("BORDERLESS", 0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
+
+ if (!b)
+ b = WindowMatchEwinBorder(ewin);
+
if (!b)
b = FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
@@ -500,6 +500,8 @@
BorderIncRefcount(b);
HintsSetWindowBorder(ewin);
+ ewin->state.no_border = b->num_winparts <= 0;
+
EventCallbackRegister(EoGetWin(ewin), 0, BorderFrameHandleEvents, ewin);
if (b->num_winparts > 0)
@@ -572,6 +574,7 @@
ewin->update.shape = 1;
EwinBorderCalcSizes(ewin, 0);
+ EwinStateUpdate(ewin);
SnapshotEwinUpdate(ewin, SNAP_USE_BORDER);
}
@@ -579,7 +582,7 @@
void
EwinSetBorder(EWin * ewin, const Border * b, int apply)
{
- if (!b || ewin->border == b || ewin->state.no_border)
+ if (!b || ewin->border == b || ewin->inh_wm.b.border)
return;
if (apply)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -3 -r1.139 -r1.140
--- ewins.c 12 Jan 2006 22:50:09 -0000 1.139
+++ ewins.c 20 Jan 2006 22:04:49 -0000 1.140
@@ -185,6 +185,9 @@
if (ewin->client.h <= 0)
ewin->client.h = 100;
+ if (ewin->state.docked)
+ ewin->inh_wm.b.border = 1;
+
if (ewin->client.argb && Conf.argb_client_mode > 0)
{
if (!XGetWindowAttributes(disp, _EwinGetClientXwin(ewin), &win_attr))
@@ -197,7 +200,7 @@
ewin->client.w, ewin->client.h, 0, &win_attr);
if (Conf.argb_client_mode == 1)
- ewin->props.no_border = 1;
+ ewin->inh_wm.b.border = 1;
}
else
{
@@ -649,9 +652,6 @@
ewin->state.inhibit_focus = !ewin->icccm.need_input ||
EwinInhGetWM(ewin, focus) || ewin->state.iconified;
- ewin->state.no_border = ewin->props.no_border || ewin->state.docked ||
- (ewin->mwm.valid && !ewin->mwm.decor_title && !ewin->mwm.decor_border);
-
ewin->state.inhibit_move =
EwinInhGetUser(ewin, move) || ewin->state.fullscreen;
ewin->state.inhibit_resize = ewin->state.iconified || ewin->state.shaded ||
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewins.h 7 Jan 2006 07:20:58 -0000 1.38
+++ ewins.h 20 Jan 2006 22:04:49 -0000 1.39
@@ -48,7 +48,8 @@
unsigned char all:8;
struct
{
- unsigned char rsvd:3;
+ unsigned char rsvd:2;
+ unsigned char border:1; /* W */
unsigned char close:1; /* AU */
unsigned char focus:1; /* WA */
unsigned char iconify:1; /* W U */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/mwm.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- mwm.c 7 Jan 2006 07:20:58 -0000 1.30
+++ mwm.c 20 Jan 2006 22:04:49 -0000 1.31
@@ -172,6 +172,9 @@
ewin->mwm.func_close = 1;
}
+ if (!ewin->mwm.decor_title && !ewin->mwm.decor_border)
+ ewin->props.no_border = 1;
+
done:
if (mwmhints)
XFree(mwmhints);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
