[BACK]Return to window-choose.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/Attic/window-choose.c between version 1.67 and 1.68

version 1.67, 2015/10/27 15:58:43 version 1.68, 2015/11/12 11:05:34
Line 29 
Line 29 
 void    window_choose_free(struct window_pane *);  void    window_choose_free(struct window_pane *);
 void    window_choose_resize(struct window_pane *, u_int, u_int);  void    window_choose_resize(struct window_pane *, u_int, u_int);
 void    window_choose_key(struct window_pane *, struct client *,  void    window_choose_key(struct window_pane *, struct client *,
             struct session *, int, struct mouse_event *);              struct session *, key_code, struct mouse_event *);
   
 void    window_choose_default_callback(struct window_choose_data *);  void    window_choose_default_callback(struct window_choose_data *);
 struct window_choose_mode_item *window_choose_get_item(struct window_pane *,  struct window_choose_mode_item *window_choose_get_item(struct window_pane *,
             int, struct mouse_event *);              key_code, struct mouse_event *);
   
 void    window_choose_fire_callback(  void    window_choose_fire_callback(
             struct window_pane *, struct window_choose_data *);              struct window_pane *, struct window_choose_data *);
Line 86 
Line 86 
   
 void    window_choose_free1(struct window_choose_mode_data *);  void    window_choose_free1(struct window_choose_mode_data *);
 int     window_choose_key_index(struct window_choose_mode_data *, u_int);  int     window_choose_key_index(struct window_choose_mode_data *, u_int);
 int     window_choose_index_key(struct window_choose_mode_data *, int);  int     window_choose_index_key(struct window_choose_mode_data *, key_code);
 void    window_choose_prompt_input(enum window_choose_input_type,  void    window_choose_prompt_input(enum window_choose_input_type,
             const char *, struct window_pane *, int);              const char *, struct window_pane *, key_code);
 void    window_choose_reset_top(struct window_pane *, u_int);  void    window_choose_reset_top(struct window_pane *, u_int);
   
 void  void
Line 314 
Line 314 
   
 void  void
 window_choose_prompt_input(enum window_choose_input_type input_type,  window_choose_prompt_input(enum window_choose_input_type input_type,
     const char *prompt, struct window_pane *wp, int key)      const char *prompt, struct window_pane *wp, key_code key)
 {  {
         struct window_choose_mode_data  *data = wp->modedata;          struct window_choose_mode_data  *data = wp->modedata;
         size_t                           input_len;          size_t                           input_len;
Line 490 
Line 490 
 }  }
   
 struct window_choose_mode_item *  struct window_choose_mode_item *
 window_choose_get_item(struct window_pane *wp, int key, struct mouse_event *m)  window_choose_get_item(struct window_pane *wp, key_code key,
       struct mouse_event *m)
 {  {
         struct window_choose_mode_data  *data = wp->modedata;          struct window_choose_mode_data  *data = wp->modedata;
         u_int                            x, y, idx;          u_int                            x, y, idx;
Line 509 
Line 510 
   
 void  void
 window_choose_key(struct window_pane *wp, unused struct client *c,  window_choose_key(struct window_pane *wp, unused struct client *c,
     unused struct session *sess, int key, struct mouse_event *m)      unused struct session *sess, key_code key, struct mouse_event *m)
 {  {
         struct window_choose_mode_data  *data = wp->modedata;          struct window_choose_mode_data  *data = wp->modedata;
         struct screen                   *s = &data->screen;          struct screen                   *s = &data->screen;
Line 743 
Line 744 
 }  }
   
 void  void
 window_choose_write_line(  window_choose_write_line(struct window_pane *wp, struct screen_write_ctx *ctx,
     struct window_pane *wp, struct screen_write_ctx *ctx, u_int py)      u_int py)
 {  {
         struct window_choose_mode_data  *data = wp->modedata;          struct window_choose_mode_data  *data = wp->modedata;
         struct window_choose_mode_item  *item;          struct window_choose_mode_item  *item;
Line 821 
Line 822 
 }  }
   
 int  int
 window_choose_index_key(struct window_choose_mode_data *data, int key)  window_choose_index_key(struct window_choose_mode_data *data, key_code key)
 {  {
         static const char       keys[] = "0123456789"          static const char       keys[] = "0123456789"
                                          "abcdefghijklmnopqrstuvwxyz"                                           "abcdefghijklmnopqrstuvwxyz"
Line 834 
Line 835 
                 mkey = mode_key_lookup(&data->mdata, *ptr, NULL);                  mkey = mode_key_lookup(&data->mdata, *ptr, NULL);
                 if (mkey != MODEKEY_NONE && mkey != MODEKEY_OTHER)                  if (mkey != MODEKEY_NONE && mkey != MODEKEY_OTHER)
                         continue;                          continue;
                 if (key == *ptr)                  if (key == (key_code)*ptr)
                         return (idx);                          return (idx);
                 idx++;                  idx++;
         }          }
Legend:
Removed from v.1.67  
changed lines
  Added in v.1.68