diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1996-09-21 06:23:56 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1996-09-21 06:23:56 +0000 |
| commit | e8e01073071369d33ab4cf61be05bebe5a65566e (patch) | |
| tree | 2c29b23bfb933e0fa40619f7d1fae430ff2c247e /usr.bin/vim/gui_athena.c | |
| parent | 584e4bbf452da2934dbaf4b9dc09bd131a1d4cd7 (diff) | |
update to vim 4.4beta
Diffstat (limited to 'usr.bin/vim/gui_athena.c')
| -rw-r--r-- | usr.bin/vim/gui_athena.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/vim/gui_athena.c b/usr.bin/vim/gui_athena.c index 75382c2902f..781147644f3 100644 --- a/usr.bin/vim/gui_athena.c +++ b/usr.bin/vim/gui_athena.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gui_athena.c,v 1.1 1996/09/07 21:40:28 downsj Exp $ */ +/* $OpenBSD: gui_athena.c,v 1.2 1996/09/21 06:23:03 downsj Exp $ */ /* vi:set ts=4 sw=4: * * VIM - Vi IMproved by Bram Moolenaar @@ -28,7 +28,7 @@ #define puller_width 19 #define puller_height 19 -static char puller_bits[] = +static char_u puller_bits[] = { 0x00,0x00,0xf8,0x00,0x00,0xf8,0xf8,0x7f,0xf8,0x04,0x80,0xf8,0x04,0x80,0xf9, 0x84,0x81,0xf9,0x84,0x83,0xf9,0x84,0x87,0xf9,0x84,0x8f,0xf9,0x84,0x8f,0xf9, @@ -100,7 +100,7 @@ gui_athena_scroll_cb_jump(w, client_data, call_data) sb = &wp->w_scrollbar; - value = *((float *)call_data) * (float)sb->max + 0.5; + value = *((float *)call_data) * (float)(sb->max - 1) + 0.5; ++value; /* range is 1 to line_count */ sb->value = value; @@ -562,9 +562,9 @@ gui_mch_add_menu(menu, parent) XtAddCallback(menu->id, XtNcallback, gui_x11_menu_cb, (XtPointer)menu); - pullright_name = strnsave(menu->name, strlen(menu->name) + - strlen("-pullright")); - strcat(pullright_name, "-pullright"); + pullright_name = strnsave(menu->name, + STRLEN(menu->name) + strlen("-pullright")); + strcat((char *)pullright_name, "-pullright"); menu->submenu_id = XtVaCreatePopupShell(pullright_name, simpleMenuWidgetClass, parent->submenu_id, XtNforeground, gui.menu_fg_pixel, @@ -1016,9 +1016,9 @@ gui_athena_pullright_action(w, event, args, nargs) if (event->xmotion.x < (width * 3) / 4) return; - pullright_name = strnsave(XtName(menuw), strlen(XtName(menuw)) + - strlen("-pullright")); - strcat(pullright_name, "-pullright"); + pullright_name = strnsave((char_u *)XtName(menuw), + strlen(XtName(menuw)) + strlen("-pullright")); + strcat((char *)pullright_name, "-pullright"); popup = XtNameToWidget(w, pullright_name); vim_free(pullright_name); |