* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
void
gtk_im_context_xim_register_type (GTypeModule *type_module)
{
- static const GTypeInfo im_context_xim_info =
+ const GTypeInfo im_context_xim_info =
{
sizeof (GtkIMContextXIMClass),
(GBaseInitFunc) NULL,
NULL);
info->settings = gtk_settings_get_for_screen (info->screen);
-
- if (!g_object_class_find_property (G_OBJECT_GET_CLASS (info->settings),
- "gtk-im-preedit-style"))
- gtk_settings_install_property (g_param_spec_enum ("gtk-im-preedit-style",
- P_("IM Preedit style"),
- P_("How to draw the input method preedit string"),
- GTK_TYPE_IM_PREEDIT_STYLE,
- GTK_IM_PREEDIT_CALLBACK,
- G_PARAM_READWRITE));
-
- if (!g_object_class_find_property (G_OBJECT_GET_CLASS (info->settings),
- "gtk-im-status-style"))
- gtk_settings_install_property (g_param_spec_enum ("gtk-im-status-style",
- P_("IM Status style"),
- P_("How to draw the input method statusbar"),
- GTK_TYPE_IM_STATUS_STYLE,
- GTK_IM_STATUS_CALLBACK,
- G_PARAM_READWRITE));
-
info->status_set = g_signal_connect_swapped (info->settings,
"notify::gtk-im-status-style",
G_CALLBACK (status_style_change),
{
GSList *tmp_list;
GtkXIMInfo *info;
- GdkScreen *screen = gdk_drawable_get_screen (client_window);
+ GdkScreen *screen = gdk_window_get_screen (client_window);
info = NULL;
tmp_list = open_ims;
GtkIMContextXIM *result;
const gchar *charset;
+ if (!GDK_IS_X11_DISPLAY(gdk_display_get_default()))
+ return NULL;
result = g_object_new (GTK_TYPE_IM_CONTEXT_XIM, NULL);
result->locale = g_strdup (setlocale (LC_CTYPE, NULL));
KeySym keysym;
Status status;
gboolean result = FALSE;
- GdkWindow *root_window = gdk_screen_get_root_window (gdk_drawable_get_screen (event->window));
+ GdkWindow *root_window = gdk_screen_get_root_window (gdk_window_get_screen (event->window));
XKeyPressedEvent xevent;
xevent.type = (event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
xevent.serial = 0; /* hope it doesn't matter */
xevent.send_event = event->send_event;
- xevent.display = GDK_DRAWABLE_XDISPLAY (event->window);
- xevent.window = GDK_DRAWABLE_XID (event->window);
- xevent.root = GDK_DRAWABLE_XID (root_window);
+ xevent.display = GDK_WINDOW_XDISPLAY (event->window);
+ xevent.window = GDK_WINDOW_XID (event->window);
+ xevent.root = GDK_WINDOW_XID (root_window);
xevent.subwindow = xevent.window;
xevent.time = event->time;
xevent.x = xevent.x_root = 0;
xevent.keycode = event->hardware_keycode;
xevent.same_screen = True;
- if (XFilterEvent ((XEvent *)&xevent, GDK_DRAWABLE_XID (context_xim->client_window)))
+ if (XFilterEvent ((XEvent *)&xevent, GDK_WINDOW_XID (context_xim->client_window)))
return TRUE;
if (event->state &
return;
spot.x = area->x;
- spot.y = area->y;
+ spot.y = area->y + area->height;
preedit_attr = XVaCreateNestedList (0,
XNSpotLocation, &spot,
xic = XCreateIC (context_xim->im_info->im,
XNInputStyle, im_style,
- XNClientWindow, GDK_DRAWABLE_XID (context_xim->client_window),
+ XNClientWindow, GDK_WINDOW_XID (context_xim->client_window),
name1, list1,
name2, list2,
NULL);
if (!context_xim->status_window && context_xim->client_widget)
{
GtkWidget *toplevel = gtk_widget_get_toplevel (context_xim->client_widget);
- if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel))
+ if (toplevel && gtk_widget_is_toplevel (toplevel))
{
StatusWindow *status_window = status_window_get (toplevel);
{
GtkWidget *toplevel = gtk_widget_get_toplevel (context_xim->client_widget);
- context_xim->in_toplevel = (toplevel && GTK_WIDGET_TOPLEVEL (toplevel));
+ context_xim->in_toplevel = (toplevel && gtk_widget_is_toplevel (toplevel));
}
else
context_xim->in_toplevel = FALSE;
if (status_window->window)
{
height = gdk_screen_get_height (gtk_widget_get_screen (toplevel));
-
- gdk_window_get_frame_extents (toplevel->window, &rect);
- gtk_widget_size_request (status_window->window, &requisition);
-
+
+ gdk_window_get_frame_extents (gtk_widget_get_window (toplevel),
+ &rect);
+ gtk_widget_get_preferred_size ( (status_window->window),
+ &requisition, NULL);
+
if (rect.y + rect.height + requisition.height < height)
y = rect.y + rect.height;
else
/* Draw the background (normally white) and border for the status window
*/
static gboolean
-on_status_window_expose_event (GtkWidget *widget,
- GdkEventExpose *event)
+on_status_window_draw (GtkWidget *widget,
+ cairo_t *cr)
{
- gdk_draw_rectangle (widget->window,
- widget->style->base_gc [GTK_STATE_NORMAL],
- TRUE,
- 0, 0,
- widget->allocation.width, widget->allocation.height);
- gdk_draw_rectangle (widget->window,
- widget->style->text_gc [GTK_STATE_NORMAL],
- FALSE,
- 0, 0,
- widget->allocation.width - 1, widget->allocation.height - 1);
+ GtkStyleContext *style;
+ GdkRGBA color;
- return FALSE;
-}
+ style = gtk_widget_get_style_context (widget);
-/* We watch the ::style-set signal for our label widget
- * and use that to change it's foreground color to match
- * the 'text' color of the toplevel window. The text/base
- * pair of colors might be reversed from the fg/bg pair
- * that are normally used for labels.
- */
-static void
-on_status_window_style_set (GtkWidget *toplevel,
- GtkStyle *previous_style,
- GtkWidget *label)
-{
- gint i;
-
- for (i = 0; i < 5; i++)
- gtk_widget_modify_fg (label, i, &toplevel->style->text[i]);
+ gtk_style_context_get_background_color (style, 0, &color);
+ gdk_cairo_set_source_rgba (cr, &color);
+ cairo_paint (cr);
+
+ gtk_style_context_get_color (style, 0, &color);
+ gdk_cairo_set_source_rgba (cr, &color);
+ cairo_paint (cr);
+
+ cairo_rectangle (cr,
+ 0, 0,
+ gtk_widget_get_allocated_width (widget) - 1,
+ gtk_widget_get_allocated_height (widget) - 1);
+ cairo_fill (cr);
+
+ return FALSE;
}
/* Creates the widgets for the status window; called when we
gtk_widget_set_app_paintable (window, TRUE);
status_label = gtk_label_new ("");
- gtk_misc_set_padding (GTK_MISC (status_label), 1, 1);
+ g_object_set (status_label, "margin", 1, NULL);
gtk_widget_show (status_label);
- g_signal_connect (window, "style-set",
- G_CALLBACK (on_status_window_style_set), status_label);
gtk_container_add (GTK_CONTAINER (window), status_label);
- g_signal_connect (window, "expose-event",
- G_CALLBACK (on_status_window_expose_event), NULL);
+ g_signal_connect (window, "draw",
+ G_CALLBACK (on_status_window_draw), NULL);
gtk_window_set_screen (GTK_WINDOW (status_window->window),
gtk_widget_get_screen (status_window->toplevel));
if (!status_window->window)
status_window_make_window (status_window);
- label = GTK_BIN (status_window->window)->child;
+ label = gtk_bin_get_child (GTK_BIN (status_window->window));
gtk_label_set_text (GTK_LABEL (label), text);
gtk_widget_show (status_window->window);
projects / ~andy / gtk / blobdiff