TmpPhoto: gcin-tan-configure.diff

gcin-1.3.5.pre4/Makefile

@@ -33 +33 @@
-        gcin-icon.o gcin-setup-gtab.o gtab-list.o gcin-exec-script.o
-
-OBJS_gcin_gb_toggle = gcin-gb-toggle.o gcin-conf.o util.o gcin-send.o
+OBJS_gcin_tan_toggle = gcin-tan-toggle.o gcin-conf.o util.o gcin-send.o
-OBJS_gcin_message = gcin-message.o gcin-conf.o util.o gcin-send.o
-OBJS_pin_juyin = pin-juyin.o util.o pho-lookup.o locale.o pho-sym.o
-
@@ -76 +77 @@
-PROGS_SYM=trad2sim
-PROGS_CV=kbmcv pin-juyin
-
+ifeq ($(USE_TAN),Y)
+CFLAGS += -DUSE_TAN=1
+PROGS += gcin-tan-toggle
+endif
+
-all:    $(PROGS) trad2sim $(DATA) $(PROGS_CV) gcin.spec
-        $(MAKE) -C data
-        $(MAKE) -C im-client
@@ -138 +144 @@
-gcin-gb-toggle: $(OBJS_gcin_gb_toggle)
-        $(CC) -o $@ $(OBJS_gcin_gb_toggle) $(LDFLAGS)
-
+gcin-tan-toggle: $(OBJS_gcin_tan_toggle)
+        $(CC) -o $@ $(OBJS_gcin_tan_toggle) $(LDFLAGS)
+
-gcin-message:   $(OBJS_gcin_message)
-        $(CC) -o $@ $(OBJS_gcin_message) $(LDFLAGS)
-

gcin-1.3.5.pre4/gcin-tan-toggle.c

@@ +1 @@
+#include "gcin.h"
+
+int main()
+{
+  gdk_init(NULL, NULL);
+  send_gcin_message(GDK_DISPLAY(), "#gcin_tan_toggle");
+
+  return 0;
+}

gcin-1.3.5.pre4/win-gtab.c

@@ -184 +184 @@
-}
-
-void show_win_sym();
+#if USE_TAN
+void show_win_tan();
+#endif
-
-void move_win_gtab(int x, int y)
-{
@@ -204 +207 @@
-  win_x = x;  win_y = y;
-
-  show_win_sym();
+#if USE_TAN
+  show_win_tan();
+#endif
-}
-
-void set_gtab_input_method_name(char *s)
@@ -228 +234 @@
-}
-
-void create_win_sym();
+#if USE_TAN
+void create_win_tan();
+#endif
-void exec_gcin_setup();
-
-static void mouse_button_callback( GtkWidget *widget,GdkEventButton *event, gpointer data)
@@ -541 +550 @@
-    gtk_window_present(gwin_gtab);
-
-  show_win_sym();
+#if USE_TAN
+  show_win_tan();
+#endif
-}
-
-
-void hide_win_sym();
+#if USE_TAN
+void hide_win_tan();
+#endif
-void close_gtab_pho_win();
-
-void hide_win_gtab()
@@ -557 +572 @@
-  close_gtab_pho_win();
-
-  hide_win_sym();
+#if USE_TAN
+  hide_win_tan();
+#endif
-}
-
-void minimize_win_gtab()

gcin-1.3.5.pre4/win-sym.c

@@ -5 +5 @@
-#include "win-sym.h"
-
-static GtkWidget *gwin_sym = NULL;
+#if USE_TAN
+static GtkWidget *gwin_tan = NULL;
+#endif
-static int cur_in_method;
-
-typedef struct {
@@ -233 +236 @@
-  gtk_window_move(GTK_WINDOW(gwin_sym), wx, wy);
-}
-
+#if USE_TAN
+void move_win_tan()
+{
+  if (!gwin_tan)
+    return;
+
+  int wx, wy;
+  {
+    update_active_in_win_geom();
+
+    wx = win_x; wy = win_y + win_yl;
+  }
+
+  int wintan_xl, wintan_yl;
+  get_win_size(gwin_tan, &wintan_xl, &wintan_yl);
+
+  if (wx + wintan_xl > dpy_xl)
+    wx = dpy_xl - wintan_xl;
+  if (wx < 0)
+    wx = 0;
+
+  {
+    if (wy + wintan_yl > dpy_yl)
+      wy = win_y - wintan_yl;
+    if (wy < 0)
+      wy = 0;
+  }
+
+  gtk_window_move(GTK_WINDOW(gwin_tan), wx, wy);
+}
+#endif
+
-static gboolean win_sym_enabled=0;
+#if USE_TAN
+static gboolean win_tan_enabled=0;
+#endif
-
-void hide_win_sym()
-{
@@ -243 +281 @@
-  gtk_widget_hide(gwin_sym);
-}
-
+#if USE_TAN
+void hide_win_tan()
+{
+  if (!gwin_tan)
+    return;
+
+  gtk_widget_hide(gwin_tan);
+}
+#endif
+
-void show_win_sym()
-{
-  if (!current_CS)
@@ -257 +305 @@
-  move_win_sym(gwin_sym);
-}
-
+#if USE_TAN
+void show_win_tan()
+{
+  if (!current_CS)
+    return;
+
+  if (!gwin_tan || !win_tan_enabled || current_CS->im_state == GCIN_STATE_DISABLED)
+    return;
+
+  gtk_widget_show_all(gwin_tan);
+  move_win_tan(gwin_tan);
+}
+#endif
-
-void lookup_gtab(char *ch, char out[]);
-void str_to_all_phokey_chars(char *b5_str, char *out);
@@ -289 +350 @@
-  gwin_sym = NULL;
-}
-
+#if USE_TAN
+static void destroy_tan()
+{
+  if (gwin_tan)
+    gtk_widget_destroy(gwin_tan);
+  gwin_tan = NULL;
+}
+#endif
-
-gboolean  button_scroll_event(GtkWidget *widget,GdkEventScroll *event, gpointer user_data)
-{
@@ -413 +482 @@
-  return;
-}
-
+#if USE_TAN
+void create_win_tan()
+{
+  char gcin_dir[512];
+
+  if (!current_CS) {
+    dbg("create_win_tan, null CS\n");
+    return;
+  }
+
+  if (current_CS->in_method < 0) {
+    p_err("bad current_CS %d\n", current_CS->in_method);
+  }
+
+  if (cur_in_method != current_CS->in_method)
+    destroy_tan();
+
+  win_tan_enabled^=1;
+
+  if (gwin_tan) {
+    if (win_tan_enabled) {
+      show_win_tan(gwin_tan);
+    }
+    else
+      hide_win_tan(gwin_tan);
+
+    return;
+  }
+
+  gwin_tan = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  cur_in_method = current_CS->in_method;
+
+  GtkWidget *vbox_top = gtk_vbox_new (FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (gwin_tan), vbox_top);
+
+  gtk_container_set_border_width (GTK_CONTAINER (vbox_top), 0);
+
+  GtkWidget *image = gtk_image_new_from_file(get_gcin_conf_fname("gcin-tan", gcin_dir));
+  gtk_box_pack_start (GTK_BOX (vbox_top), image, FALSE, FALSE, 0);
+
+  gtk_widget_realize (gwin_tan);
+  set_no_focus(gwin_tan);
+
+  if (win_tan_enabled)
+    gtk_widget_show_all(gwin_tan);
+
+  move_win_tan(gwin_tan);
+  return;
+}
+#endif
-
-void change_win_sym_font_size()
-{