Attachment #193008 for bug #269366

View | Details | Raw Unified | Return to bug 269366
Collapse All | Expand All




            ev->type == ClientMessage &&
            ev->xclient.message_type == gnome_randr_xatom ()) {

                gnome_rr_config_apply_stored (screen, NULL);

                return GDK_FILTER_REMOVE;
        }

                /* FIXME: here we should cycle between valid
                 * configurations, and save them
                 */
                gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL);

                return GDK_FILTER_CONTINUE;
        }


                output->rotation = rotation_to_test;

                if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen, NULL)) {
                        (*out_num_rotations)++;
                        (*out_rotations) |= rotation_to_test;
                }


        error = NULL;
        if (gnome_rr_config_save (priv->configuration, &error)) {
                if (!gnome_rr_config_apply_stored (priv->rw_screen, NULL)) {
                        error_dialog (_("The selected rotation could not be applied"),
                                      _("An error occurred while configuring the screen"));
                        /* FIXME: that message is really useless.  Make

        g_debug ("Starting xrandr manager");

        manager->priv->rw_screen = gnome_rr_screen_new (
                gdk_screen_get_default (), on_randr_event, manager, NULL);

        if (manager->priv->rw_screen == NULL) {
                g_set_error (error, 0, 0, "Failed to initialize XRandR extension");

                gdk_error_trap_pop ();
        }

        gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL);

        gdk_window_add_filter (gdk_get_default_root_window(),
                               (GdkFilterFunc)event_filter,

Return to bug 269366

Lines 118-124 on_client_message (GdkXEvent *xevent, Link Here

(-)gnome-settings-daemon-2.24.1.orig/plugins/xrandr/gsd-xrandr-manager.c (-6 / +6 lines)
118	ev->type == ClientMessage &&	118	ev->type == ClientMessage &&
119	ev->xclient.message_type == gnome_randr_xatom ()) {	119	ev->xclient.message_type == gnome_randr_xatom ()) {
120		120
121	gnome_rr_config_apply_stored (screen);	121	gnome_rr_config_apply_stored (screen, NULL);
122		122
123	return GDK_FILTER_REMOVE;	123	return GDK_FILTER_REMOVE;
124	}	124	}
Lines 146-152 event_filter (GdkXEvent *xeven Link Here
146	/* FIXME: here we should cycle between valid	146	/* FIXME: here we should cycle between valid
147	* configurations, and save them	147	* configurations, and save them
148	*/	148	*/
149	gnome_rr_config_apply_stored (manager->priv->rw_screen);	149	gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL);
150		150
151	return GDK_FILTER_CONTINUE;	151	return GDK_FILTER_CONTINUE;
152	}	152	}
Lines 391-397 get_allowed_rotations_for_output (GsdXra Link Here
391		391
392	output->rotation = rotation_to_test;	392	output->rotation = rotation_to_test;
393		393
394	if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen)) {	394	if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen, NULL)) {
395	(*out_num_rotations)++;	395	(*out_num_rotations)++;
396	(*out_rotations) \|= rotation_to_test;	396	(*out_rotations) \|= rotation_to_test;
397	}	397	}
Lines 456-462 output_rotation_item_activate_cb (GtkChe Link Here
456		456
457	error = NULL;	457	error = NULL;
458	if (gnome_rr_config_save (priv->configuration, &error)) {	458	if (gnome_rr_config_save (priv->configuration, &error)) {
459	if (!gnome_rr_config_apply_stored (priv->rw_screen)) {	459	if (!gnome_rr_config_apply_stored (priv->rw_screen, NULL)) {
460	error_dialog (_("The selected rotation could not be applied"),	460	error_dialog (_("The selected rotation could not be applied"),
461	_("An error occurred while configuring the screen"));	461	_("An error occurred while configuring the screen"));
462	/* FIXME: that message is really useless. Make	462	/* FIXME: that message is really useless. Make
Lines 694-700 gsd_xrandr_manager_start (GsdXrandrManag Link Here
694	g_debug ("Starting xrandr manager");	694	g_debug ("Starting xrandr manager");
695		695
696	manager->priv->rw_screen = gnome_rr_screen_new (	696	manager->priv->rw_screen = gnome_rr_screen_new (
697	gdk_screen_get_default (), on_randr_event, manager);	697	gdk_screen_get_default (), on_randr_event, manager, NULL);
698		698
699	if (manager->priv->rw_screen == NULL) {	699	if (manager->priv->rw_screen == NULL) {
700	g_set_error (error, 0, 0, "Failed to initialize XRandR extension");	700	g_set_error (error, 0, 0, "Failed to initialize XRandR extension");
Lines 728-734 gsd_xrandr_manager_start (GsdXrandrManag Link Here
728	gdk_error_trap_pop ();	728	gdk_error_trap_pop ();
729	}	729	}
730		730
731	gnome_rr_config_apply_stored (manager->priv->rw_screen);	731	gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL);
732		732
733	gdk_window_add_filter (gdk_get_default_root_window(),	733	gdk_window_add_filter (gdk_get_default_root_window(),
734	(GdkFilterFunc)event_filter,	734	(GdkFilterFunc)event_filter,