home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / old / 5.6.036 < prev    next >
Encoding:
Internet Message Format  |  2000-03-28  |  6.3 KB
  1. To: vim-dev@vim.org
  2. Subject: Patch 5.6.036
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. ------------
  6.  
  7. Patch 5.6.036
  8. Problem:    GTK GUI: Copy/paste text doesn't work between gvim and Eterm.
  9. Solution:   Support TEXT and COMPOUND_TEXT selection targets. (Sung-Hyun Nam)
  10. Files:        src/gui_gtk_x11.c
  11.  
  12.  
  13. *** ../vim-5.6.35/src/gui_gtk_x11.c    Fri Jan 21 20:44:10 2000
  14. --- src/gui_gtk_x11.c    Tue Mar 28 11:21:06 2000
  15. ***************
  16. *** 43,48 ****
  17. --- 43,50 ----
  18.   enum {
  19.       SELECTION_TYPE_NONE,
  20.       SELECTION_STRING,
  21. +     SELECTION_TEXT,
  22. +     SELECTION_COMPOUND_TEXT,
  23.       SELECTION_CLIPBOARD
  24.   };
  25.   
  26. ***************
  27. *** 670,678 ****
  28.   static void
  29.   selection_received_event(GtkWidget * widget, GtkSelectionData * data)
  30.   {
  31. !     int motion_type;
  32. !     long_u len;
  33. !     char_u *p;
  34.   
  35.       if ((!data->data) || (data->length <= 0)) {
  36.       received_selection = RS_FAIL;
  37. --- 672,681 ----
  38.   static void
  39.   selection_received_event(GtkWidget * widget, GtkSelectionData * data)
  40.   {
  41. !     int        motion_type;
  42. !     long_u    len;
  43. !     char_u    *p;
  44. !     int        free_p = FALSE;
  45.   
  46.       if ((!data->data) || (data->length <= 0)) {
  47.       received_selection = RS_FAIL;
  48. ***************
  49. *** 684,691 ****
  50.       }
  51.   
  52.       motion_type = MCHAR;
  53. !     p = (char_u *) data->data;
  54. !     len = data->length;
  55.   
  56.       if (data->type == clipboard.atom) {
  57.       motion_type = *p++;
  58. --- 687,716 ----
  59.       }
  60.   
  61.       motion_type = MCHAR;
  62. !     if (data->type == gdk_atom_intern("COMPOUND_TEXT", FALSE)
  63. !         || data->type == gdk_atom_intern("TEXT", FALSE))
  64. !     {
  65. !     int    count, i;
  66. !     char    **list;
  67. !     GString *str = g_string_new(NULL);
  68. ! 
  69. !     count = gdk_text_property_to_text_list(data->type, data->format,
  70. !                          data->data, data->length, &list);
  71. !     len = 0;
  72. !     for (i = 0; i < count; i++)
  73. !         g_string_append(str, list[i]);
  74. ! 
  75. !     p = str->str;
  76. !     len = str->len;
  77. !     g_string_free(str, FALSE);
  78. !     gdk_free_text_list(list);
  79. !     free_p = TRUE;
  80. !     }
  81. !     else
  82. !     {
  83. !     p = (char_u *)data->data;
  84. !     len = data->length;
  85. !     }
  86.   
  87.       if (data->type == clipboard.atom) {
  88.       motion_type = *p++;
  89. ***************
  90. *** 695,700 ****
  91. --- 720,728 ----
  92.       received_selection = RS_OK;
  93.       if (gtk_main_level() > 0)
  94.       gtk_main_quit();
  95. + 
  96. +     if (free_p)
  97. +     g_free(p);
  98.   }
  99.   
  100.   #ifdef GTK_HAVE_FEATURES_1_1_4
  101. ***************
  102. *** 719,725 ****
  103.       if (!clipboard.owned)
  104.       return;            /* Shouldn't ever happen */
  105.   
  106. !     if (info != SELECTION_STRING && info != SELECTION_CLIPBOARD)
  107.       return;
  108.   
  109.       clip_get_selection();
  110. --- 747,754 ----
  111.       if (!clipboard.owned)
  112.       return;            /* Shouldn't ever happen */
  113.   
  114. !     if (info != SELECTION_STRING && info != SELECTION_CLIPBOARD
  115. !         && info != SELECTION_COMPOUND_TEXT && info != SELECTION_TEXT)
  116.       return;
  117.   
  118.       clip_get_selection();
  119. ***************
  120. *** 746,751 ****
  121. --- 775,798 ----
  122.       mch_memmove(result + 1, string, (size_t)(length - 1));
  123.       type = clipboard.atom;
  124.       }
  125. +     else if (info == SELECTION_COMPOUND_TEXT || info == SELECTION_TEXT)
  126. +     {
  127. +     char *str;
  128. +     gint format, new_len;
  129. + 
  130. +     vim_free(result);
  131. +     str = g_new(char, length + 1);
  132. +     mch_memmove(str, string, (size_t) length);
  133. +     vim_free(string);
  134. +     str[length] = '\0';
  135. +     gdk_string_to_compound_text(str, &type, &format, &result, &new_len);
  136. +     g_free(str);
  137. +     selection_data->type = type;
  138. +     selection_data->format = format;
  139. +     gtk_selection_data_set(selection_data, type, format, result, new_len);
  140. +     gdk_free_compound_text(result);
  141. +     return;
  142. +     }
  143.       else
  144.       {
  145.       mch_memmove(result, string, (size_t)length);
  146. ***************
  147. *** 1327,1332 ****
  148. --- 1374,1387 ----
  149.       return TRUE;
  150.   }
  151.   
  152. + #define VIM_ATOM_NAME "_VIM_TEXT"
  153. + static const GtkTargetEntry primary_targets[] = {
  154. +     {VIM_ATOM_NAME, 0, SELECTION_CLIPBOARD},
  155. +     {"STRING", 0, SELECTION_STRING},
  156. +     {"TEXT", 0, SELECTION_TEXT},
  157. +     {"COMPOUND_TEXT", 0, SELECTION_COMPOUND_TEXT}
  158. + };
  159. + 
  160.   /*
  161.    * Initialise the X GUI.  Create all the windows, set up all the call-backs etc.
  162.    * Returns OK for success, FAIL when the GUI can't be started.
  163. ***************
  164. *** 1443,1449 ****
  165.       gui.def_back_pixel = gui.back_pixel;
  166.       }
  167.       gui.visibility = GDK_VISIBILITY_UNOBSCURED;
  168. !     clipboard.atom = gdk_atom_intern("_VIM_TEXT", FALSE);
  169.       save_yourself_atom = gdk_atom_intern("WM_SAVE_YOURSELF", FALSE);
  170.       reread_rcfiles_atom = gdk_atom_intern("_GTK_READ_RCFILES", FALSE);
  171.   
  172. --- 1498,1504 ----
  173.       gui.def_back_pixel = gui.back_pixel;
  174.       }
  175.       gui.visibility = GDK_VISIBILITY_UNOBSCURED;
  176. !     clipboard.atom = gdk_atom_intern(VIM_ATOM_NAME, FALSE);
  177.       save_yourself_atom = gdk_atom_intern("WM_SAVE_YOURSELF", FALSE);
  178.       reread_rcfiles_atom = gdk_atom_intern("_GTK_READ_RCFILES", FALSE);
  179.   
  180. ***************
  181. *** 1492,1501 ****
  182.   
  183.       /* gtk_selection_add_target() is not in GTK 1.1.2 */
  184.   #ifdef GTK_HAVE_FEATURES_1_1_4
  185. !     gtk_selection_add_target(gui.drawarea, GDK_SELECTION_PRIMARY,
  186. !                 GDK_TARGET_STRING, SELECTION_STRING);
  187. !     gtk_selection_add_target(gui.drawarea, GDK_SELECTION_PRIMARY,
  188. !                 clipboard.atom, SELECTION_CLIPBOARD);
  189.       gtk_signal_connect(GTK_OBJECT(gui.drawarea), "selection_get",
  190.                  GTK_SIGNAL_FUNC(selection_get_event), NULL);
  191.   #else
  192. --- 1547,1555 ----
  193.   
  194.       /* gtk_selection_add_target() is not in GTK 1.1.2 */
  195.   #ifdef GTK_HAVE_FEATURES_1_1_4
  196. !     gtk_selection_add_targets(gui.drawarea, GDK_SELECTION_PRIMARY,
  197. !                   primary_targets,
  198. !                   sizeof(primary_targets)/sizeof(primary_targets[0]));
  199.       gtk_signal_connect(GTK_OBJECT(gui.drawarea), "selection_get",
  200.                  GTK_SIGNAL_FUNC(selection_get_event), NULL);
  201.   #else
  202. ***************
  203. *** 2097,2103 ****
  204.       if ((sdup = g_strdup((const char *)font_name)) == NULL)
  205.           return FAIL;
  206.   
  207. !     /* slipt up the whole */
  208.       i = 0;
  209.       for (tmp = sdup; *tmp != '\0'; ++tmp)
  210.           if (*tmp == '-')
  211. --- 2151,2157 ----
  212.       if ((sdup = g_strdup((const char *)font_name)) == NULL)
  213.           return FAIL;
  214.   
  215. !     /* split up the whole */
  216.       i = 0;
  217.       for (tmp = sdup; *tmp != '\0'; ++tmp)
  218.           if (*tmp == '-')
  219. *** ../vim-5.6.35/src/version.c    Mon Mar 27 21:53:47 2000
  220. --- src/version.c    Tue Mar 28 11:27:27 2000
  221. ***************
  222. *** 420,421 ****
  223. --- 420,423 ----
  224.   {   /* Add new patch number below this line */
  225. + /**/
  226. +     36,
  227.   /**/
  228.  
  229. -- 
  230. A computer programmer is a device for turning coffee into bugs.
  231.                     Bram Moolenaar
  232.  
  233. /-/-- Bram Moolenaar --- Bram@moolenaar.net --- http://www.moolenaar.net --\-\
  234. \-\-- Vim: http://www.vim.org ---- ICCF Holland: http://www.vim.org/iccf --/-/
  235.