src/usr.bin/tmux/window-copy.c - diff

Return to window-copy.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/window-copy.c between version 1.223 and 1.224

-version 1.223, 2019/05/15 19:25:53
+version 1.224, 2019/05/26 17:34:45
 Line 2810
 Line 2810
 Line 2810
  {
          struct window_copy_mode_data    *data = wme->data;
          struct grid_cell                 gc;
-         const struct utf8_data          *ud;
-         struct utf8_data                *copy;
-         struct utf8_data                *loop;
-         int                              found = 0;
          grid_get_cell(data->backing->grid, px, py, &gc);
          if (gc.flags & GRID_FLAG_PADDING)
                  return (0);
-         ud = &gc.data;
+         return (utf8_cstrhas(set, &gc.data));
-         copy = utf8_fromcstr(set);
-         for (loop = copy; loop->size != 0; loop++) {
-                 if (loop->size != ud->size)
-                         continue;
-                 if (memcmp(loop->data, ud->data, loop->size) == 0) {
-                         found = 1;
-                         break;
-                 }
-         }
-         free(copy);
-         return (found);
  }
  static u_int
  window_copy_find_length(struct window_mode_entry *wme, u_int py)
  {
          struct window_copy_mode_data    *data = wme->data;
-         struct screen                   *s = data->backing;
-         struct grid_cell                 gc;
-         u_int                            px;
-         /*
+         return (grid_line_length(data->backing->grid, py));
-          * If the pane has been resized, its grid can contain old overlong
-          * lines. grid_peek_cell does not allow accessing cells beyond the
-          * width of the grid, and screen_write_copy treats them as spaces, so
-          * ignore them here too.
-          */
-         px = grid_get_line(s->grid, py)->cellsize;
-         if (px > screen_size_x(s))
-                 px = screen_size_x(s);
-         while (px > 0) {
-                 grid_get_cell(s->grid, px - 1, py, &gc);
-                 if (gc.data.size != 1 || *gc.data.data != ' ')
-                         break;
-                 px--;
-         }
-         return (px);
  }
  static void