X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ab6b7e64c3f3e0ad945976dad35677fdf41dd35..74a3342702bf3a76a845f65f4510fd8612d3d802:/src/gtk/settings.cpp?ds=sidebyside diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 1be34246f3..6e5e0f363f 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -20,214 +20,138 @@ #include "wx/fontutil.h" -#include -#if GTK_CHECK_VERSION(2, 9, 0) - // gtk_object_sink - #undef GTK_DISABLE_DEPRECATED -#endif #include -#include +#include "wx/gtk/private/win_gtk.h" -#include +bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom); // ---------------------------------------------------------------------------- -// wxSystemObjects +// wxSystemSettings implementation // ---------------------------------------------------------------------------- -struct wxSystemObjects -{ - wxColour m_colBtnFace, - m_colBtnShadow, - m_colBtnHighlight, - m_colHighlight, - m_colHighlightText, - m_colListBox, - m_colWindow, - m_colWindowText, - m_colBtnText, - m_colMenuItemHighlight, - m_colTooltip, - m_colTooltipText, - m_colMenubarBg; - - wxFont m_fontSystem; -}; - -static wxSystemObjects gs_objects; - -void wxClearGtkSystemObjects() +static wxFont gs_fontSystem; + +static GtkContainer* ContainerWidget() { - gs_objects.m_colBtnFace = wxColour(); - gs_objects.m_colBtnShadow = wxColour(); - gs_objects.m_colBtnHighlight = wxColour(); - gs_objects.m_colHighlightText = wxColour(); - gs_objects.m_colListBox = wxColour(); - gs_objects.m_colWindow = wxColour(); - gs_objects.m_colWindowText = wxColour(); - gs_objects.m_colBtnText = wxColour(); - gs_objects.m_colMenuItemHighlight = wxColour(); - gs_objects.m_colTooltip = wxColour(); - gs_objects.m_colTooltipText = wxColour(); - gs_objects.m_colMenubarBg = wxColour(); - gs_objects.m_fontSystem = wxNullFont; + static GtkContainer* s_widget; + if (s_widget == NULL) + { + s_widget = GTK_CONTAINER(gtk_fixed_new()); + GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(s_widget)); + } + return s_widget; } -// ---------------------------------------------------------------------------- -// wxSystemSettings implementation -// ---------------------------------------------------------------------------- - -// kind of widget to use in GetColourFromGTKWidget -enum wxGtkWidgetType -{ - wxGTK_BUTTON, - wxGTK_LIST, - wxGTK_MENUITEM, - wxGTK_TEXTCTRL, - wxGTK_MENUBAR, -}; - -// the colour we need -enum wxGtkColourType +extern "C" { +static void style_set(GtkWidget*, GtkStyle*, void*) { - wxGTK_FG, - wxGTK_BG, - wxGTK_BASE -}; - -// wxSystemSettings::GetColour() helper: get the colours from a GTK+ -// widget style, return true if we did get them -static bool GetColourFromGTKWidget(GdkColor& gdkColor, - wxGtkWidgetType type = wxGTK_BUTTON, - GtkStateType state = GTK_STATE_NORMAL, - wxGtkColourType colour = wxGTK_BG) + gs_fontSystem = wxNullFont; +} +} + +static const GtkStyle* ButtonStyle() { - GtkWidget *widget; - switch ( type ) + static GtkWidget* s_widget; + if (s_widget == NULL) { - default: - wxFAIL_MSG( _T("unexpected GTK widget type") ); - // fall through - - case wxGTK_BUTTON: - widget = gtk_button_new(); - break; - - case wxGTK_TEXTCTRL: - widget = gtk_text_view_new(); - break; - - case wxGTK_LIST: - widget = gtk_tree_view_new_with_model( - (GtkTreeModel*)gtk_list_store_new(1, G_TYPE_INT)); - break; - - case wxGTK_MENUITEM: - widget = gtk_menu_item_new(); - - case wxGTK_MENUBAR: - widget = gtk_menu_bar_new(); - break; - + s_widget = gtk_button_new(); + gtk_container_add(ContainerWidget(), s_widget); + gtk_widget_ensure_style(s_widget); + g_signal_connect(s_widget, "style_set", G_CALLBACK(style_set), NULL); } + return s_widget->style; +} - GtkStyle *def = gtk_rc_get_style( widget ); - if ( !def ) - def = gtk_widget_get_default_style(); - - const bool ok = def != NULL; - if (ok) +static const GtkStyle* ListStyle() +{ + static GtkWidget* s_widget; + if (s_widget == NULL) { - switch ( colour ) - { - default: - wxFAIL_MSG( _T("unexpected GTK colour type") ); - // fall through - - case wxGTK_FG: - gdkColor = def->fg[state]; - break; - - case wxGTK_BG: - gdkColor = def->bg[state]; - break; + s_widget = gtk_tree_view_new_with_model( + GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_INT))); + gtk_container_add(ContainerWidget(), s_widget); + gtk_widget_ensure_style(s_widget); + } + return s_widget->style; +} - case wxGTK_BASE: - gdkColor = def->base[state]; - break; - } +static const GtkStyle* TextCtrlStyle() +{ + static GtkWidget* s_widget; + if (s_widget == NULL) + { + s_widget = gtk_text_view_new(); + gtk_container_add(ContainerWidget(), s_widget); + gtk_widget_ensure_style(s_widget); } + return s_widget->style; +} - gtk_object_sink((GtkObject*)widget); +static const GtkStyle* MenuItemStyle() +{ + static GtkWidget* s_widget; + if (s_widget == NULL) + { + s_widget = gtk_menu_item_new(); + gtk_container_add(ContainerWidget(), s_widget); + gtk_widget_ensure_style(s_widget); + } + return s_widget->style; +} - return ok; +static const GtkStyle* MenuBarStyle() +{ + static GtkWidget* s_widget; + if (s_widget == NULL) + { + s_widget = gtk_menu_bar_new(); + gtk_container_add(ContainerWidget(), s_widget); + gtk_widget_ensure_style(s_widget); + } + return s_widget->style; } -static void GetTooltipColors() +static const GtkStyle* ToolTipStyle() { - GtkWidget* widget = gtk_window_new(GTK_WINDOW_POPUP); - const char* name = "gtk-tooltip"; - if (gtk_check_version(2, 11, 0)) - name = "gtk-tooltips"; - gtk_widget_set_name(widget, name); - gtk_widget_ensure_style(widget); - - GdkColor c = widget->style->bg[GTK_STATE_NORMAL]; - gs_objects.m_colTooltip = wxColor(c); - c = widget->style->fg[GTK_STATE_NORMAL]; - gs_objects.m_colTooltipText = wxColor(c); - - gtk_widget_destroy(widget); + static GtkWidget* s_widget; + if (s_widget == NULL) + { + s_widget = gtk_window_new(GTK_WINDOW_POPUP); + const char* name = "gtk-tooltip"; + if (gtk_check_version(2, 11, 0)) + name = "gtk-tooltips"; + gtk_widget_set_name(s_widget, name); + gtk_widget_ensure_style(s_widget); + } + return s_widget->style; } wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) { wxColor color; - GdkColor gdkColor; switch (index) { case wxSYS_COLOUR_SCROLLBAR: case wxSYS_COLOUR_BACKGROUND: + //case wxSYS_COLOUR_DESKTOP: case wxSYS_COLOUR_INACTIVECAPTION: case wxSYS_COLOUR_MENU: case wxSYS_COLOUR_WINDOWFRAME: case wxSYS_COLOUR_ACTIVEBORDER: case wxSYS_COLOUR_INACTIVEBORDER: case wxSYS_COLOUR_BTNFACE: + //case wxSYS_COLOUR_3DFACE: case wxSYS_COLOUR_3DLIGHT: - if (!gs_objects.m_colBtnFace.Ok()) - { - gdkColor.red = - gdkColor.green = 0; - gdkColor.blue = 0x9c40; - GetColourFromGTKWidget(gdkColor); - gs_objects.m_colBtnFace = wxColor(gdkColor); - } - color = gs_objects.m_colBtnFace; + color = wxColor(ButtonStyle()->bg[GTK_STATE_NORMAL]); break; case wxSYS_COLOUR_WINDOW: - if (!gs_objects.m_colWindow.Ok()) - { - gdkColor.red = - gdkColor.green = - gdkColor.blue = 0xFFFF; - GetColourFromGTKWidget(gdkColor, wxGTK_TEXTCTRL, GTK_STATE_NORMAL, wxGTK_BASE); - gs_objects.m_colWindow = wxColor(gdkColor); - } - color = gs_objects.m_colWindow; + color = wxColor(TextCtrlStyle()->base[GTK_STATE_NORMAL]); break; - case wxSYS_COLOUR_MENUBAR: - if (!gs_objects.m_colMenubarBg.Ok()) - { - gdkColor.red = - gdkColor.green = 0; - gdkColor.blue = 0x9c40; - GetColourFromGTKWidget(gdkColor,wxGTK_MENUBAR); - gs_objects.m_colMenubarBg = wxColor(gdkColor); - } - color = gs_objects.m_colMenubarBg; + color = wxColor(MenuBarStyle()->bg[GTK_STATE_NORMAL]); break; case wxSYS_COLOUR_3DDKSHADOW: @@ -237,51 +161,32 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_BTNSHADOW: //case wxSYS_COLOUR_3DSHADOW: - if (!gs_objects.m_colBtnShadow.Ok()) { wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE)); - gs_objects.m_colBtnShadow = + color = wxColour((unsigned char) (faceColour.Red() * 2 / 3), (unsigned char) (faceColour.Green() * 2 / 3), (unsigned char) (faceColour.Blue() * 2 / 3)); } - color = gs_objects.m_colBtnShadow; break; - case wxSYS_COLOUR_3DHIGHLIGHT: - //case wxSYS_COLOUR_BTNHIGHLIGHT: + case wxSYS_COLOUR_BTNHIGHLIGHT: + //case wxSYS_COLOUR_BTNHILIGHT: + //case wxSYS_COLOUR_3DHIGHLIGHT: + //case wxSYS_COLOUR_3DHILIGHT: color = *wxWHITE; break; case wxSYS_COLOUR_HIGHLIGHT: - if (!gs_objects.m_colHighlight.Ok()) - { - gdkColor.red = - gdkColor.green = 0; - gdkColor.blue = 0x9c40; - GetColourFromGTKWidget( - gdkColor, wxGTK_BUTTON, GTK_STATE_SELECTED); - gs_objects.m_colHighlight = wxColour(gdkColor); - } - color = gs_objects.m_colHighlight; + color = wxColor(ButtonStyle()->bg[GTK_STATE_SELECTED]); break; case wxSYS_COLOUR_LISTBOX: - if (!gs_objects.m_colListBox.Ok()) - { - if ( GetColourFromGTKWidget(gdkColor, - wxGTK_LIST, - GTK_STATE_NORMAL, - wxGTK_BASE) ) - { - gs_objects.m_colListBox = wxColour(gdkColor); - } - else - { - gs_objects.m_colListBox = *wxWHITE; - } - } - color = gs_objects.m_colListBox; + color = wxColor(ListStyle()->base[GTK_STATE_NORMAL]); + break; + + case wxSYS_COLOUR_LISTBOXTEXT: + color = wxColor(ListStyle()->text[GTK_STATE_NORMAL]); break; case wxSYS_COLOUR_MENUTEXT: @@ -289,42 +194,19 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_CAPTIONTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT: case wxSYS_COLOUR_BTNTEXT: - if (!gs_objects.m_colBtnText.Ok()) - { - gdkColor.red = - gdkColor.green = - gdkColor.blue = 0; - GetColourFromGTKWidget( - gdkColor, wxGTK_BUTTON, GTK_STATE_NORMAL, wxGTK_FG); - gs_objects.m_colBtnText = wxColour(gdkColor); - } - color = gs_objects.m_colBtnText; + color = wxColor(ButtonStyle()->fg[GTK_STATE_NORMAL]); break; case wxSYS_COLOUR_INFOBK: - if (!gs_objects.m_colTooltip.Ok()) { - GetTooltipColors(); - } - color = gs_objects.m_colTooltip; + color = wxColor(ToolTipStyle()->bg[GTK_STATE_NORMAL]); break; case wxSYS_COLOUR_INFOTEXT: - if (!gs_objects.m_colTooltipText.Ok()) { - GetTooltipColors(); - } - color = gs_objects.m_colTooltipText; + color = wxColor(ToolTipStyle()->fg[GTK_STATE_NORMAL]); break; case wxSYS_COLOUR_HIGHLIGHTTEXT: - if (!gs_objects.m_colHighlightText.Ok()) - { - wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT); - if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200) - gs_objects.m_colHighlightText = *wxBLACK; - else - gs_objects.m_colHighlightText = *wxWHITE; - } - color = gs_objects.m_colHighlightText; + color = wxColor(ButtonStyle()->fg[GTK_STATE_SELECTED]); break; case wxSYS_COLOUR_APPWORKSPACE: @@ -333,16 +215,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_ACTIVECAPTION: case wxSYS_COLOUR_MENUHILIGHT: - if (!gs_objects.m_colMenuItemHighlight.Ok()) - { - gdkColor.red = - gdkColor.green = - gdkColor.blue = 0; - GetColourFromGTKWidget( - gdkColor, wxGTK_MENUITEM, GTK_STATE_SELECTED, wxGTK_BG); - gs_objects.m_colMenuItemHighlight = wxColour(gdkColor); - } - color = gs_objects.m_colMenuItemHighlight; + color = wxColor(MenuItemStyle()->bg[GTK_STATE_SELECTED]); break; case wxSYS_COLOUR_HOTLIGHT: @@ -377,36 +250,14 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) case wxSYS_SYSTEM_FONT: case wxSYS_DEVICE_DEFAULT_FONT: case wxSYS_DEFAULT_GUI_FONT: - if (!gs_objects.m_fontSystem.Ok()) + if (!gs_fontSystem.Ok()) { - GtkWidget *widget = gtk_button_new(); - GtkStyle *def = gtk_rc_get_style( widget ); - if ( !def || !def->font_desc ) - def = gtk_widget_get_default_style(); - if ( def && def->font_desc ) - { - wxNativeFontInfo info; - info.description = - pango_font_description_copy(def->font_desc); - gs_objects.m_fontSystem = wxFont(info); - } - else - { - GtkSettings *settings = gtk_settings_get_default(); - gchar *font_name = NULL; - g_object_get ( settings, - "gtk-font-name", - &font_name, - NULL); - if (!font_name) - gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); - else - gs_objects.m_fontSystem = wxFont(wxString::FromAscii(font_name)); - g_free (font_name); - } - gtk_object_sink((GtkObject*)widget); + wxNativeFontInfo info; + info.description = ButtonStyle()->font_desc; + gs_fontSystem = wxFont(info); + info.description = NULL; } - font = gs_objects.m_fontSystem; + font = gs_fontSystem; break; default: @@ -415,53 +266,6 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) return font; } -static bool GetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom) -{ - bool success = false; - Atom property = 0; - if (gdk_x11_screen_supports_net_wm_hint( - gdk_drawable_get_screen(window), - gdk_atom_intern("_NET_FRAME_EXTENTS", false))) - { - success = true; - property = gdk_x11_get_xatom_by_name_for_display( - gdk_drawable_get_display(window), - "_NET_FRAME_EXTENTS"); - } - - if (success) - { - Atom type; - int format; - gulong nitems, bytes_after; - guchar* data; - success = XGetWindowProperty( - gdk_x11_drawable_get_xdisplay(window), - gdk_x11_drawable_get_xid(window), - property, - 0, 4, - false, - XA_CARDINAL, - &type, &format, &nitems, &bytes_after, &data - ) == Success; - if (success) - { - success = data && nitems == 4; - if (success) - { - long* p = (long*)data; - if (left) *left = int(p[0]); - if (right) *right = int(p[1]); - if (top) *top = int(p[2]); - if (bottom) *bottom = int(p[3]); - } - if (data) - XFree(data); - } - } - return success; -} - // helper: return the GtkSettings either for the screen the current window is // on or for the default screen if window is NULL static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window) @@ -470,6 +274,26 @@ static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window) : gtk_settings_get_default(); } +static int GetBorderWidth(wxSystemMetric index, wxWindow* win) +{ + if (win->m_wxwindow) + { + wxPizza* pizza = WX_PIZZA(win->m_wxwindow); + int x, y; + pizza->get_border_widths(x, y); + switch (index) + { + case wxSYS_BORDER_X: + case wxSYS_EDGE_X: + case wxSYS_FRAMESIZE_X: + return x; + default: + return y; + } + } + return -1; +} + int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) { GdkWindow *window = NULL; @@ -484,20 +308,18 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) case wxSYS_EDGE_Y: case wxSYS_FRAMESIZE_X: case wxSYS_FRAMESIZE_Y: - // If a window is specified/realized, and it is a toplevel window, we can query from wm. - // The returned border thickness is outside the client area in that case. - if (window) + if (win) { wxTopLevelWindow *tlw = wxDynamicCast(win, wxTopLevelWindow); if (!tlw) - return -1; // not a tlw, not sure how to approach - else + return GetBorderWidth(index, win); + else if (window) { // Get the frame extents from the windowmanager. // In most cases the top extent is the titlebar, so we use the bottom extent // for the heights. int right, bottom; - if (GetFrameExtents(window, NULL, &right, NULL, &bottom)) + if (wxGetFrameExtents(window, NULL, &right, NULL, &bottom)) { switch (index) { @@ -583,7 +405,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) // Reconsider when we have a way to report to the user on which side it is. { int top; - if (GetFrameExtents(window, NULL, NULL, &top, NULL)) + if (wxGetFrameExtents(window, NULL, NULL, &top, NULL)) { return top; // top frame extent }