Loading ...
Sorry, an error occurred while loading the content.

293problem fixes

Expand Messages
  • K.Nagano
    Jun 28, 2000
    • 0 Attachment
      Hi!
      I'm sorry never response long time.

      Now, please let me change vim against for following problem.
      I hope these patch will be included in vim5.7.

      regards,

      ----------------------------------------------------------------------------
      Problem: (MULTIBYTE)When using multibyte on terminal(such as kterm),
      inserting wrapped line(includes multibyte) makes screen corrupt.
      Solution: disable xterm bold hacking when it is multibyte mode.
      Files: src/screen.c

      ----------------------------------------------------------------------------
      Problem: (MULTIBYTE,X11,Gtk)pasting TEXT/COMPOUND_TEXT into vim does not work.
      Solution: X11 -> correct missing "break;"
      Gtk -> added TEXT/COMPOUND_TEXT selection request.
      Files: src/ui.c
      src/gui_gtk_x11.c

      ----------------------------------------------------------------------------
      Problem: (XIM,Motif)no XIM status line is displayed even though it is available.
      Solution: separate XIMStatusArea fallback code.
      Files: src/multbyte.c

      ----------------------------------- patch -----------------------------------
      Index: gui_gtk_x11.c
      ===================================================================
      RCS file: /cvs/vim/vim/src/gui_gtk_x11.c,v
      retrieving revision 1.17
      diff -u -r1.17 gui_gtk_x11.c
      --- gui_gtk_x11.c 2000/06/23 08:32:47 1.17
      +++ gui_gtk_x11.c 2000/06/29 02:01:36
      @@ -1444,9 +1444,9 @@
      #define VIM_ATOM_NAME "_VIM_TEXT"
      static const GtkTargetEntry primary_targets[] = {
      {VIM_ATOM_NAME, 0, SELECTION_CLIPBOARD},
      - {"STRING", 0, SELECTION_STRING},
      + {"COMPOUND_TEXT", 0, SELECTION_COMPOUND_TEXT},
      {"TEXT", 0, SELECTION_TEXT},
      - {"COMPOUND_TEXT", 0, SELECTION_COMPOUND_TEXT}
      + {"STRING", 0, SELECTION_STRING}
      };

      /*
      @@ -3130,6 +3130,26 @@
      gtk_main(); /* wait for selection_received_event */

      if (received_selection == RS_FAIL)
      + {
      + /* Now try to get it out of the usual string selection. */
      + received_selection = RS_NONE;
      + (void)gtk_selection_convert(gui.drawarea, GDK_SELECTION_PRIMARY,
      + gdk_atom_intern("COMPOUND_TEXT", FALSE),
      + (guint32)GDK_CURRENT_TIME);
      + while (received_selection == RS_NONE)
      + gtk_main(); /* wait for selection_received_event */
      + }
      + else if (received_selection == RS_FAIL)
      + {
      + /* Now try to get it out of the usual string selection. */
      + received_selection = RS_NONE;
      + (void)gtk_selection_convert(gui.drawarea, GDK_SELECTION_PRIMARY,
      + gdk_atom_intern("TEXT", FALSE),
      + (guint32)GDK_CURRENT_TIME);
      + while (received_selection == RS_NONE)
      + gtk_main(); /* wait for selection_received_event */
      + }
      + else if (received_selection == RS_FAIL)
      {
      /* Now try to get it out of the usual string selection. */
      received_selection = RS_NONE;
      Index: multbyte.c
      ===================================================================
      RCS file: /cvs/vim/vim/src/multbyte.c,v
      retrieving revision 1.6
      diff -u -r1.6 multbyte.c
      --- multbyte.c 2000/06/10 17:46:38 1.6
      +++ multbyte.c 2000/06/29 02:01:37
      @@ -520,7 +520,7 @@
      }

      #if defined(USE_GUI_X11) || defined(PROTO)
      -# if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6
      +# if defined(XtSpecificationRelease) && XtSpecificationRelease >= 6 && !defined(sun)
      # define USE_X11R6_XIM
      # endif

      @@ -724,14 +724,18 @@
      found = True;
      break;
      }
      - if ((xim_styles->supported_styles[i] & this_input_style)
      - == (this_input_style & ~XIMStatusArea))
      + }
      + if (!found)
      + for (i = 0; (unsigned short)i < xim_styles->count_styles; i++)
      {
      - this_input_style &= ~XIMStatusArea;
      - found = True;
      - break;
      + if ((xim_styles->supported_styles[i] & this_input_style)
      + == (this_input_style & ~XIMStatusArea))
      + {
      + this_input_style &= ~XIMStatusArea;
      + found = True;
      + break;
      + }
      }
      - }

      s = ns;
      }
      Index: screen.c
      ===================================================================
      RCS file: /cvs/vim/vim/src/screen.c,v
      retrieving revision 1.12
      diff -u -r1.12 screen.c
      --- screen.c 2000/06/10 17:46:40 1.12
      +++ screen.c 2000/06/29 02:01:40
      @@ -1746,6 +1746,9 @@
      #ifdef USE_GUI
      && !gui.in_use
      #endif
      +#ifdef MULTI_BYTE
      + && !is_dbcs
      +#endif
      )
      {
      if (screen_cur_col != Columns)
      Index: ui.c
      ===================================================================
      RCS file: /cvs/vim/vim/src/ui.c,v
      retrieving revision 1.5
      diff -u -r1.5 ui.c
      --- ui.c 2000/06/10 17:46:40 1.5
      +++ ui.c 2000/06/29 02:01:40
      @@ -1523,9 +1523,9 @@
      {
      switch (i)
      {
      - case 0: type = clipboard.xatom;
      - case 1: type = clipboard.xa_compound_text;
      - case 2: type = clipboard.xa_text;
      + case 0: type = clipboard.xatom; break;
      + case 1: type = clipboard.xa_compound_text; break;
      + case 2: type = clipboard.xa_text; break;
      default: type = XA_STRING;
      }
      XtGetSelectionValue(myShell, XA_PRIMARY, type,
      ------------------------------------------------------------------------------

      ------------------------------------------------------------------------------
      ADVANTEST CORPORATION OFFICE: nagano@...
      Katsuhito Nagano PRIVATE: GCD02476@...
      ------------------------------------------------------------------------------
    • Show all 2 messages in this topic