From 3b0dc557ca0fe21d59fba8bf7cd653c63b32ea48 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Sun, 16 Dec 2012 10:31:16 +0100 Subject: ephy-state: rename to 'ephy-initial-state' The purpose of EphyState is to track the sizes and positions of windows, paned or expanders in order to remember what is the preferred *initial* and *default* state of those UI elements. So for example we merge the tracking of the size/positions of all main windows in one record, because we only need an initial value which we'll use as default for newly created EphyWindows. Since this is a very specific task, different to the actual tracking of all sizes and positions in EphySession in order to restore them at startup, rename the class to EphyInitialState to avoid confusions. --- lib/Makefile.am | 10 +- lib/ephy-dialog.c | 18 +- lib/ephy-file-chooser.c | 1 - lib/ephy-initial-state.c | 462 +++++++++++++++++++++++++++++++ lib/ephy-initial-state.h | 57 ++++ lib/ephy-state.c | 462 ------------------------------- lib/ephy-state.h | 57 ---- src/bookmarks/ephy-bookmark-properties.c | 14 +- src/bookmarks/ephy-bookmarks-editor.c | 16 +- src/ephy-history-window.c | 16 +- src/ephy-main.c | 4 +- src/ephy-window.c | 8 +- src/pdm-dialog.c | 1 - src/window-commands.c | 1 - 14 files changed, 562 insertions(+), 565 deletions(-) create mode 100644 lib/ephy-initial-state.c create mode 100644 lib/ephy-initial-state.h delete mode 100644 lib/ephy-state.c delete mode 100644 lib/ephy-state.h diff --git a/lib/Makefile.am b/lib/Makefile.am index c120afc51..146e64709 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -32,15 +32,15 @@ NOINST_H_FILES = \ ephy-zoom.h TYPES_H_FILES = \ - ephy-node.h \ - ephy-state.h + ephy-initial-state.h \ + ephy-node.h INST_H_FILES = \ ephy-dialog.h \ + ephy-initial-state.h \ ephy-node.h \ ephy-node-db.h \ - ephy-settings.h \ - ephy-state.h + ephy-settings.h libephymisc_la_SOURCES = \ ephy-debug.c \ @@ -50,6 +50,7 @@ libephymisc_la_SOURCES = \ ephy-file-chooser.c \ ephy-file-helpers.c \ ephy-gui.c \ + ephy-initial-state.c \ ephy-langs.c \ ephy-node.c \ ephy-node.h \ @@ -66,7 +67,6 @@ libephymisc_la_SOURCES = \ ephy-snapshot-service.c \ ephy-sqlite-connection.c \ ephy-sqlite-statement.c \ - ephy-state.c \ ephy-string.c \ ephy-time-helpers.c \ ephy-web-app-utils.c \ diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c index f170d01f5..a5dd290e6 100644 --- a/lib/ephy-dialog.c +++ b/lib/ephy-dialog.c @@ -21,7 +21,7 @@ #include "config.h" #include "ephy-dialog.h" -#include "ephy-state.h" +#include "ephy-initial-state.h" #include "ephy-gui.h" #include "ephy-debug.h" @@ -110,20 +110,20 @@ setup_default_size (EphyDialog *dialog) { if (dialog->priv->has_default_size == FALSE) { - EphyStateWindowFlags flags; + EphyInitialStateWindowFlags flags; - flags = EPHY_STATE_WINDOW_SAVE_SIZE; + flags = EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE; if (dialog->priv->persist_position) { - flags |= EPHY_STATE_WINDOW_SAVE_POSITION; + flags |= EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION; } - ephy_state_add_window (dialog->priv->dialog, - dialog->priv->name, - dialog->priv->default_width, - dialog->priv->default_height, - FALSE, flags); + ephy_initial_state_add_window (dialog->priv->dialog, + dialog->priv->name, + dialog->priv->default_width, + dialog->priv->default_height, + FALSE, flags); dialog->priv->has_default_size = TRUE; } diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c index 2e228103d..4f8357578 100644 --- a/lib/ephy-file-chooser.c +++ b/lib/ephy-file-chooser.c @@ -22,7 +22,6 @@ #include "ephy-file-chooser.h" #include "ephy-file-helpers.h" -#include "ephy-state.h" #include "ephy-gui.h" #include "ephy-debug.h" #include "ephy-settings.h" diff --git a/lib/ephy-initial-state.c b/lib/ephy-initial-state.c new file mode 100644 index 000000000..fb625ac45 --- /dev/null +++ b/lib/ephy-initial-state.c @@ -0,0 +1,462 @@ +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* + * Copyright © 2001 Matthew Mueller + * Copyright © 2002 Jorn Baayen + * Copyright © 2003 Marco Pesenti Gritti + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "config.h" +#include "ephy-initial-state.h" + +#include "ephy-file-helpers.h" +#include "ephy-lib-type-builtins.h" +#include "ephy-node-common.h" +#include "ephy-node-db.h" + +#include +#include + +#define EPHY_STATES_XML_FILE "states.xml" +#define EPHY_STATES_XML_ROOT (const xmlChar *)"ephy_states" +#define EPHY_STATES_XML_VERSION (const xmlChar *)"1.0" + +enum +{ + EPHY_NODE_INITIAL_STATE_PROP_NAME = 2, + EPHY_NODE_INITIAL_STATE_PROP_WIDTH = 3, + EPHY_NODE_INITIAL_STATE_PROP_HEIGHT = 4, + EPHY_NODE_INITIAL_STATE_PROP_MAXIMIZE = 5, + EPHY_NODE_INITIAL_STATE_PROP_POSITION_X = 6, + EPHY_NODE_INITIAL_STATE_PROP_POSITION_Y = 7, + EPHY_NODE_INITIAL_STATE_PROP_SIZE = 8, + EPHY_NODE_INITIAL_STATE_PROP_POSITION = 9, + EPHY_NODE_INITIAL_STATE_PROP_ACTIVE = 10 +}; + +static EphyNode *states = NULL; +static EphyNodeDb *states_db = NULL; + +static void +ephy_states_save (void) +{ + char *xml_file; + + xml_file = g_build_filename (ephy_dot_dir (), + EPHY_STATES_XML_FILE, + NULL); + + ephy_node_db_write_to_xml_safe (states_db, + (const xmlChar *)xml_file, + EPHY_STATES_XML_ROOT, + EPHY_STATES_XML_VERSION, + NULL, /* comment */ + states, NULL, NULL, + NULL); + + g_free (xml_file); +} + +static EphyNode * +find_by_name (const char *name) +{ + EphyNode *result = NULL; + GPtrArray *children; + int i; + + children = ephy_node_get_children (states); + for (i = 0; i < children->len; i++) { + EphyNode *kid; + const char *node_name; + + kid = g_ptr_array_index (children, i); + + node_name = ephy_node_get_property_string + (kid, EPHY_NODE_INITIAL_STATE_PROP_NAME); + + if (strcmp (node_name, name) == 0) + result = kid; + } + + return result; +} + +static void +ensure_states (void) +{ + if (states == NULL) { + char *xml_file; + + xml_file = g_build_filename (ephy_dot_dir (), + EPHY_STATES_XML_FILE, + NULL); + + states_db = ephy_node_db_new (EPHY_NODE_DB_STATES); + states = ephy_node_new_with_id (states_db, STATES_NODE_ID); + ephy_node_db_load_from_file (states_db, xml_file, + EPHY_STATES_XML_ROOT, + EPHY_STATES_XML_VERSION); + + g_free (xml_file); + } +} + +static void +ephy_state_window_set_size (GtkWidget *window, EphyNode *node) +{ + int width, height, w = -1, h = -1; + gboolean maximize, size; + + width = ephy_node_get_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_WIDTH); + height = ephy_node_get_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_HEIGHT); + maximize = ephy_node_get_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_MAXIMIZE); + size = ephy_node_get_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_SIZE); + + gtk_window_get_default_size (GTK_WINDOW (window), &w, &h); + + if (size && w == -1 && h == -1) { + GdkScreen *screen; + int screen_width, screen_height; + + screen = gdk_screen_get_default (); + screen_width = gdk_screen_get_width (screen); + screen_height = gdk_screen_get_height (screen); + + gtk_window_set_default_size (GTK_WINDOW (window), + MIN (width, screen_width), + MIN (height, screen_height)); + } + + if (maximize) + gtk_window_maximize (GTK_WINDOW (window)); +} + +static void +ephy_state_window_set_position (GtkWidget *window, EphyNode *node) +{ + GdkScreen *screen; + int x, y; + int screen_width, screen_height; + gboolean maximize, size; + + g_return_if_fail (GTK_IS_WINDOW (window)); + + /* Setting the default size doesn't work when the window is already showing. */ + g_return_if_fail (!gtk_widget_get_visible (window)); + + maximize = ephy_node_get_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_MAXIMIZE); + size = ephy_node_get_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION); + + /* Don't set the position of the window if it is maximized */ + if ((!maximize) && size) { + x = ephy_node_get_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION_X); + y = ephy_node_get_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION_Y); + + screen = gtk_window_get_screen (GTK_WINDOW (window)); + screen_width = gdk_screen_get_width (screen); + screen_height = gdk_screen_get_height (screen); + + if ((x <= screen_width) && (y <= screen_height) && + (x >= 0) && (y >= 0)) + gtk_window_move (GTK_WINDOW (window), x, y); + } +} + +static void +ephy_state_save_unmaximized_size (EphyNode *node, int width, int height) +{ + ephy_node_set_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_WIDTH, + width); + ephy_node_set_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_HEIGHT, + height); + ephy_node_set_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_SIZE, + TRUE); +} + +static void +ephy_state_save_position (EphyNode *node, int x, int y) +{ + ephy_node_set_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION_X, + x); + ephy_node_set_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION_Y, + y); + ephy_node_set_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_POSITION, + TRUE); +} + + +static void +ephy_state_window_save_size (GtkWidget *window, EphyNode *node) +{ + int width, height; + gboolean maximize; + GdkWindowState state; + + state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))); + maximize = ((state & GDK_WINDOW_STATE_MAXIMIZED) > 0); + + gtk_window_get_size (GTK_WINDOW(window), + &width, &height); + + if (!maximize) + ephy_state_save_unmaximized_size (node, width, height); + + ephy_node_set_property_boolean (node, + EPHY_NODE_INITIAL_STATE_PROP_MAXIMIZE, + maximize); +} + +static void +ephy_state_window_save_position (GtkWidget *window, EphyNode *node) +{ + int x,y; + gboolean maximize; + GdkWindowState state; + + state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))); + maximize = ((state & GDK_WINDOW_STATE_MAXIMIZED) > 0); + + /* Don't save the position if maximized. */ + if (!maximize) { + gtk_window_get_position (GTK_WINDOW (window), &x, &y); + ephy_state_save_position (node, x, y); + } +} + +static void +ephy_state_window_save (GtkWidget *widget, EphyNode *node) +{ + EphyInitialStateWindowFlags flags; + + flags = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "state_flags")); + + if (flags & EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE) + ephy_state_window_save_size (widget, node); + + if (flags & EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION) + ephy_state_window_save_position (widget, node); +} + +static gboolean +window_configure_event_cb (GtkWidget *widget, + GdkEventConfigure *event, + EphyNode *node) +{ + GdkWindowState state; + + state = gdk_window_get_state (gtk_widget_get_window (widget)); + + if (!(state & GDK_WINDOW_STATE_FULLSCREEN)) + ephy_state_window_save (widget, node); + + return FALSE; +} + +static gboolean +window_state_event_cb (GtkWidget *widget, + GdkEventWindowState *event, + EphyNode *node) +{ + if (!(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) + ephy_state_window_save (widget, node); + + return FALSE; +} + +static EphyNode * +create_window_node (const char *name, + int default_width, + int default_height, + gboolean maximize, + EphyInitialStateWindowFlags flags) +{ + EphyNode *node; + + node = ephy_node_new (states_db); + ephy_node_add_child (states, node); + + ephy_node_set_property_string (node, EPHY_NODE_INITIAL_STATE_PROP_NAME, + name); + ephy_node_set_property_boolean (node, EPHY_NODE_INITIAL_STATE_PROP_MAXIMIZE, + maximize); + + if (flags & EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE) { + ephy_state_save_unmaximized_size (node, + default_width, + default_height); + } + + if (flags & EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION) { + /* Constants for now, these should be default_wi dth + and default_height. */ + ephy_state_save_position (node, 0, 0); + } + + return node; +} + +void +ephy_initial_state_add_window (GtkWidget *window, + const char *name, + int default_width, + int default_height, + gboolean maximize, + EphyInitialStateWindowFlags flags) +{ + EphyNode *node; + + g_return_if_fail (GTK_IS_WIDGET (window)); + g_return_if_fail (name != NULL); + + ensure_states (); + + node = find_by_name (name); + + if (node == NULL) + node = create_window_node (name, default_width, default_height, + maximize, flags); + + ephy_state_window_set_size (window, node); + ephy_state_window_set_position (window, node); + + g_object_set_data (G_OBJECT (window), "state_flags", GINT_TO_POINTER (flags)); + + g_signal_connect (window, "configure_event", + G_CALLBACK (window_configure_event_cb), node); + g_signal_connect (window, "window_state_event", + G_CALLBACK (window_state_event_cb), node); +} + +static gboolean +paned_sync_position_cb (GtkWidget *paned, + GParamSpec *pspec, + EphyNode *node) +{ + int width; + + width = gtk_paned_get_position (GTK_PANED (paned)); + ephy_node_set_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_WIDTH, + width); + return FALSE; +} + +void +ephy_initial_state_add_paned (GtkWidget *paned, + const char *name, + int default_width) +{ + EphyNode *node; + int width; + + ensure_states (); + + node = find_by_name (name); + + if (node == NULL) { + node = ephy_node_new (states_db); + ephy_node_add_child (states, node); + + ephy_node_set_property_string (node, + EPHY_NODE_INITIAL_STATE_PROP_NAME, + name); + ephy_node_set_property_int (node, + EPHY_NODE_INITIAL_STATE_PROP_WIDTH, + default_width); + } + + width = ephy_node_get_property_int (node, EPHY_NODE_INITIAL_STATE_PROP_WIDTH); + gtk_paned_set_position (GTK_PANED (paned), width); + + g_signal_connect (paned, "notify::position", + G_CALLBACK (paned_sync_position_cb), node); +} + +static void +sync_expander_cb (GtkExpander *expander, + GParamSpec *pspec, + EphyNode *node) +{ + gboolean is_expanded; + + is_expanded = gtk_expander_get_expanded (expander); + ephy_node_set_property_boolean (node, + EPHY_NODE_INITIAL_STATE_PROP_ACTIVE, + is_expanded); +} + +static void +sync_toggle_cb (GtkToggleButton *toggle, + GParamSpec *pspec, + EphyNode *node) +{ + gboolean is_active; + + is_active = gtk_toggle_button_get_active (toggle); + ephy_node_set_property_boolean (node, + EPHY_NODE_INITIAL_STATE_PROP_ACTIVE, + is_active); +} + +void +ephy_initial_state_add_expander (GtkWidget *widget, + const char *name, + gboolean default_state) +{ + EphyNode *node; + gboolean active; + + ensure_states (); + + node = find_by_name (name); + + if (node == NULL) { + node = ephy_node_new (states_db); + ephy_node_add_child (states, node); + + ephy_node_set_property_string (node, + EPHY_NODE_INITIAL_STATE_PROP_NAME, + name); + ephy_node_set_property_boolean (node, + EPHY_NODE_INITIAL_STATE_PROP_ACTIVE, + default_state); + } + + active = ephy_node_get_property_boolean + (node, EPHY_NODE_INITIAL_STATE_PROP_ACTIVE); + + if (GTK_IS_TOGGLE_BUTTON (widget)) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), active); + g_signal_connect (widget, "notify::active", + G_CALLBACK (sync_toggle_cb), node); + } else if (GTK_IS_EXPANDER (widget)) { + gtk_expander_set_expanded (GTK_EXPANDER (widget), active); + g_signal_connect (widget, "notify::expanded", + G_CALLBACK (sync_expander_cb), node); + } +} + +void +ephy_initial_state_save (void) +{ + if (states) { + ephy_states_save (); + ephy_node_unref (states); + g_object_unref (states_db); + states = NULL; + states_db = NULL; + } +} diff --git a/lib/ephy-initial-state.h b/lib/ephy-initial-state.h new file mode 100644 index 000000000..8458ac0d5 --- /dev/null +++ b/lib/ephy-initial-state.h @@ -0,0 +1,57 @@ +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* + * Copyright © 2001 Matthew Mueller + * Copyright © 2002 Jorn Baayen + * Copyright © 2003 Marco Pesenti Gritti + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) +#error "Only can be included directly." +#endif + +#ifndef EPHY_STATE_H +#define EPHY_STATE_H + +#include + +G_BEGIN_DECLS + +typedef enum +{ + EPHY_INITIAL_STATE_WINDOW_SAVE_NONE = 0, + EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE = 1 << 0, + EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION = 1 << 1 +} EphyInitialStateWindowFlags; + +void ephy_initial_state_add_window (GtkWidget *window, + const char *name, + int default_width, + int default_heigth, + gboolean maximize, + EphyInitialStateWindowFlags flags); +void ephy_initial_state_add_paned (GtkWidget *paned, + const char *name, + int default_width); +void ephy_initial_state_add_expander (GtkWidget *widget, + const char *name, + gboolean default_state); +void ephy_initial_state_save (void); + +G_END_DECLS + +#endif /* EPHY_STATE_H */ diff --git a/lib/ephy-state.c b/lib/ephy-state.c deleted file mode 100644 index 57dc211a9..000000000 --- a/lib/ephy-state.c +++ /dev/null @@ -1,462 +0,0 @@ -/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * Copyright © 2001 Matthew Mueller - * Copyright © 2002 Jorn Baayen - * Copyright © 2003 Marco Pesenti Gritti - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "config.h" -#include "ephy-state.h" - -#include "ephy-file-helpers.h" -#include "ephy-lib-type-builtins.h" -#include "ephy-node-common.h" -#include "ephy-node-db.h" - -#include -#include - -#define EPHY_STATES_XML_FILE "states.xml" -#define EPHY_STATES_XML_ROOT (const xmlChar *)"ephy_states" -#define EPHY_STATES_XML_VERSION (const xmlChar *)"1.0" - -enum -{ - EPHY_NODE_STATE_PROP_NAME = 2, - EPHY_NODE_STATE_PROP_WIDTH = 3, - EPHY_NODE_STATE_PROP_HEIGHT = 4, - EPHY_NODE_STATE_PROP_MAXIMIZE = 5, - EPHY_NODE_STATE_PROP_POSITION_X = 6, - EPHY_NODE_STATE_PROP_POSITION_Y = 7, - EPHY_NODE_STATE_PROP_SIZE = 8, - EPHY_NODE_STATE_PROP_POSITION = 9, - EPHY_NODE_STATE_PROP_ACTIVE = 10 -}; - -static EphyNode *states = NULL; -static EphyNodeDb *states_db = NULL; - -static void -ephy_states_save (void) -{ - char *xml_file; - - xml_file = g_build_filename (ephy_dot_dir (), - EPHY_STATES_XML_FILE, - NULL); - - ephy_node_db_write_to_xml_safe (states_db, - (const xmlChar *)xml_file, - EPHY_STATES_XML_ROOT, - EPHY_STATES_XML_VERSION, - NULL, /* comment */ - states, NULL, NULL, - NULL); - - g_free (xml_file); -} - -static EphyNode * -find_by_name (const char *name) -{ - EphyNode *result = NULL; - GPtrArray *children; - int i; - - children = ephy_node_get_children (states); - for (i = 0; i < children->len; i++) { - EphyNode *kid; - const char *node_name; - - kid = g_ptr_array_index (children, i); - - node_name = ephy_node_get_property_string - (kid, EPHY_NODE_STATE_PROP_NAME); - - if (strcmp (node_name, name) == 0) - result = kid; - } - - return result; -} - -static void -ensure_states (void) -{ - if (states == NULL) { - char *xml_file; - - xml_file = g_build_filename (ephy_dot_dir (), - EPHY_STATES_XML_FILE, - NULL); - - states_db = ephy_node_db_new (EPHY_NODE_DB_STATES); - states = ephy_node_new_with_id (states_db, STATES_NODE_ID); - ephy_node_db_load_from_file (states_db, xml_file, - EPHY_STATES_XML_ROOT, - EPHY_STATES_XML_VERSION); - - g_free (xml_file); - } -} - -static void -ephy_state_window_set_size (GtkWidget *window, EphyNode *node) -{ - int width, height, w = -1, h = -1; - gboolean maximize, size; - - width = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_WIDTH); - height = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_HEIGHT); - maximize = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_MAXIMIZE); - size = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_SIZE); - - gtk_window_get_default_size (GTK_WINDOW (window), &w, &h); - - if (size && w == -1 && h == -1) { - GdkScreen *screen; - int screen_width, screen_height; - - screen = gdk_screen_get_default (); - screen_width = gdk_screen_get_width (screen); - screen_height = gdk_screen_get_height (screen); - - gtk_window_set_default_size (GTK_WINDOW (window), - MIN (width, screen_width), - MIN (height, screen_height)); - } - - if (maximize) - gtk_window_maximize (GTK_WINDOW (window)); -} - -static void -ephy_state_window_set_position (GtkWidget *window, EphyNode *node) -{ - GdkScreen *screen; - int x, y; - int screen_width, screen_height; - gboolean maximize, size; - - g_return_if_fail (GTK_IS_WINDOW (window)); - - /* Setting the default size doesn't work when the window is already showing. */ - g_return_if_fail (!gtk_widget_get_visible (window)); - - maximize = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_MAXIMIZE); - size = ephy_node_get_property_boolean (node, EPHY_NODE_STATE_PROP_POSITION); - - /* Don't set the position of the window if it is maximized */ - if ((!maximize) && size) { - x = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_POSITION_X); - y = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_POSITION_Y); - - screen = gtk_window_get_screen (GTK_WINDOW (window)); - screen_width = gdk_screen_get_width (screen); - screen_height = gdk_screen_get_height (screen); - - if ((x <= screen_width) && (y <= screen_height) && - (x >= 0) && (y >= 0)) - gtk_window_move (GTK_WINDOW (window), x, y); - } -} - -static void -ephy_state_save_unmaximized_size (EphyNode *node, int width, int height) -{ - ephy_node_set_property_int (node, EPHY_NODE_STATE_PROP_WIDTH, - width); - ephy_node_set_property_int (node, EPHY_NODE_STATE_PROP_HEIGHT, - height); - ephy_node_set_property_boolean (node, EPHY_NODE_STATE_PROP_SIZE, - TRUE); -} - -static void -ephy_state_save_position (EphyNode *node, int x, int y) -{ - ephy_node_set_property_int (node, EPHY_NODE_STATE_PROP_POSITION_X, - x); - ephy_node_set_property_int (node, EPHY_NODE_STATE_PROP_POSITION_Y, - y); - ephy_node_set_property_boolean (node, EPHY_NODE_STATE_PROP_POSITION, - TRUE); -} - - -static void -ephy_state_window_save_size (GtkWidget *window, EphyNode *node) -{ - int width, height; - gboolean maximize; - GdkWindowState state; - - state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))); - maximize = ((state & GDK_WINDOW_STATE_MAXIMIZED) > 0); - - gtk_window_get_size (GTK_WINDOW(window), - &width, &height); - - if (!maximize) - ephy_state_save_unmaximized_size (node, width, height); - - ephy_node_set_property_boolean (node, - EPHY_NODE_STATE_PROP_MAXIMIZE, - maximize); -} - -static void -ephy_state_window_save_position (GtkWidget *window, EphyNode *node) -{ - int x,y; - gboolean maximize; - GdkWindowState state; - - state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))); - maximize = ((state & GDK_WINDOW_STATE_MAXIMIZED) > 0); - - /* Don't save the position if maximized. */ - if (!maximize) { - gtk_window_get_position (GTK_WINDOW (window), &x, &y); - ephy_state_save_position (node, x, y); - } -} - -static void -ephy_state_window_save (GtkWidget *widget, EphyNode *node) -{ - EphyStateWindowFlags flags; - - flags = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "state_flags")); - - if (flags & EPHY_STATE_WINDOW_SAVE_SIZE) - ephy_state_window_save_size (widget, node); - - if (flags & EPHY_STATE_WINDOW_SAVE_POSITION) - ephy_state_window_save_position (widget, node); -} - -static gboolean -window_configure_event_cb (GtkWidget *widget, - GdkEventConfigure *event, - EphyNode *node) -{ - GdkWindowState state; - - state = gdk_window_get_state (gtk_widget_get_window (widget)); - - if (!(state & GDK_WINDOW_STATE_FULLSCREEN)) - ephy_state_window_save (widget, node); - - return FALSE; -} - -static gboolean -window_state_event_cb (GtkWidget *widget, - GdkEventWindowState *event, - EphyNode *node) -{ - if (!(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) - ephy_state_window_save (widget, node); - - return FALSE; -} - -static EphyNode * -create_window_node (const char *name, - int default_width, - int default_height, - gboolean maximize, - EphyStateWindowFlags flags) -{ - EphyNode *node; - - node = ephy_node_new (states_db); - ephy_node_add_child (states, node); - - ephy_node_set_property_string (node, EPHY_NODE_STATE_PROP_NAME, - name); - ephy_node_set_property_boolean (node, EPHY_NODE_STATE_PROP_MAXIMIZE, - maximize); - - if (flags & EPHY_STATE_WINDOW_SAVE_SIZE) { - ephy_state_save_unmaximized_size (node, - default_width, - default_height); - } - - if (flags & EPHY_STATE_WINDOW_SAVE_POSITION) { - /* Constants for now, these should be default_wi dth - and default_height. */ - ephy_state_save_position (node, 0, 0); - } - - return node; -} - -void -ephy_state_add_window (GtkWidget *window, - const char *name, - int default_width, - int default_height, - gboolean maximize, - EphyStateWindowFlags flags) -{ - EphyNode *node; - - g_return_if_fail (GTK_IS_WIDGET (window)); - g_return_if_fail (name != NULL); - - ensure_states (); - - node = find_by_name (name); - - if (node == NULL) - node = create_window_node (name, default_width, default_height, - maximize, flags); - - ephy_state_window_set_size (window, node); - ephy_state_window_set_position (window, node); - - g_object_set_data (G_OBJECT (window), "state_flags", GINT_TO_POINTER (flags)); - - g_signal_connect (window, "configure_event", - G_CALLBACK (window_configure_event_cb), node); - g_signal_connect (window, "window_state_event", - G_CALLBACK (window_state_event_cb), node); -} - -static gboolean -paned_sync_position_cb (GtkWidget *paned, - GParamSpec *pspec, - EphyNode *node) -{ - int width; - - width = gtk_paned_get_position (GTK_PANED (paned)); - ephy_node_set_property_int (node, EPHY_NODE_STATE_PROP_WIDTH, - width); - return FALSE; -} - -void -ephy_state_add_paned (GtkWidget *paned, - const char *name, - int default_width) -{ - EphyNode *node; - int width; - - ensure_states (); - - node = find_by_name (name); - - if (node == NULL) { - node = ephy_node_new (states_db); - ephy_node_add_child (states, node); - - ephy_node_set_property_string (node, - EPHY_NODE_STATE_PROP_NAME, - name); - ephy_node_set_property_int (node, - EPHY_NODE_STATE_PROP_WIDTH, - default_width); - } - - width = ephy_node_get_property_int (node, EPHY_NODE_STATE_PROP_WIDTH); - gtk_paned_set_position (GTK_PANED (paned), width); - - g_signal_connect (paned, "notify::position", - G_CALLBACK (paned_sync_position_cb), node); -} - -static void -sync_expander_cb (GtkExpander *expander, - GParamSpec *pspec, - EphyNode *node) -{ - gboolean is_expanded; - - is_expanded = gtk_expander_get_expanded (expander); - ephy_node_set_property_boolean (node, - EPHY_NODE_STATE_PROP_ACTIVE, - is_expanded); -} - -static void -sync_toggle_cb (GtkToggleButton *toggle, - GParamSpec *pspec, - EphyNode *node) -{ - gboolean is_active; - - is_active = gtk_toggle_button_get_active (toggle); - ephy_node_set_property_boolean (node, - EPHY_NODE_STATE_PROP_ACTIVE, - is_active); -} - -void -ephy_state_add_expander (GtkWidget *widget, - const char *name, - gboolean default_state) -{ - EphyNode *node; - gboolean active; - - ensure_states (); - - node = find_by_name (name); - - if (node == NULL) { - node = ephy_node_new (states_db); - ephy_node_add_child (states, node); - - ephy_node_set_property_string (node, - EPHY_NODE_STATE_PROP_NAME, - name); - ephy_node_set_property_boolean (node, - EPHY_NODE_STATE_PROP_ACTIVE, - default_state); - } - - active = ephy_node_get_property_boolean - (node, EPHY_NODE_STATE_PROP_ACTIVE); - - if (GTK_IS_TOGGLE_BUTTON (widget)) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), active); - g_signal_connect (widget, "notify::active", - G_CALLBACK (sync_toggle_cb), node); - } else if (GTK_IS_EXPANDER (widget)) { - gtk_expander_set_expanded (GTK_EXPANDER (widget), active); - g_signal_connect (widget, "notify::expanded", - G_CALLBACK (sync_expander_cb), node); - } -} - -void -ephy_state_save (void) -{ - if (states) { - ephy_states_save (); - ephy_node_unref (states); - g_object_unref (states_db); - states = NULL; - states_db = NULL; - } -} diff --git a/lib/ephy-state.h b/lib/ephy-state.h deleted file mode 100644 index fdeeb8ee5..000000000 --- a/lib/ephy-state.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * Copyright © 2001 Matthew Mueller - * Copyright © 2002 Jorn Baayen - * Copyright © 2003 Marco Pesenti Gritti - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef EPHY_STATE_H -#define EPHY_STATE_H - -#include - -G_BEGIN_DECLS - -typedef enum -{ - EPHY_STATE_WINDOW_SAVE_NONE = 0, - EPHY_STATE_WINDOW_SAVE_SIZE = 1 << 0, - EPHY_STATE_WINDOW_SAVE_POSITION = 1 << 1 -} EphyStateWindowFlags; - -void ephy_state_add_window (GtkWidget *window, - const char *name, - int default_width, - int default_heigth, - gboolean maximize, - EphyStateWindowFlags flags); -void ephy_state_add_paned (GtkWidget *paned, - const char *name, - int default_width); -void ephy_state_add_expander (GtkWidget *widget, - const char *name, - gboolean default_state); -void ephy_state_save (void); - -G_END_DECLS - -#endif /* EPHY_STATE_H */ diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c index 1dde8eee1..294f0c085 100644 --- a/src/bookmarks/ephy-bookmark-properties.c +++ b/src/bookmarks/ephy-bookmark-properties.c @@ -29,7 +29,7 @@ #include "ephy-node-common.h" #include "ephy-debug.h" #include "ephy-shell.h" -#include "ephy-state.h" +#include "ephy-initial-state.h" #include "ephy-gui.h" #include "ephy-dnd.h" #include "ephy-prefs.h" @@ -512,11 +512,11 @@ ephy_bookmark_properties_constructor (GType type, if (!priv->creating) { - ephy_state_add_window (widget, - "bookmark_properties", - 290, 280, FALSE, - EPHY_STATE_WINDOW_SAVE_POSITION | - EPHY_STATE_WINDOW_SAVE_SIZE); + ephy_initial_state_add_window (widget, + "bookmark_properties", + 290, 280, FALSE, + EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION | + EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE); } /* Lockdown */ lockdown = g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN, @@ -598,7 +598,7 @@ ephy_bookmark_properties_constructor (GType type, widget = gtk_expander_new (_("Sho_w all topics")); gtk_expander_set_use_underline (GTK_EXPANDER (widget), TRUE); - ephy_state_add_expander (widget, "bookmark_properties_list", FALSE); + ephy_initial_state_add_expander (widget, "bookmark_properties_list", FALSE); gtk_container_add (GTK_CONTAINER (widget), container); gtk_widget_show (widget); gtk_grid_attach (GTK_GRID (grid), widget, 1, 3, 1, 1); diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 19151c195..adef067e8 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -36,7 +36,7 @@ #include "ephy-session.h" #include "ephy-settings.h" #include "ephy-shell.h" -#include "ephy-state.h" +#include "ephy-initial-state.h" #include "ephy-topic-action.h" #include "ephy-window.h" #include "popup-commands.h" @@ -1764,13 +1764,13 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor) G_CALLBACK (view_selection_changed_cb), editor); - ephy_state_add_window (GTK_WIDGET(editor), - "bookmarks_editor", - 450, 400, FALSE, - EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION); - ephy_state_add_paned (GTK_WIDGET (hpaned), - "bookmarks_paned", - 130); + ephy_initial_state_add_window (GTK_WIDGET(editor), + "bookmarks_editor", + 450, 400, FALSE, + EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE | EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION); + ephy_initial_state_add_paned (GTK_WIDGET (hpaned), + "bookmarks_paned", + 130); /* Lockdown settings */ action = gtk_action_group_get_action (action_group, "Export"); diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index 1d8df417a..81ba3b147 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -34,7 +34,7 @@ #include "ephy-session.h" #include "ephy-settings.h" #include "ephy-shell.h" -#include "ephy-state.h" +#include "ephy-initial-state.h" #include "ephy-time-helpers.h" #include "ephy-urls-store.h" #include "ephy-urls-view.h" @@ -1273,13 +1273,13 @@ ephy_history_window_constructed (GObject *object) G_CALLBACK (key_pressed_cb), editor); - ephy_state_add_window (GTK_WIDGET (editor), - "history_window", - 450, 400, FALSE, - EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION); - ephy_state_add_paned (GTK_WIDGET (hpaned), - "history_paned", - 130); + ephy_initial_state_add_window (GTK_WIDGET (editor), + "history_window", + 450, 400, FALSE, + EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE | EPHY_INITIAL_STATE_WINDOW_SAVE_POSITION); + ephy_initial_state_add_paned (GTK_WIDGET (hpaned), + "history_paned", + 130); editor->priv->cancellable = g_cancellable_new (); filter_now (editor, TRUE, TRUE); diff --git a/src/ephy-main.c b/src/ephy-main.c index 73b03d65a..5c33629ab 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -25,12 +25,12 @@ #include "ephy-debug.h" #include "ephy-embed-prefs.h" #include "ephy-file-helpers.h" +#include "ephy-initial-state.h" #include "ephy-private.h" #include "ephy-profile-utils.h" #include "ephy-session.h" #include "ephy-settings.h" #include "ephy-shell.h" -#include "ephy-state.h" #include "ephy-string.h" #include "ephy-web-app-utils.h" @@ -483,7 +483,7 @@ main (int argc, if (notify_is_initted ()) notify_uninit (); - ephy_state_save (); + ephy_initial_state_save (); ephy_embed_prefs_shutdown (); ephy_settings_shutdown (); ephy_file_helpers_shutdown (); diff --git a/src/ephy-window.c b/src/ephy-window.c index db6b13431..adb7e956d 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -41,6 +41,7 @@ #include "ephy-find-toolbar.h" #include "ephy-gui.h" #include "ephy-home-action.h" +#include "ephy-initial-state.h" #include "ephy-link.h" #include "ephy-location-entry.h" #include "ephy-navigation-history-action.h" @@ -51,7 +52,6 @@ #include "ephy-session.h" #include "ephy-settings.h" #include "ephy-shell.h" -#include "ephy-state.h" #include "ephy-toolbar.h" #include "ephy-type-builtins.h" #include "ephy-web-view.h" @@ -4004,10 +4004,10 @@ ephy_window_show (GtkWidget *widget) g_return_if_fail (EPHY_IS_EMBED (embed)); if (!priv->is_popup) - flags = EPHY_STATE_WINDOW_SAVE_SIZE; + flags = EPHY_INITIAL_STATE_WINDOW_SAVE_SIZE; - ephy_state_add_window (widget, "main_window", 600, 500, - TRUE, flags); + ephy_initial_state_add_window (widget, "main_window", 600, 500, + TRUE, flags); priv->has_size = TRUE; } diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 7e3336467..5243c1517 100644 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -28,7 +28,6 @@ #include "ephy-shell.h" #include "ephy-file-helpers.h" #include "ephy-gui.h" -#include "ephy-state.h" #include "ephy-string.h" #include "ephy-debug.h" #include "ephy-time-helpers.h" diff --git a/src/window-commands.c b/src/window-commands.c index 8ab465bd0..c0193dfe9 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -46,7 +46,6 @@ #include "ephy-session.h" #include "ephy-settings.h" #include "ephy-shell.h" -#include "ephy-state.h" #include "ephy-string.h" #include "ephy-web-app-utils.h" #include "ephy-zoom.h" -- cgit v1.2.3