[Xfce4-commits] midori:master Distinguish connecting and closing of tabs
Updating branch refs/heads/master
to b33b3c809f397b5cbe55ac856988eadbeeb4acd3 (commit)
from 20d0eba06d5847831c0f91dab6f5df59917b8930 (commit)
commit b33b3c809f397b5cbe55ac856988eadbeeb4acd3
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Oct 18 22:33:37 2012 +0200
Distinguish connecting and closing of tabs
Rename midori_browser_remove/close_tab, factor out
connecting and disconnecting menu item and signals.
Fixes: https://bugs.launchpad.net/midori/+bug/905759
extensions/tab-panel.c |4 +-
midori/main.c |2 +-
midori/midori-browser.c | 205 +--
midori/midori-browser.h |2 +-
midori/midori-view.c|8 +-
5 files changed, 152 insertions(+), 69 deletions(-)
diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c
index 44e23e6..ea138d3 100644
--- a/extensions/tab-panel.c
+++ b/extensions/tab-panel.c
@@ -229,12 +229,12 @@ midori_extension_button_release_event_cb (GtkWidget*
widget,
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
event-x, event-y, NULL, column, NULL, NULL)
column == gtk_tree_view_get_column (GTK_TREE_VIEW (widget),
1))
-midori_browser_remove_tab (browser, view);
+midori_browser_close_tab (browser, view);
else
midori_browser_set_current_tab (browser, view);
}
else if (event-button == 2)
-midori_browser_remove_tab (midori_browser_get_for_widget (widget),
view);
+midori_browser_close_tab (midori_browser_get_for_widget (widget),
view);
else
tab_panel_popup (widget, event, view);
diff --git a/midori/main.c b/midori/main.c
index e56d4a3..45d2daa 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1554,7 +1554,7 @@ midori_inactivity_timeout (gpointer data)
GList* data_items = sokoke_register_privacy_item (NULL, NULL,
NULL);
while ((view = midori_browser_get_nth_tab (mit-browser, i++)))
-midori_browser_remove_tab (mit-browser, view);
+midori_browser_close_tab (mit-browser, view);
midori_browser_set_current_uri (mit-browser, mit-uri);
/* Clear all private data */
if (history != NULL)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index ff1d7c1..28aca95 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1321,13 +1321,13 @@ midori_browser_download_status_cb (WebKitDownload*
download,
}
static gboolean
-midori_browser_remove_tab_idle (gpointer view)
+midori_browser_close_tab_idle (gpointer view)
{
MidoriBrowser* browser;
g_return_val_if_fail (GTK_IS_WIDGET (view), FALSE);
browser = midori_browser_get_for_widget (GTK_WIDGET (view));
-midori_browser_remove_tab (browser, GTK_WIDGET (view));
+midori_browser_close_tab (browser, GTK_WIDGET (view));
return G_SOURCE_REMOVE;
}
@@ -1420,7 +1420,7 @@ midori_view_download_requested_cb (GtkWidget* view,
web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view));
datasource = webkit_web_frame_get_data_source (web_frame);
if (midori_view_is_blank (MIDORI_VIEW (view))
webkit_web_data_source_get_data (datasource) == NULL)
-g_idle_add (midori_browser_remove_tab_idle, view);
+g_idle_add (midori_browser_close_tab_idle, view);
return handled;
}
@@ -1445,38 +1445,28 @@ midori_browser_get_n_pages (MidoriBrowser* browser)
}
static void
-midori_browser_tab_destroy_cb (MidoriView*view,
- MidoriBrowser* browser)
-{
-if (browser-proxy_array)
-{
-KatzeItem* item = midori_view_get_proxy_item (view);
-if (katze_array_get_item_index (browser-proxy_array, item) != -1)
-{
-if (!midori_view_is_blank (view))
-{
-if (browser-trash)
-katze_array_add_item (browser-trash, item);
-midori_browser_update_history (item, website, leave);
-}
-katze_array_remove_item (browser-proxy_array, item);
-}
-
-/* We don't ever want to be in a situation with no tabs,
- so just create an empty one if the last one is closed.
- The only exception is when we are closing the window,
- which is indicated by the proxy array having been unset. */
-if (midori_browser_get_n_pages (browser) == 0)
-midori_browser_add_uri (browser, );
-}
+midori_browser_disconnect_tab (MidoriBrowser* browser,
+ MidoriView*view);
-_midori_browser_update_actions (browser);
+static gboolean
+midori_browser_tab_connected (MidoriBrowser* browser,
+ MidoriView*view)
+{
+return browser-proxy_array
+(katze_array_get_item_index (browser-proxy_array,
midori_view_get_proxy_item (view)) !=
[Xfce4-commits] midori:master Respect hidden tabs in granite build
Updating branch refs/heads/master
to 9efda4447d34a07e91e43c07eb6e5ff43de63572 (commit)
from b33b3c809f397b5cbe55ac856988eadbeeb4acd3 (commit)
commit 9efda4447d34a07e91e43c07eb6e5ff43de63572
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Oct 18 22:56:29 2012 +0200
Respect hidden tabs in granite build
Fixes: https://bugs.launchpad.net/midori/+bug/1034879
midori/main.c |2 +-
midori/midori-browser.c | 12 +---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index 45d2daa..209ae1d 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -2151,7 +2151,6 @@ main (intargc,
g_object_set (settings,
show-menubar, FALSE,
show-navigationbar, FALSE,
- always-show-tabbar, FALSE,
toolbar-items,
Back,Forward,ReloadStop,Location,Homepage,
show-statusbar, FALSE,
enable-developer-extras, FALSE,
@@ -2163,6 +2162,7 @@ main (intargc,
NULL);
midori_browser_set_action_visible (browser, Panel, FALSE);
g_object_set (browser, settings, settings, NULL);
+g_object_set (browser, show-tabs, FALSE, NULL);
midori_startup_timer (Setup config: \t%f);
g_object_unref (settings);
g_signal_connect (browser, quit,
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 28aca95..b7bddc5 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -264,17 +264,15 @@ _toggle_tabbar_smartly (MidoriBrowser* browser,
gboolean ignore_fullscreen)
{
gboolean has_tabs = midori_browser_get_n_pages (browser) 1;
-#ifdef HAVE_GRANITE
gboolean show_tabs = !midori_browser_is_fullscreen (browser) ||
ignore_fullscreen;
+if (!browser-show_tabs)
+show_tabs = FALSE;
+#ifdef HAVE_GRANITE
granite_widgets_dynamic_notebook_set_show_tabs (
GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser-notebook), show_tabs);
#else
-gboolean show_tabs =
-browser-show_tabs
- (!midori_browser_is_fullscreen (browser) || ignore_fullscreen)
- (has_tabs
- || katze_object_get_boolean (browser-settings, always-show-tabbar));
-
+if (!(has_tabs || katze_object_get_boolean (browser-settings,
always-show-tabbar)))
+show_tabs = FALSE;
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser-notebook), show_tabs);
gtk_notebook_set_show_border (GTK_NOTEBOOK (browser-notebook), show_tabs);
#endif
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Do not save to Xfconf each time the treeview is refreshed
Updating branch refs/heads/bluesabre/display-settings
to 62ee88f41a811cb3f89759507ea7d092ca065ed0 (commit)
from eeb7efe1c97bc5d93e07077612f1a99a11783535 (commit)
commit 62ee88f41a811cb3f89759507ea7d092ca065ed0
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Wed Oct 17 15:42:42 2012 +0200
Do not save to Xfconf each time the treeview is refreshed
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
dialogs/display-settings/main.c |4
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 57e27c8..107b4d9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1474,10 +1474,6 @@ display_settings_treeview_populate (GtkBuilder *builder)
lucent_display_icon = NULL;
-/* Save the current status of all outputs, if the user doesn't change
- * anything after, it means she's happy with that. */
-xfce_randr_save_all (xfce_randr, Default, display_channel);
-
/* Walk all the connected outputs */
for (m = 0; m xfce_randr-noutput; ++m)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix popup positionint with Left/Right rotations
Updating branch refs/heads/bluesabre/display-settings
to 48f16ca76e3f4db6bfc74e1ca4c542ab2b5d4e0a (commit)
from 2c994717763c0c248f292ec03e99bba30c1d0a5b (commit)
commit 48f16ca76e3f4db6bfc74e1ca4c542ab2b5d4e0a
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Wed Oct 17 20:38:53 2012 +0200
Fix popup positionint with Left/Right rotations
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
dialogs/display-settings/main.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 89559dd..6c1656e 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1039,8 +1039,8 @@ display_setting_identity_display (gint display_id)
screen_pos_x = 0;
screen_pos_y = 0;
}
-screen_width = current_mode-width;
-screen_height = current_mode-height;
+screen_width = xfce_randr_mode_width (current_mode,
xfce_randr-rotation[display_id]);
+screen_height = xfce_randr_mode_height (current_mode,
xfce_randr-rotation[display_id]);
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Don't recalculate positions each time an id popup is created
Updating branch refs/heads/bluesabre/display-settings to 6722384f225361b09a13a8c793d8527e8ac8a6e7 (commit) from 48f16ca76e3f4db6bfc74e1ca4c542ab2b5d4e0a (commit) commit 6722384f225361b09a13a8c793d8527e8ac8a6e7 Author: Lionel Le Folgoc lio...@lefolgoc.net Date: Wed Oct 17 20:57:44 2012 +0200 Don't recalculate positions each time an id popup is created Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at dialogs/display-settings/xfce-randr.c |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dialogs/display-settings/xfce-randr.c b/dialogs/display-settings/xfce-randr.c index d2cd710..b9baaff 100644 --- a/dialogs/display-settings/xfce-randr.c +++ b/dialogs/display-settings/xfce-randr.c @@ -790,8 +790,6 @@ xfce_randr_get_positions (XfceRandr *randr, g_return_val_if_fail (randr != NULL x != NULL y != NULL, FALSE); g_return_val_if_fail (output randr-noutput, FALSE); -xfce_randr_update_positions (randr, output); - *x = randr-priv-position[output].x; *y = randr-priv-position[output].y; return TRUE; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix inaccurate detection of active outputs
Updating branch refs/heads/bluesabre/display-settings
to 987b583dfd887c8f5687e6bb92201e7c487ffbe2 (commit)
from 9699639b790b19d543adbc977f973e5a19927894 (commit)
commit 987b583dfd887c8f5687e6bb92201e7c487ffbe2
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Wed Oct 17 22:12:45 2012 +0200
Fix inaccurate detection of active outputs
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
dialogs/display-settings/main.c |9 ++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 94a7f9e..bbfe3dd 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1020,7 +1020,7 @@ display_setting_identity_display (gint display_id)
display_name = gtk_builder_get_object (builder, display_name);
display_details = gtk_builder_get_object (builder, display_details);
-if (display_settings_get_n_active_outputs() != 1)
+if (display_settings_get_n_active_outputs() 1)
{
current_mode = xfce_randr_find_mode_by_id (xfce_randr, display_id,
xfce_randr-mode[display_id]);
@@ -1110,8 +1110,11 @@ display_setting_mirror_displays_toggled (GtkToggleButton
*togglebutton,
/* Activate mirror-mode */
/* Apply mirror settings to each monitor */
-for (n = 0; n display_settings_get_n_active_outputs (); n++)
+for (n = 0; n xfce_randr-noutput; n++)
{
+if (xfce_randr-mode[n] == None)
+continue;
+
xfce_randr-relation[n] = XFCE_RANDR_PLACEMENT_MIRROR;
xfce_randr-related_to[n] = active_output;
@@ -1792,7 +1795,7 @@ display_settings_show_minimal_dialog (GdkDisplay
*display,
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fake_button), TRUE);
//
-if ( display_settings_get_n_active_outputs () == 1 )
+if (xfce_randr-noutput 1)
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display1),
xfce_randr-mode[0] != None);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Improve Mirror displays mode
Updating branch refs/heads/bluesabre/display-settings
to 6fca03e6262b046fbb5793d098270910840b00ec (commit)
from 987b583dfd887c8f5687e6bb92201e7c487ffbe2 (commit)
commit 6fca03e6262b046fbb5793d098270910840b00ec
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Wed Oct 17 22:39:12 2012 +0200
Improve Mirror displays mode
When the checkbox is enabled, all active outputs use the same mode and
position. They revert back to their preferred mode when unchecked.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
dialogs/display-settings/main.c | 19 ++--
dialogs/display-settings/xfce-randr.c | 86 +++-
dialogs/display-settings/xfce-randr.h |5 +-
3 files changed, 57 insertions(+), 53 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index bbfe3dd..033c0a4 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1095,6 +1095,7 @@ display_setting_mirror_displays_toggled (GtkToggleButton
*togglebutton,
{
GObject *positions, *active_displays;
guintn;
+RRMode mode;
if (!xfce_randr)
return;
@@ -1107,14 +1108,16 @@ display_setting_mirror_displays_toggled
(GtkToggleButton *togglebutton,
if (gtk_toggle_button_get_active (togglebutton))
{
-/* Activate mirror-mode */
-
-/* Apply mirror settings to each monitor */
+/* Activate mirror-mode with a single mode for all of them */
+mode = xfce_randr_clonable_mode (xfce_randr);
+/* Apply mirror settings to each output */
for (n = 0; n xfce_randr-noutput; n++)
{
if (xfce_randr-mode[n] == None)
continue;
+if (mode != None)
+xfce_randr-mode[n] = mode;
xfce_randr-relation[n] = XFCE_RANDR_PLACEMENT_MIRROR;
xfce_randr-related_to[n] = active_output;
@@ -1130,7 +1133,15 @@ display_setting_mirror_displays_toggled (GtkToggleButton
*togglebutton,
}
else
{
-/* Deactivate mirror-mode */
+/* Deactivate mirror-mode, use the preferred mode of each output */
+for (n = 0; n xfce_randr-noutput; n++)
+{
+xfce_randr-mode[n] = xfce_randr_preferred_mode (xfce_randr, n);
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+n, TRUE);
+}
+
+xfce_randr_apply (xfce_randr, Default, display_channel);
/* Re-enable the position comboboxes */
gtk_widget_set_sensitive (GTK_WIDGET (positions), TRUE);
diff --git a/dialogs/display-settings/xfce-randr.c
b/dialogs/display-settings/xfce-randr.c
index b9baaff..c114824 100644
--- a/dialogs/display-settings/xfce-randr.c
+++ b/dialogs/display-settings/xfce-randr.c
@@ -69,48 +69,6 @@ static gchar *xfce_randr_friendly_name (XfceRandr *randr,
-static void
-xfce_randr_list_clone_modes (XfceRandr *randr)
-{
-GArray *clone_modes;
-gintl, n, candidate, found;
-guint m;
-
-clone_modes = g_array_new (TRUE, FALSE, sizeof (RRMode));
-
-/* walk all available modes */
-for (n = 0; n randr-priv-resources-nmode; ++n)
-{
-candidate = TRUE;
-/* walk all connected outputs */
-for (m = 0; m randr-noutput; ++m)
-{
-found = FALSE;
-/* walk supported modes from this output */
-for (l = 0; l randr-priv-output_info[m]-nmode; ++l)
-{
-if (randr-priv-resources-modes[n].id ==
randr-priv-output_info[m]-modes[l])
-{
-found = TRUE;
-break;
-}
-}
-
-/* if it is not present in one output, forget it */
-candidate = found;
-}
-
-/* common to all outputs, can be used for clone mode */
-if (candidate)
-clone_modes = g_array_append_val (clone_modes,
randr-priv-resources-modes[n].id);
-}
-
-/* return a normal array (last value - None) */
-randr-clone_modes = (RRMode *) g_array_free (clone_modes, FALSE);
-}
-
-
-
static Rotation
xfce_randr_get_safe_rotations (XfceRandr *randr,
Display *xdisplay,
@@ -365,9 +323,6 @@ xfce_randr_populate (XfceRandr *randr,
randr-friendly_name[m] = xfce_randr_friendly_name (randr, m);
}
-/* clone modes: same RRModes present for all outputs */
-xfce_randr_list_clone_modes (randr);
-
/* calculate relations from positions */
xfce_randr_guess_relations (randr);
}
@@ -448,7 +403,6 @@ xfce_randr_cleanup (XfceRandr *randr)
/* free the settings */
g_free (randr-friendly_name);
-g_free (randr-clone_modes);
g_free (randr-mode);
g_free (randr-priv-modes);
g_free (randr-rotation);
@@ -767,6 +721,46 @@ xfce_randr_preferred_mode (XfceRandr *randr,
+RRMode
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix detection of mirror mode and checkbox sensitivity
Updating branch refs/heads/bluesabre/display-settings
to a8d32fb57656bcee83f067c66909828904a5a6d7 (commit)
from 6fca03e6262b046fbb5793d098270910840b00ec (commit)
commit a8d32fb57656bcee83f067c66909828904a5a6d7
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Wed Oct 17 23:02:14 2012 +0200
Fix detection of mirror mode and checkbox sensitivity
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
dialogs/display-settings/main.c | 37 -
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 033c0a4..0ee24b9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1154,38 +1154,49 @@ static void
display_setting_mirror_displays_populate (GtkBuilder *builder)
{
GObject *check;
+RRMode mode = None;
+guintn;
+gint cloned = TRUE;
if (!xfce_randr)
return;
-if (xfce_randr-noutput = 1)
-return;
-
check = gtk_builder_get_object (builder, mirror-displays);
-/* Only make the check interactive if there is more than one output */
-if (display_settings_get_n_active_outputs () 1)
+/* Can outputs be cloned? */
+if (xfce_randr-noutput 1)
+mode = xfce_randr_clonable_mode (xfce_randr);
+
+gtk_widget_set_sensitive (GTK_WIDGET (check), mode != None);
+if (mode == None)
{
-gtk_widget_set_sensitive (GTK_WIDGET (check), TRUE);
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
return;
}
-else
-gtk_widget_set_sensitive (GTK_WIDGET (check), FALSE);
/* Disconnect the toggled signal to avoid writing the config again */
g_object_disconnect (check, any_signal::toggled,
display_setting_mirror_displays_toggled,
builder, NULL);
-gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- xfce_randr-mode[active_output] != None);
+/* Check if mirror settings are on */
+for (n = 0; n xfce_randr-noutput; n++)
+{
+if (xfce_randr-mode[n] == None)
+continue;
+
+cloned = (xfce_randr-mode[n] == mode
+ xfce_randr-relation[n] == XFCE_RANDR_PLACEMENT_MIRROR);
+
+if (!cloned)
+break;
+}
+
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cloned);
/* Reconnect the signal */
g_signal_connect (G_OBJECT (check), toggled, G_CALLBACK
(display_setting_mirror_displays_toggled),
builder);
-
-/* Write the correct RandR value to xfconf */
-
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Try to harmonize codestyle
Updating branch refs/heads/bluesabre/display-settings
to 9699639b790b19d543adbc977f973e5a19927894 (commit)
from 6722384f225361b09a13a8c793d8527e8ac8a6e7 (commit)
commit 9699639b790b19d543adbc977f973e5a19927894
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Wed Oct 17 22:06:42 2012 +0200
Try to harmonize codestyle
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
dialogs/display-settings/main.c | 591 +++
1 files changed, 284 insertions(+), 307 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 6c1656e..94a7f9e 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -163,21 +163,19 @@ static GHashTable *display_popups;
gboolean supports_alpha = FALSE;
-static void
-display_settings_minimal_only_display1_toggled (GtkToggleButton *button,
- GtkBuilder *builder);
-
-static void
-display_settings_minimal_mirror_displays_toggled (GtkToggleButton *button,
- GtkBuilder *builder);
-
-static void
-display_settings_minimal_extend_right_toggled (GtkToggleButton *button,
- GtkBuilder *builder);
-
-static void
-display_settings_minimal_only_display2_toggled (GtkToggleButton *button,
- GtkBuilder *builder);
+
+
+static void display_settings_minimal_only_display1_toggled (GtkToggleButton
*button,
+ GtkBuilder
*builder);
+
+static void display_settings_minimal_mirror_displays_toggled (GtkToggleButton
*button,
+ GtkBuilder
*builder);
+
+static void display_settings_minimal_extend_right_toggled(GtkToggleButton
*button,
+ GtkBuilder
*builder);
+
+static void display_settings_minimal_only_display2_toggled (GtkToggleButton
*button,
+ GtkBuilder
*builder);
static guint
@@ -296,13 +294,13 @@ display_setting_timed_confirmation (GtkBuilder
*main_builder)
confirmation_dialog-count = 10;
dialog = gtk_builder_get_object (builder, dialog1);
-
+
g_signal_connect (G_OBJECT (dialog), focus-out-event, G_CALLBACK
(display_setting_toggle_identity_popups),
- GINT_TO_POINTER (FALSE));
-
+ GINT_TO_POINTER (FALSE));
+
g_signal_connect (G_OBJECT (dialog), focus-in-event, G_CALLBACK
(display_setting_toggle_identity_popups),
- GINT_TO_POINTER (TRUE));
-
+ GINT_TO_POINTER (TRUE));
+
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW
(main_dialog));
source_id = g_timeout_add_seconds (1, (GSourceFunc)
display_settings_update_time_label,
confirmation_dialog);
@@ -395,21 +393,17 @@ display_setting_positions_populate (GtkBuilder *builder)
combobox = gtk_builder_get_object (builder, randr-position);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
gtk_list_store_clear (GTK_LIST_STORE (model));
-
+
/* Only make the combobox interactive if there is more than one output */
-if (display_settings_get_n_active_outputs () 1)
-{
-gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
-}
-else
-gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
-
+gtk_widget_set_sensitive (GTK_WIDGET (combobox),
+ display_settings_get_n_active_outputs () 1);
+
/* Disconnect the changed signal to avoid triggering the confirmation
* dialog */
g_object_disconnect (combobox, any_signal::changed,
display_setting_positions_changed,
builder, NULL);
-
+
/* Try to insert the relations */
for (n = 0; n G_N_ELEMENTS (relation_names); n++)
{
@@ -422,24 +416,24 @@ display_setting_positions_populate (GtkBuilder *builder)
if (relation_names[n].relation == xfce_randr-relation[active_output])
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), iter);
}
-
+
/* Reconnect the signal */
g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK
(display_setting_positions_changed), builder);
}
static void
display_setting_active_displays_changed (GtkComboBox *combobox,
- GtkBuilder *builder)
+ GtkBuilder *builder)
{
-gint value;
GObject *position_combobox;
+
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix visibility of elements depending on the number of outputs
Updating branch refs/heads/bluesabre/display-settings
to 9e57b159422264e231c17f5cbbef58b517f56852 (commit)
from 90d0b481bdb27d926558a1d401e12d3bfb58d2cf (commit)
commit 9e57b159422264e231c17f5cbbef58b517f56852
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Wed Oct 17 23:50:42 2012 +0200
Fix visibility of elements depending on the number of outputs
And connect signals even when only 1 output is present, since hot-plug is
supported (Bug #8327).
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
dialogs/display-settings/display-dialog.glade |2 +-
dialogs/display-settings/main.c | 46 +---
2 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/dialogs/display-settings/display-dialog.glade
b/dialogs/display-settings/display-dialog.glade
index 8bce601..c7357a3 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -210,7 +210,7 @@
/packing
/child
child
- object class=GtkLabel id=label1
+ object class=GtkLabel id=label-position
property name=visibleTrue/property
property name=can_focusFalse/property
property name=xalign0/property
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index eb66c75..c7e5332 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -385,7 +385,7 @@ static void
display_setting_positions_populate (GtkBuilder *builder)
{
GtkTreeModel *model;
-GObject *combobox, *mirror_displays;
+GObject *combobox, *label, *mirror_displays;
GtkTreeIter iter;
guint n;
@@ -394,6 +394,19 @@ display_setting_positions_populate (GtkBuilder *builder)
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
gtk_list_store_clear (GTK_LIST_STORE (model));
+label = gtk_builder_get_object (builder, label-position);
+if (xfce_randr-noutput 1)
+{
+gtk_widget_show (GTK_WIDGET (label));
+gtk_widget_show (GTK_WIDGET (combobox));
+}
+else
+{
+gtk_widget_hide (GTK_WIDGET (label));
+gtk_widget_hide (GTK_WIDGET (combobox));
+return;
+}
+
/* Only make the combobox interactive if there is more than one output,
and if they are not in mirror mode */
mirror_displays = gtk_builder_get_object (builder, mirror-displays);
@@ -455,6 +468,14 @@ display_setting_active_displays_populate (GtkBuilder
*builder)
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
gtk_list_store_clear (GTK_LIST_STORE (model));
+if (xfce_randr-noutput 1)
+gtk_widget_show (GTK_WIDGET (combobox));
+else
+{
+gtk_widget_hide (GTK_WIDGET (combobox));
+return;
+}
+
/* Only make the combobox interactive if there is more than one output,
and if they are not in mirror mode */
mirror_displays = gtk_builder_get_object (builder, mirror-displays);
@@ -1179,6 +1200,14 @@ display_setting_mirror_displays_populate (GtkBuilder
*builder)
check = gtk_builder_get_object (builder, mirror-displays);
+if (xfce_randr-noutput 1)
+gtk_widget_show (GTK_WIDGET (check));
+else
+{
+gtk_widget_hide (GTK_WIDGET (check));
+return;
+}
+
/* Can outputs be cloned? */
if (display_settings_get_n_active_outputs () 1)
mode = xfce_randr_clonable_mode (xfce_randr);
@@ -1268,11 +1297,16 @@ display_setting_output_status_populate (GtkBuilder
*builder)
if (!xfce_randr)
return;
-if (xfce_randr-noutput = 1)
-return;
-
check = gtk_builder_get_object (builder, output-on);
+if (xfce_randr-noutput 1)
+gtk_widget_show (GTK_WIDGET (check));
+else
+{
+gtk_widget_hide (GTK_WIDGET (check));
+return;
+}
+
/* Disconnect the toggled signal to avoid writing the config again */
g_object_disconnect (check, any_signal::toggled,
display_setting_output_toggled,
@@ -1471,12 +1505,12 @@ display_settings_dialog_new (GtkBuilder *builder)
/* Setup the combo boxes */
check = gtk_builder_get_object (builder, output-on);
mirror = gtk_builder_get_object (builder, mirror-displays);
+g_signal_connect (G_OBJECT (check), toggled, G_CALLBACK
(display_setting_output_toggled), builder);
+g_signal_connect (G_OBJECT (mirror), toggled, G_CALLBACK
(display_setting_mirror_displays_toggled), builder);
if (xfce_randr-noutput 1)
{
gtk_widget_show (GTK_WIDGET (check));
-g_signal_connect (G_OBJECT (check), toggled, G_CALLBACK
(display_setting_output_toggled), builder);
gtk_widget_show (GTK_WIDGET (mirror));
-g_signal_connect (G_OBJECT (mirror), toggled, G_CALLBACK
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Really fix items' sensitivity, for real this time
Updating branch refs/heads/bluesabre/display-settings
to 90d0b481bdb27d926558a1d401e12d3bfb58d2cf (commit)
from a8d32fb57656bcee83f067c66909828904a5a6d7 (commit)
commit 90d0b481bdb27d926558a1d401e12d3bfb58d2cf
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Wed Oct 17 23:27:43 2012 +0200
Really fix items' sensitivity, for real this time
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
dialogs/display-settings/main.c | 53 +-
1 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0ee24b9..eb66c75 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -385,7 +385,7 @@ static void
display_setting_positions_populate (GtkBuilder *builder)
{
GtkTreeModel *model;
-GObject *combobox;
+GObject *combobox, *mirror_displays;
GtkTreeIter iter;
guint n;
@@ -394,9 +394,15 @@ display_setting_positions_populate (GtkBuilder *builder)
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
gtk_list_store_clear (GTK_LIST_STORE (model));
-/* Only make the combobox interactive if there is more than one output */
-gtk_widget_set_sensitive (GTK_WIDGET (combobox),
- display_settings_get_n_active_outputs () 1);
+/* Only make the combobox interactive if there is more than one output,
+ and if they are not in mirror mode */
+mirror_displays = gtk_builder_get_object (builder, mirror-displays);
+if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mirror_displays)) ||
+display_settings_get_n_active_outputs () = 1)
+{
+gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
+return;
+}
/* Disconnect the changed signal to avoid triggering the confirmation
* dialog */
@@ -440,18 +446,24 @@ static void
display_setting_active_displays_populate (GtkBuilder *builder)
{
GtkTreeModel *model;
-GObject *combobox;
+GObject *combobox, *mirror_displays;
guint n;
GtkTreeIter iter;
/* Get the active-displays combo box store and clear it */
combobox = gtk_builder_get_object (builder, randr-active-displays);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
-gtk_list_store_clear (GTK_LIST_STORE (model));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
-/* Only make the combobox interactive if there is more than one output */
-gtk_widget_set_sensitive (GTK_WIDGET (combobox),
- display_settings_get_n_active_outputs () 1);
+/* Only make the combobox interactive if there is more than one output,
+ and if they are not in mirror mode */
+mirror_displays = gtk_builder_get_object (builder, mirror-displays);
+if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mirror_displays)) ||
+display_settings_get_n_active_outputs () = 1)
+{
+gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
+return;
+}
/* Disconnect the changed signal to avoid triggering the confirmation
* dialog */
@@ -1100,12 +1112,16 @@ display_setting_mirror_displays_toggled
(GtkToggleButton *togglebutton,
if (!xfce_randr)
return;
-if (xfce_randr-noutput = 1)
-return;
-
positions = gtk_builder_get_object (builder, randr-position);
active_displays = gtk_builder_get_object (builder,
randr-active-displays);
+if (display_settings_get_n_active_outputs () = 1)
+{
+gtk_widget_set_sensitive (GTK_WIDGET (positions), FALSE);
+gtk_widget_set_sensitive (GTK_WIDGET (active_displays), FALSE);
+return;
+}
+
if (gtk_toggle_button_get_active (togglebutton))
{
/* Activate mirror-mode with a single mode for all of them */
@@ -1164,7 +1180,7 @@ display_setting_mirror_displays_populate (GtkBuilder
*builder)
check = gtk_builder_get_object (builder, mirror-displays);
/* Can outputs be cloned? */
-if (xfce_randr-noutput 1)
+if (display_settings_get_n_active_outputs () 1)
mode = xfce_randr_clonable_mode (xfce_randr);
gtk_widget_set_sensitive (GTK_WIDGET (check), mode != None);
@@ -1276,7 +1292,6 @@ display_settings_treeview_selection_changed
(GtkTreeSelection *selection,
{
GtkTreeModel *model;
GtkTreeIter iter;
-GObject *mirror_displays, *position_combo, *display_combo;
GtkWidget*popup;
gboolean has_selection;
gint active_id, previous_id;
@@ -1302,16 +1317,6 @@ display_settings_treeview_selection_changed
(GtkTreeSelection *selection,
display_setting_rotations_populate (builder);
display_setting_reflections_populate (builder);
-mirror_displays = gtk_builder_get_object (builder, mirror-displays);
-if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix buggy computation of the screen size
Updating branch refs/heads/bluesabre/display-settings
to 474ddceaeaf57cec633dd0dc9a8317712c5f2af0 (commit)
from 3675e183cbf310dcd61eef51bd675906ae650115 (commit)
commit 474ddceaeaf57cec633dd0dc9a8317712c5f2af0
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Thu Oct 18 14:25:14 2012 +0200
Fix buggy computation of the screen size
It's meaningless with multiple outputs, so change the code to match what's
done
in other apps (GnomeRR, chromeos).
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
xfsettingsd/displays.c | 23 ---
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index b21b2bc..2517057 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -169,26 +169,19 @@ xfce_displays_helper_process_screen_size (gint
mode_width,
gint *mm_width,
gint *mm_height)
{
-gdouble dpi = 0;
-
g_assert (width height mm_width mm_height);
*width = MAX (*width, crtc_pos_x + mode_width);
*height = MAX (*height, crtc_pos_y + mode_height);
-dpi = 25.4 * gdk_screen_height ();
-dpi /= gdk_screen_height_mm ();
-
-if (dpi = 0)
-{
-*mm_width = gdk_screen_width_mm ();
-*mm_height = gdk_screen_height_mm ();
-}
-else
-{
-*mm_width = 25.4 * (*width) / dpi;
-*mm_height = 25.4 * (*height) / dpi;
-}
+/* The 'physical size' of an X screen is meaningless if that screen
+ * can consist of many monitors. So just pick a size that make the
+ * dpi 96.
+ *
+ * Firefox and Evince apparently believe what X tells them.
+ */
+*mm_width = (*width / 96.0) * 25.4 + 0.5;
+*mm_height = (*height / 96.0) * 25.4 + 0.5;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Recompute dimensions even if the mode hasn't changed
Updating branch refs/heads/bluesabre/display-settings
to 3675e183cbf310dcd61eef51bd675906ae650115 (commit)
from 9e57b159422264e231c17f5cbbef58b517f56852 (commit)
commit 3675e183cbf310dcd61eef51bd675906ae650115
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Thu Oct 18 13:06:39 2012 +0200
Recompute dimensions even if the mode hasn't changed
(because the rotation may have changed)
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
xfsettingsd/displays.c | 22 +++---
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 8948637..b21b2bc 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -676,18 +676,18 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
/* update CRTC mode */
crtc-mode = valid_mode;
crtc-changed = TRUE;
+}
-/* recompute dimensions according to the selected rotation */
-if ((crtc-rotation (RR_Rotate_90|RR_Rotate_270)) != 0)
-{
-crtc-width = resources-modes[l].height;
-crtc-height = resources-modes[l].width;
-}
-else
-{
-crtc-width = resources-modes[l].width;
-crtc-height = resources-modes[l].height;
-}
+/* recompute dimensions according to the selected rotation */
+if ((crtc-rotation (RR_Rotate_90|RR_Rotate_270)) != 0)
+{
+crtc-width = resources-modes[l].height;
+crtc-height = resources-modes[l].width;
+}
+else
+{
+crtc-width = resources-modes[l].width;
+crtc-height = resources-modes[l].height;
}
/* position, x */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Switch to gdk function to grab/ungrab the server
Updating branch refs/heads/bluesabre/display-settings to ae5c5d0fc5b730fd1ca0538de105aae0f02c3933 (commit) from 474ddceaeaf57cec633dd0dc9a8317712c5f2af0 (commit) commit ae5c5d0fc5b730fd1ca0538de105aae0f02c3933 Author: Lionel Le Folgoc lio...@lefolgoc.net Date: Thu Oct 18 14:29:44 2012 +0200 Switch to gdk function to grab/ungrab the server Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at xfsettingsd/displays.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c index 2517057..5af8614 100644 --- a/xfsettingsd/displays.c +++ b/xfsettingsd/displays.c @@ -726,7 +726,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper *helper, } /* grab server to prevent clients from thinking no output is enabled */ -XGrabServer (xdisplay); +gdk_x11_display_grab (display); /* second loop, normalization and global settings */ for (m = 0; m resources-ncrtc; ++m) @@ -786,7 +786,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper *helper, } /* release the grab, changes are done */ -XUngrabServer (xdisplay); +gdk_x11_display_ungrab (display); err_cleanup: /* Free the xfconf properties */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Improve debug statements
Updating branch refs/heads/bluesabre/display-settings
to 0726b622b7e3bd4a7b22fcca11bb7ce5803e8758 (commit)
from ae5c5d0fc5b730fd1ca0538de105aae0f02c3933 (commit)
commit 0726b622b7e3bd4a7b22fcca11bb7ce5803e8758
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Thu Oct 18 15:23:59 2012 +0200
Improve debug statements
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
xfsettingsd/displays.c | 16 ++--
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 5af8614..2212092 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -412,6 +412,10 @@ xfce_displays_helper_set_outputs (XfceRRCrtc *crtc,
g_assert (crtc);
+for (n = 0; n crtc-noutput; ++n)
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, CRTC %lu, output list[%d] -
%lu., crtc-id, n,
+crtc-outputs[n]);
+
/* check if the output is already present */
for (n = 0; n crtc-noutput; ++n)
{
@@ -430,9 +434,8 @@ xfce_displays_helper_set_outputs (XfceRRCrtc *crtc,
crtc-outputs [crtc-noutput++] = output;
crtc-changed = TRUE;
-for (n = 0; n crtc-noutput; ++n)
-xfsettings_dbg (XFSD_DEBUG_DISPLAYS, CRTC %lu, output list: %d -
%lu., crtc-id, n,
-crtc-outputs[n]);
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, CRTC %lu, output list[%d] - %lu.,
crtc-id,
+crtc-noutput - 1, crtc-outputs[crtc-noutput - 1]);
}
@@ -759,9 +762,6 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
}
-xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Desktop dimensions: %dx%d (px),
%dx%d (mm).,
-width, height, mm_width, mm_height);
-
/* set the screen size only if it's really needed and valid */
if (width = min_width width = max_width
height = min_height height = max_height
@@ -769,8 +769,12 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
|| height != gdk_screen_height ()
|| mm_width != gdk_screen_width_mm ()
|| mm_height != gdk_screen_height_mm ()))
+{
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Applying desktop dimensions:
%dx%d (px), %dx%d (mm).,
+width, height, mm_width, mm_height);
XRRSetScreenSize (xdisplay, GDK_WINDOW_XID (root_window),
width, height, mm_width, mm_height);
+}
/* final loop, apply crtc changes */
for (m = 0; m resources-ncrtc; ++m)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Set the primary output after the changes have been applied
Updating branch refs/heads/bluesabre/display-settings
to 3276965d52ccd6234ae981e78a5dc4fdcccf73d3 (commit)
from 0726b622b7e3bd4a7b22fcca11bb7ce5803e8758 (commit)
commit 3276965d52ccd6234ae981e78a5dc4fdcccf73d3
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Thu Oct 18 16:58:45 2012 +0200
Set the primary output after the changes have been applied
And set it to None if no primary output was present in xfconf.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
xfsettingsd/displays.c | 12 +++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 2212092..7a14088 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -200,6 +200,8 @@ xfce_displays_helper_list_crtcs (Display
*xdisplay,
crtcs = g_new0 (XfceRRCrtc, resources-ncrtc);
for (n = 0; n resources-ncrtc; ++n)
{
+xfsettings_dbg (XFSD_DEBUG_DISPLAYS, Detected CRTC %lu.,
resources-crtcs[n]);
+
crtcs[n].id = resources-crtcs[n];
crtc_info = XRRGetCrtcInfo (xdisplay, resources, resources-crtcs[n]);
crtcs[n].mode = crtc_info-mode;
@@ -463,6 +465,9 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
GPtrArray *connected_outputs;
GHashTable *saved_outputs;
XfceRROutput *output;
+#ifdef HAS_RANDR_ONE_POINT_THREE
+RROutputprimary = None;
+#endif
gdk_error_trap_push ();
@@ -522,7 +527,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
output-info-name);
value = g_hash_table_lookup (saved_outputs, property);
if (G_VALUE_HOLDS_BOOLEAN (value) g_value_get_boolean (value))
-XRRSetOutputPrimary (xdisplay, GDK_WINDOW_XID (root_window),
output-id);
+primary = output-id;
}
#endif
@@ -789,6 +794,11 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper
*helper,
}
}
+#ifdef HAS_RANDR_ONE_POINT_THREE
+if (helper-has_1_3)
+XRRSetOutputPrimary (xdisplay, GDK_WINDOW_XID (root_window),
primary);
+#endif
+
/* release the grab, changes are done */
gdk_x11_display_ungrab (display);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Flush the X buffer on exit
Updating branch refs/heads/bluesabre/display-settings to d18158b1ae3f97a8799343aba1e6d2817a42fddf (commit) from 3276965d52ccd6234ae981e78a5dc4fdcccf73d3 (commit) commit d18158b1ae3f97a8799343aba1e6d2817a42fddf Author: Lionel Le Folgoc lio...@lefolgoc.net Date: Thu Oct 18 17:29:12 2012 +0200 Flush the X buffer on exit Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at xfsettingsd/displays.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c index 7a14088..9f01694 100644 --- a/xfsettingsd/displays.c +++ b/xfsettingsd/displays.c @@ -821,6 +821,7 @@ err_cleanup: /* free the screen resources */ XRRFreeScreenResources (resources); +gdk_flush (); gdk_error_trap_pop (); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix sensitivity-state of widgets (Lionel)
Updating branch refs/heads/bluesabre/display-settings to f478a0e13f9cd48174016e198251198580d6f880 (commit) from d18158b1ae3f97a8799343aba1e6d2817a42fddf (commit) commit f478a0e13f9cd48174016e198251198580d6f880 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Oct 18 23:33:23 2012 +0200 Fix sensitivity-state of widgets (Lionel) dialogs/display-settings/main.c |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c index c7e5332..1b12110 100644 --- a/dialogs/display-settings/main.c +++ b/dialogs/display-settings/main.c @@ -416,6 +416,7 @@ display_setting_positions_populate (GtkBuilder *builder) gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE); return; } +gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE); /* Disconnect the changed signal to avoid triggering the confirmation * dialog */ @@ -466,7 +467,7 @@ display_setting_active_displays_populate (GtkBuilder *builder) /* Get the active-displays combo box store and clear it */ combobox = gtk_builder_get_object (builder, randr-active-displays); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combobox)); - gtk_list_store_clear (GTK_LIST_STORE (model)); +gtk_list_store_clear (GTK_LIST_STORE (model)); if (xfce_randr-noutput 1) gtk_widget_show (GTK_WIDGET (combobox)); @@ -485,6 +486,7 @@ display_setting_active_displays_populate (GtkBuilder *builder) gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE); return; } +gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE); /* Disconnect the changed signal to avoid triggering the confirmation * dialog */ @@ -1218,6 +1220,7 @@ display_setting_mirror_displays_populate (GtkBuilder *builder) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE); return; } +gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); /* Disconnect the toggled signal to avoid writing the config again */ g_object_disconnect (check, any_signal::toggled, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Set labels in identity-popups to non-translatable
Updating branch refs/heads/bluesabre/display-settings to 761f6b7aa4bba9355b171dc7bae1b91f0d3503d1 (commit) from f478a0e13f9cd48174016e198251198580d6f880 (commit) commit 761f6b7aa4bba9355b171dc7bae1b91f0d3503d1 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Oct 18 23:50:45 2012 +0200 Set labels in identity-popups to non-translatable dialogs/display-settings/identity-popup.glade |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dialogs/display-settings/identity-popup.glade b/dialogs/display-settings/identity-popup.glade index da5d733..f6386d5 100644 --- a/dialogs/display-settings/identity-popup.glade +++ b/dialogs/display-settings/identity-popup.glade @@ -37,7 +37,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yeslt;biggt;lt;bgt;Display: Namelt;/bgt;lt;/biggt;/property +property name=label translatable=nolt;biggt;lt;bgt;Display: Namelt;/bgt;lt;/biggt;/property property name=use_markupTrue/property /object packing @@ -51,7 +51,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesResolution: 1280 x 800, Refresh Rate: 60.0 Hz/property +property name=label translatable=noResolution: 1280 x 800/property /object packing property name=expandTrue/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix sensitive state of mirror-toggle (oops)
Updating branch refs/heads/bluesabre/display-settings to b259340a157bcec94152279c8efd17845e26af7e (commit) from 761f6b7aa4bba9355b171dc7bae1b91f0d3503d1 (commit) commit b259340a157bcec94152279c8efd17845e26af7e Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Fri Oct 19 00:20:40 2012 +0200 Fix sensitive state of mirror-toggle (oops) dialogs/display-settings/main.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c index 1b12110..3db4f88 100644 --- a/dialogs/display-settings/main.c +++ b/dialogs/display-settings/main.c @@ -1220,7 +1220,6 @@ display_setting_mirror_displays_populate (GtkBuilder *builder) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE); return; } -gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); /* Disconnect the toggled signal to avoid writing the config again */ g_object_disconnect (check, any_signal::toggled, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
