RemoteEditor/vim7: src/gui_gtk

comparison src/gui_gtk_x11.c @ 48:67300faee616 v7-3-618

v7-3-618

author	Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date	Wed, 01 Aug 2012 18:08:28 +0900
parents	c16898406ff2
children

comparison

equal deleted inserted replaced

-:6c0584ec21b1
+:67300faee616
 # include "gui_gtk_f.h"
 #endif
 #ifdef HAVE_X11_SUNKEYSYM_H
 # include <X11/Sunkeysym.h>
-static guint32 clipboard_event_time = CurrentTime;
 #endif
 /*
 * Easy-to-use macro for multihead support.
 */
 int		modifiers;
 int		key;
 guint	state;
 char_u	*s, *d;
-clipboard_event_time = event->time;
+gui.event_time = event->time;
 key_sym = event->keyval;
 state = event->state;
 #ifdef FEAT_XIM
 if (xim_queue_key_press_event(event, TRUE))
 static gboolean
 key_release_event(GtkWidget *widget UNUSED,
 		  GdkEventKey *event,
 		  gpointer data UNUSED)
 {
-clipboard_event_time = event->time;
+gui.event_time = event->time;
 /*
 * GTK+ 2 input methods may do fancy stuff on key release events too.
 * With the default IM for instance, you can enter any UCS code point
 * by holding down CTRL-SHIFT and typing hexadecimal digits.
 */
 VimClipboard    *cbd;
 char_u	    *text;
 char_u	    *tmpbuf = NULL;
 guchar	    *tmpbuf_utf8 = NULL;
 int		    len;
-int		    motion_type;
+int		    motion_type = MAUTO;
 if (data->selection == clip_plus.gtk_sel_atom)
 	cbd = &clip_plus;
 else
 	cbd = &clip_star;
 text = (char_u *)data->data;
 len  = data->length;
-motion_type = MCHAR;
 if (text == NULL || len <= 0)
 {
 	received_selection = RS_FAIL;
 	/* clip_free_selection(cbd); ??? */
 	vim_free(string);
 }
 }
 /*
-* Check if the GUI can be started.  Called before gvimrc is sourced.
+* Check if the GUI can be started.  Called before gvimrc is sourced and
+* before fork().
+* Return OK or FAIL.
+*/
+int
+gui_mch_early_init_check(void)
+{
+char_u *p;
+/* Guess that when $DISPLAY isn't set the GUI can't start. */
+p = mch_getenv((char_u *)"DISPLAY");
+if (p == NULL || *p == NUL)
+{
+	gui.dying = TRUE;
+	EMSG(_((char *)e_opendisp));
+	return FAIL;
+}
+return OK;
+}
+/*
+* Check if the GUI can be started.  Called before gvimrc is sourced but after
+* fork().
 * Return OK or FAIL.
 */
 int
 gui_mch_init_check(void)
 {
 int button;
 int repeated_click = FALSE;
 int x, y;
 int_u vim_modifiers;
-clipboard_event_time = event->time;
+gui.event_time = event->time;
 /* Make sure we have focus now we've been selected */
 if (gtk_socket_id != 0 && !GTK_WIDGET_HAS_FOCUS(widget))
 	gtk_widget_grab_focus(widget);
 		     gpointer data UNUSED)
 {
 int x, y;
 int_u vim_modifiers;
-clipboard_event_time = event->time;
+gui.event_time = event->time;
 /* Remove any motion "machine gun" timers used for automatic further
 extension of allocation areas if outside of the applications window
 area .*/
 if (motion_repeat_timer)
 int		    n_targets = N_SELECTION_TARGETS;
 GtkTargetEntry  targets[N_SELECTION_TARGETS];
 for (i = 0; i < (int)N_SELECTION_TARGETS; ++i)
 {
-	/* OpenOffice tries to use TARGET_HTML and fails when it doesn't
+	/* OpenOffice tries to use TARGET_HTML and fails when we don't
 	 * return something, instead of trying another target. Therefore only
 	 * offer TARGET_HTML when it works. */
 	if (!clip_html && selection_targets[i].info == TARGET_HTML)
 	    n_targets--;
 	else
 int		    n_targets = N_DND_TARGETS;
 GtkTargetEntry  targets[N_DND_TARGETS];
 for (i = 0; i < (int)N_DND_TARGETS; ++i)
 {
-	if (!clip_html && selection_targets[i].info == TARGET_HTML)
+	if (!clip_html && dnd_targets[i].info == TARGET_HTML)
 	    n_targets--;
 	else
 	    targets[j++] = dnd_targets[i];
 }
 gtk_drag_dest_unset(gui.drawarea);
 gtk_drag_dest_set(gui.drawarea,
 		      GTK_DEST_DEFAULT_ALL,
 		      targets, n_targets,
-		      GDK_ACTION_COPY);
+		      GDK_ACTION_COPY | GDK_ACTION_MOVE);
 }
 /*
 * Initialize the GUI.	Create all the windows, set up all the callbacks etc.
 * Returns OK for success, FAIL when the GUI can't be started.
 if (gui.mainwin != NULL)
 	gtk_window_unmaximize(GTK_WINDOW(gui.mainwin));
 }
 /*
+* Called when the font changed while the window is maximized.  Compute the
+* new Rows and Columns.  This is like resizing the window.
+*/
+void
+gui_mch_newfont()
+{
+int w, h;
+gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h);
+w -= get_menu_tool_width();
+h -= get_menu_tool_height();
+gui_resize_shell(w, h);
+}
+/*
 * Set the windows size.
 */
 void
 gui_mch_set_shellsize(int width, int height,
 		      int min_width UNUSED,  int min_height UNUSED,
 	gui.wide_font = NULL;
 }
 if (gui_mch_maximized())
 {
-	int w, h;
 	/* Update lines and columns in accordance with the new font, keep the
 	 * window maximized. */
-	gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h);
+	gui_mch_newfont();
-	w -= get_menu_tool_width();
-	h -= get_menu_tool_height();
-	gui_resize_shell(w, h);
 }
 else
 {
 	/* Preserve the logical dimensions of the screen. */
 	update_window_manager_hints(0, 0);
 		gui_mch_stop_blink();
 	    focus = gui.in_focus;
 	}
 #if defined(FEAT_NETBEANS_INTG)
-	/* Process the queued netbeans messages. */
+	/* Process any queued netbeans messages. */
 	netbeans_parse_messages();
 #endif
 	/*
 	 * Loop in GTK+ processing  until a timeout or input occurs.
 clip_mch_own_selection(VimClipboard *cbd)
 {
 int success;
 success = gtk_selection_owner_set(gui.drawarea, cbd->gtk_sel_atom,
-				      clipboard_event_time);
+				      gui.event_time);
 gui_mch_update();
 return (success) ? OK : FAIL;
 }
 /*

Mercurial > hg > RemoteEditor > vim7

comparison src/gui_gtk_x11.c @ 48:67300faee616 v7-3-618