Mailing List Archive

Author: aendrodi
Date: 2009-09-01 11:19:24 +0300 (Tue, 01 Sep 2009)
New Revision: 19277

Modified:
projects/haf/trunk/libmatchbox2/ChangeLog
projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h
projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c
projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.h
projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h
Log:
revert NB#134557, bits of it may be useful later


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog 2009-09-01 08:17:31 UTC (rev 19276)
+++ projects/haf/trunk/libmatchbox2/ChangeLog 2009-09-01 08:19:24 UTC (rev 19277)
@@ -1,3 +1,7 @@
+2009-08-31 Adam Endrodi <adam.endrodi@blumsoft.eu>
+
+ revert NB#134557, bits of it may be useful later
+
2009-08-31 Kimmo Hämäläinen <kimmo.hamalainen@nokia.com>

Release 0.2.61

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c 2009-09-01 08:17:31 UTC (rev 19276)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c 2009-09-01 08:19:24 UTC (rev 19277)
@@ -1063,39 +1063,6 @@
{
mb_wm_stack_ensure (wm);

- /*
- * If a freshly mapped client landed on the top of the window stack
- * it is likely to receive focus and be activated, whatever the
- * current state of the window manager is. If it requests the
- * desktop to be in p-mode switch now, before it really gets mapped,
- * so the client window won't be mapped in lscape and needn't be
- * reconfigured nor redrawn.
- */
- client = mb_wm_stack_get_highest_by_type (wm,
- MBWMClientTypeApp|MBWMClientTypeDialog);
- if (client && !mb_wm_client_is_map_confirmed (client)
- && client->window->portrait_on_map)
- {
- /*
- * If @client is an application it covers the full application area,
- * so it must be safe to rotate because no other client is exposed.
- * Otherwise if @client is a dialog check if the request is a demand,
- * in which case we must obey in any case.
- */
- if ((MB_WM_CLIENT_CLIENT_TYPE (client) & MBWMClientTypeApp)
- || client->window->portrait_on_map > 1)
- {
- /* Go. Note! We're grabbing the server, is it a problem
- * if we're blocking here for a few hundred milisecs? */
- mb_wm_object_signal_emit (MB_WM_OBJECT (wm),
- MBWindowManagerSignalPortraitForecast);
-
- /* Reset the flag, so we won't bother the wm about it again. */
- client->window->portrait_on_map = 0;
- }
-
- }
-
#if ENABLE_COMPOSITE
if (wm->comp_mgr && mb_wm_comp_mgr_enabled (wm->comp_mgr))
mb_wm_comp_mgr_restack (wm->comp_mgr);

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h 2009-09-01 08:17:31 UTC (rev 19276)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h 2009-09-01 08:19:24 UTC (rev 19277)
@@ -66,7 +66,6 @@
typedef enum
{
MBWindowManagerSignalThemeChange = 1,
- MBWindowManagerSignalPortraitForecast,
} MBWindowManagerSignal;

typedef enum

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c 2009-09-01 08:17:31 UTC (rev 19276)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c 2009-09-01 08:19:24 UTC (rev 19277)
@@ -107,7 +107,6 @@
"_HILDON_WM_WINDOW_TYPE_ANIMATION_ACTOR",
"_HILDON_WM_WINDOW_TYPE",
"_HILDON_WM_WINDOW_TYPE_LEGACY_MENU",
- "_HILDON_PORTRAIT_MODE_REQUEST",

"_MAEMO_SUPPRESS_ROOT_RECONFIGURATION",
};

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c 2009-09-01 08:17:31 UTC (rev 19276)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c 2009-09-01 08:19:24 UTC (rev 19277)
@@ -44,7 +44,6 @@
COOKIE_WIN_MWM_HINTS,
COOKIE_WIN_HILDON_STACKING,
COOKIE_WIN_HILDON_TYPE,
- COOKIE_WIN_PORTRAIT_REQUEST,

N_COOKIES
};
@@ -360,13 +359,6 @@
wm->atoms[MBWM_ATOM_HILDON_STACKING_LAYER]);
}

- if (props_req & MBWM_WINDOW_PROP_PORTRAIT_REQUEST)
- {
- cookies[COOKIE_WIN_PORTRAIT_REQUEST]
- = mb_wm_property_cardinal_req (wm, xwin,
- wm->atoms[MBWM_ATOM_HILDON_PORTRAIT_MODE_REQUEST]);
- }
-
{
int err;
/* FIXME: toggling 'offline' mode in power menu can cause X error here */
@@ -1174,41 +1166,6 @@
changes |= MBWM_WINDOW_PROP_HILDON_STACKING;
}

- if (props_req & MBWM_WINDOW_PROP_PORTRAIT_REQUEST)
- {
- unsigned char *value = NULL;
-
- mb_wm_property_reply (wm,
- cookies[COOKIE_WIN_PORTRAIT_REQUEST],
- &actual_type_return,
- &actual_format_return,
- &nitems_return,
- &bytes_after_return,
- &value,
- &x_error_code);
-
- if (x_error_code
- || actual_type_return != XA_CARDINAL
- || actual_format_return != 32
- || value == NULL
- )
- {
- if (x_error_code == BadWindow)
- {
- if (value)
- XFree(value);
- goto badwindow_error;
- }
- }
- else
- win->portrait_on_map = *(unsigned *)value;
-
- if (value)
- XFree(value);
-
- changes |= MBWM_WINDOW_PROP_PORTRAIT_REQUEST;
- }
-
if (changes)
mb_wm_object_signal_emit (MB_WM_OBJECT (win), changes);


Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.h 2009-09-01 08:17:31 UTC (rev 19276)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.h 2009-09-01 08:19:24 UTC (rev 19277)
@@ -48,7 +48,6 @@
#define MBWM_WINDOW_PROP_MWM_HINTS (1<<18)
#define MBWM_WINDOW_PROP_HILDON_STACKING (1<<19)
#define MBWM_WINDOW_PROP_WIN_HILDON_TYPE (1<<20)
-#define MBWM_WINDOW_PROP_PORTRAIT_REQUEST (1<<21)

#define MBWM_WINDOW_PROP_ALL (0xffffffff)

@@ -162,9 +161,6 @@

/* value of the atom _HILDON_STACKING_LAYER (1-10) */
unsigned int hildon_stacking_layer;
-
- /* value of _HILDON_PORTRAIT_MODE_REQUEST when the window was mapped */
- unsigned portrait_on_map;
};

struct MBWMClientWindowClass

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h 2009-09-01 08:17:31 UTC (rev 19276)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h 2009-09-01 08:19:24 UTC (rev 19277)
@@ -305,9 +305,6 @@
MBWM_ATOM_HILDON_WM_WINDOW_TYPE,
MBWM_ATOM_HILDON_WM_WINDOW_TYPE_LEGACY_MENU,

- /* See the description in hildon-desktop. */
- MBWM_ATOM_HILDON_PORTRAIT_MODE_REQUEST,
-
/*
* This doesn't exactly suppress root reconfigs, but almost.
* More importantly it enables/disables Expose event generation

_______________________________________________
maemo-commits mailing list
maemo-commits@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-commits