aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.262

Browse Source 
Problem:    Photon code style doesn't match Vim style.
Solution:   Clean up some of it.  (Elias Diem)
This commit is contained in:
Bram Moolenaar 2011-07-27 14:09:09 +02:00
parent d0c7ba57b1
commit d2221131cf
2 changed files with 105 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
src/gui_photon.c
View File

@ -32,9 +32,9 @@
#endif
#define ARRAY_LENGTH(a) (sizeof(a) / sizeof(a[0]))
#define RGB(r,g,b) PgRGB(r,g,b)
#define RGB(r, g, b) PgRGB(r, g, b)
#define EVENT_BUFFER_SIZE sizeof( PhEvent_t ) + 1000
#define EVENT_BUFFER_SIZE sizeof(PhEvent_t) + 1000
/* Some defines for gui_mch_mousehide() */
#define MOUSE_HIDE TRUE
@ -206,53 +206,53 @@ static PtCallbackF_t gui_ph_handle_menu_resize;
static PtCallbackF_t gui_ph_handle_menu_unrealized;
#ifdef USE_PANEL_GROUP
static void gui_ph_get_panelgroup_margins( short*, short*, short*, short* );
static void gui_ph_get_panelgroup_margins(short*, short*, short*, short*);
#endif
#ifdef FEAT_TOOLBAR
static PhImage_t *gui_ph_toolbar_find_icon( vimmenu_T *menu );
static PhImage_t *gui_ph_toolbar_find_icon(vimmenu_T *menu);
#endif
static void gui_ph_draw_start( void );
static void gui_ph_draw_end( void );
static void gui_ph_draw_start(void);
static void gui_ph_draw_end(void);
/* Set the text for the balloon */
static PtWidget_t * gui_ph_show_tooltip( PtWidget_t *window,
static PtWidget_t * gui_ph_show_tooltip(PtWidget_t *window,
PtWidget_t *widget,
int position,
char *text,
char *font,
PgColor_t fill_color,
PgColor_t text_color );
PgColor_t text_color);
/****************************************************************************/
static PtWidget_t * gui_ph_show_tooltip( PtWidget_t *window,
static PtWidget_t * gui_ph_show_tooltip(PtWidget_t *window,
PtWidget_t *widget,
int position,
char *text,
char *font,
PgColor_t fill_color,
PgColor_t text_color )
PgColor_t text_color)
{
PtArg_t arg;
vimmenu_T *menu;
char_u *tooltip;
PtSetArg( &arg, Pt_ARG_POINTER, &menu, 0 );
PtGetResources( widget, 1, &arg );
PtSetArg(&arg, Pt_ARG_POINTER, &menu, 0);
PtGetResources(widget, 1, &arg);
/* Override the text and position */
tooltip = text;
if( menu != NULL )
if (menu != NULL)
{
int index = MENU_INDEX_TIP;
if( menu->strings[ index ] != NULL )
if (menu->strings[ index ] != NULL)
tooltip = menu->strings[ index ];
}
return( PtInflateBalloon(
return PtInflateBalloon(
window,
widget,
/* Don't put the balloon at the bottom,
@ -261,25 +261,25 @@ static PtWidget_t * gui_ph_show_tooltip( PtWidget_t *window,
tooltip,
font,
fill_color,
text_color ) );
text_color);
}
static void
gui_ph_resize_container( void )
gui_ph_resize_container(void)
{
PhArea_t area;
PtWidgetArea( gui.vimWindow, &area );
PtWidgetPos ( gui.vimContainer, &area.pos );
PtWidgetArea(gui.vimWindow, &area);
PtWidgetPos (gui.vimContainer, &area.pos);
PtSetResource( gui.vimContainer, Pt_ARG_AREA, &area, 0 );
PtSetResource(gui.vimContainer, Pt_ARG_AREA, &area, 0);
}
static int
gui_ph_handle_menu_resize(
PtWidget_t *widget,
void *other,
PtCallbackInfo_t *info )
PtCallbackInfo_t *info)
{
PtContainerCallback_t *sizes = info->cbdata;
PtWidget_t *container;
@ -291,7 +291,7 @@ gui_ph_handle_menu_resize(
/* Because vim treats the toolbar and menubar separately,
* and here they're lumped together into a PtToolbarGroup,
* we only need either menu_height or toolbar_height set at once */
if( gui.menu_is_active )
if (gui.menu_is_active)
{
gui.menu_height = height;
gui.toolbar_height = 0;
@ -310,16 +310,16 @@ gui_ph_handle_menu_resize(
container = gui.vimContainer;
#endif
PtSetResource( container, Pt_ARG_POS, &below_menu, 0 );
PtSetResource(container, Pt_ARG_POS, &below_menu, 0);
gui_ph_resize_container();
#ifdef USE_PANEL_GROUP
gui_ph_get_panelgroup_margins(
&pg_margin_top, &pg_margin_bottom,
&pg_margin_left, &pg_margin_right );
&pg_margin_left, &pg_margin_right);
#endif
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
/*
@ -330,23 +330,23 @@ gui_ph_handle_menu_resize(
gui_ph_handle_timer_cursor(
PtWidget_t *widget,
void *data,
PtCallbackInfo_t *info )
PtCallbackInfo_t *info)
{
if( blink_state == BLINK_ON )
if (blink_state == BLINK_ON)
{
gui_undraw_cursor();
blink_state = BLINK_OFF;
PtSetResource( gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL,
blink_offtime, 0 );
PtSetResource(gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL,
blink_offtime, 0);
}
else
{
gui_update_cursor(TRUE, FALSE);
blink_state = BLINK_ON;
PtSetResource( gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL,
blink_ontime, 0 );
PtSetResource(gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL,
blink_ontime, 0);
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
static int
@ -354,7 +354,7 @@ gui_ph_handle_timer_timeout(PtWidget_t *widget, void *data, PtCallbackInfo_t *in
{
is_timeout = TRUE;
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
static int
@ -402,7 +402,7 @@ gui_ph_handle_window_cb( PtWidget_t *widget, void *data, PtCallbackInfo_t *info
break;
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
static int
@ -426,13 +426,13 @@ gui_ph_handle_scrollbar( PtWidget_t *widget, void *data, PtCallbackInfo_t *info
case Pt_SCROLL_SET:
/* FIXME: return straight away here? */
return( Pt_CONTINUE );
return Pt_CONTINUE;
break;
}
gui_drag_scrollbar(sb, value, dragging);
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
static int
@ -453,7 +453,7 @@ gui_ph_handle_keyboard( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
/* We're a good lil photon program, aren't we? yes we are, yeess wee arrr */
if( key->key_flags & Pk_KF_Compose )
{
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
if( (key->key_flags & Pk_KF_Cap_Valid) &&
@ -473,7 +473,7 @@ gui_ph_handle_keyboard( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
gui_is_menu_shortcut( key->key_cap ) ) ) )
{
/* Fallthrough and let photon look for the hotkey */
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
#endif
@ -544,7 +544,7 @@ gui_ph_handle_keyboard( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
add_to_input_buf( string, len );
}
return( Pt_CONSUME );
return Pt_CONSUME;
}
len = 0;
#endif
@ -579,7 +579,7 @@ gui_ph_handle_keyboard( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
}
else
{
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
}
else
@ -622,11 +622,11 @@ gui_ph_handle_keyboard( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
if( len > 0 )
{
add_to_input_buf( string, len );
return( Pt_CONSUME );
return Pt_CONSUME;
}
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
static int
@ -652,7 +652,7 @@ gui_ph_handle_mouse( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
if( info->event->type == Ph_EV_PTR_MOTION_NOBUTTON )
{
gui_mouse_moved( mouse_x, mouse_y );
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
if( pointer->key_mods & Pk_KM_Shift )
@ -702,7 +702,7 @@ gui_ph_handle_mouse( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
gui_send_mouse_event( button , mouse_x, mouse_y, repeated_click, modifiers );
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
/* Handle a focus change of the PtRaw widget */
@ -721,7 +721,7 @@ gui_ph_handle_focus( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
PtAddEventHandler( gui.vimTextArea, Ph_EV_PTR_MOTION_NOBUTTON,
gui_ph_handle_mouse, NULL );
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
static void
@ -793,7 +793,7 @@ gui_ph_handle_pulldown_menu(
PtRealizeWidget( menu->submenu_id );
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
/* This is used for pulldown/popup menus and also toolbar buttons */
@ -805,7 +805,7 @@ gui_ph_handle_menu( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
vimmenu_T *menu = (vimmenu_T *) data;
gui_menu_cb( menu );
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
/* Stop focus from disappearing into the menubar... */
@ -816,7 +816,7 @@ gui_ph_handle_menu_unrealized(
PtCallbackInfo_t *info )
{
PtGiveFocus( gui.vimTextArea, NULL );
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
static int
@ -826,7 +826,7 @@ gui_ph_handle_window_open(
PtCallbackInfo_t *info )
{
gui_set_shellsize( FALSE, TRUE, RESIZE_BOTH );
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
/****************************************************************************/
@ -878,7 +878,7 @@ gui_ph_find_buffer_item( char_u *name )
( STRCMP( items->dname, name ) != 0 ) )
items = items->next;
}
return( items );
return items;
}
static void
@ -927,7 +927,7 @@ gui_ph_handle_pg_change(
gui_menu_cb( menu );
}
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
static void
@ -974,10 +974,10 @@ gui_ph_is_buffer_item( vimmenu_T *menu, vimmenu_T *parent )
mark++;
if( *mark == ')' )
return( TRUE);
return TRUE;
}
}
return( FALSE );
return FALSE;
}
static void
@ -1057,7 +1057,7 @@ gui_ph_handle_buffer_remove(
gui_ph_pg_remove_buffer( menu->dname );
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
#endif
@ -1071,7 +1071,7 @@ gui_ph_pane_resize( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
PtContainerHold( gui.vimContainer );
}
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
/****************************************************************************/
@ -1126,7 +1126,7 @@ gui_mch_init(void)
gui.event_buffer = (PhEvent_t *) alloc( EVENT_BUFFER_SIZE );
if( gui.event_buffer == NULL )
return( FAIL );
return FAIL;
/* Get a translation so we can convert from ISO Latin-1 to UTF */
charset_translate = PxTranslateSet( NULL, "latin1" );
@ -1141,7 +1141,7 @@ gui_mch_init(void)
PtSetArg( &args[ n++ ], Pt_ARG_DIM, &window_size, 0 );
gui.vimWindow = PtCreateWidget( PtWindow, NULL, n, args );
if( gui.vimWindow == NULL )
return( FAIL );
return FAIL;
PtAddCallback( gui.vimWindow, Pt_CB_WINDOW, gui_ph_handle_window_cb, NULL );
PtAddCallback( gui.vimWindow, Pt_CB_WINDOW_OPENING,
@ -1158,7 +1158,7 @@ gui_mch_init(void)
gui.vimPanelGroup = PtCreateWidget( PtPanelGroup, gui.vimWindow, n, args );
if( gui.vimPanelGroup == NULL )
return( FAIL );
return FAIL;
PtAddCallback( gui.vimPanelGroup, Pt_CB_PG_PANEL_SWITCHING,
gui_ph_handle_pg_change, NULL );
@ -1172,7 +1172,7 @@ gui_mch_init(void)
gui.vimContainer = PtCreateWidget( PtPane, gui.vimWindow, n, args );
if( gui.vimContainer == NULL )
return( FAIL );
return FAIL;
PtAddCallback( gui.vimContainer, Pt_CB_RESIZE, gui_ph_pane_resize, NULL );
#endif
@ -1195,7 +1195,7 @@ gui_mch_init(void)
gui.vimTextArea = PtCreateWidget( PtRaw, Pt_DFLT_PARENT, n, args );
if( gui.vimTextArea == NULL)
return( FAIL );
return FAIL;
/* TODO: use PtAddEventHandlers instead? */
/* Not using Ph_EV_BUT_REPEAT because vim wouldn't use it anyway */
@ -1220,11 +1220,11 @@ gui_mch_init(void)
*/
gui_ph_timer_cursor = PtCreateWidget( PtTimer, gui.vimWindow, 0, NULL );
if( gui_ph_timer_cursor == NULL )
return( FAIL );
return FAIL;
gui_ph_timer_timeout = PtCreateWidget( PtTimer, gui.vimWindow, 0, NULL );
if( gui_ph_timer_timeout == NULL )
return( FAIL );
return FAIL;
PtAddCallback( gui_ph_timer_cursor, Pt_CB_TIMER_ACTIVATE,
gui_ph_handle_timer_cursor, NULL);
@ -1239,7 +1239,7 @@ gui_mch_init(void)
gui.vimToolBarGroup = PtCreateWidget( PtToolbarGroup, gui.vimWindow,
n, args );
if( gui.vimToolBarGroup == NULL )
return( FAIL );
return FAIL;
PtAddCallback( gui.vimToolBarGroup, Pt_CB_RESIZE,
gui_ph_handle_menu_resize, NULL );
@ -1254,7 +1254,7 @@ gui_mch_init(void)
}
gui.vimMenuBar = PtCreateWidget( PtMenuBar, gui.vimToolBarGroup, n, args );
if( gui.vimMenuBar == NULL )
return( FAIL );
return FAIL;
# ifdef FEAT_TOOLBAR
n = 0;
@ -1273,7 +1273,7 @@ gui_mch_init(void)
gui.vimToolBar = PtCreateWidget( PtToolbar, gui.vimToolBarGroup, n, args );
if( gui.vimToolBar == NULL )
return( FAIL );
return FAIL;
/*
* Size for the toolbar is fetched in gui_mch_show_toolbar, after
@ -1284,13 +1284,13 @@ gui_mch_init(void)
#endif
return( OK );
return OK;
}
int
gui_mch_init_check(void)
{
return( (is_photon_available == TRUE) ? OK : FAIL );
return (is_photon_available == TRUE) ? OK : FAIL;
}
int
@ -1310,7 +1310,7 @@ gui_mch_open(void)
if (gui_win_x != -1 && gui_win_y != -1)
gui_mch_set_winpos(gui_win_x, gui_win_y);
return( (PtRealizeWidget( gui.vimWindow ) == 0) ? OK : FAIL );
return (PtRealizeWidget( gui.vimWindow ) == 0) ? OK : FAIL;
}
void
@ -1336,7 +1336,7 @@ gui_mch_exit(int rc)
exit_gui_mch_update( void *data )
{
*(int *)data = FALSE;
return( Pt_END );
return Pt_END;
}
void
@ -1365,10 +1365,10 @@ gui_mch_wait_for_chars(int wtime)
if( input_available() )
{
PtSetResource( gui_ph_timer_timeout, Pt_ARG_TIMER_INITIAL, 0, 0 );
return( OK );
return OK;
}
else if( is_timeout == TRUE )
return( FAIL );
return FAIL;
}
}
@ -1446,9 +1446,9 @@ gui_mch_browse(
vim_free( default_path );
if( file.ret == Pt_FSDIALOG_BTN1 )
return( vim_strsave( file.path ) );
return vim_strsave(file.path);
}
return( NULL );
return NULL;
}
#endif
@ -1470,7 +1470,7 @@ gui_ph_dialog_close( int button, void *data )
PtModalUnblock( modal_ctrl, (void *) button );
return( Pt_TRUE );
return Pt_TRUE;
}
static int
@ -1478,7 +1478,7 @@ gui_ph_dialog_text_enter( PtWidget_t *widget, void *data, PtCallbackInfo_t *info
{
if( info->reason_subtype == Pt_EDIT_ACTIVATE )
gui_ph_dialog_close( 1, data );
return( Pt_CONTINUE );
return Pt_CONTINUE;
}
static int
@ -1490,9 +1490,9 @@ gui_ph_dialog_esc( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
if( ( key->key_flags & Pk_KF_Cap_Valid ) && ( key->key_cap == Pk_Escape ) )
{
gui_ph_dialog_close( 0, data );
return( Pt_CONSUME );
return Pt_CONSUME;
}
return( Pt_PROCESS );
return Pt_PROCESS;
}
int
@ -1519,7 +1519,7 @@ gui_mch_dialog(
button_count = len = i = 0;
if( buttons == NULL || *buttons == NUL )
return( -1 );
return -1;
/* There is one less separator than buttons, so bump up the button count */
button_count = 1;
@ -1637,7 +1637,7 @@ gui_mch_dialog(
vim_free( button_array );
vim_free( buttons_copy );
return( dialog_result );
return dialog_result;
}
#endif
/****************************************************************************/
@ -1653,7 +1653,7 @@ gui_mch_get_winpos(int *x, int *y)
*x = pos->x;
*y = pos->y;
return( OK );
return OK;
}
void
@ -1975,11 +1975,11 @@ gui_mch_new_colors(void)
hex_digit(int c)
{
if (VIM_ISDIGIT(c))
return( c - '0' );
return c - '0';
c = TOLOWER_ASC(c);
if (c >= 'a' && c <= 'f')
return( c - 'a' + 10 );
return( -1000 );
return c - 'a' + 10;
return -1000;
}
@ -2065,13 +2065,13 @@ gui_mch_get_color(char_u *name)
b = hex_digit( name[5] ) * 16 + hex_digit( name[6] );
if( r < 0 || g < 0 || b < 0 )
return INVALCOLOR;
return( RGB( r, g, b ) );
return RGB(r, g, b);
}
for( i = 0; i < ARRAY_LENGTH( table ); i++ )
{
if( STRICMP( name, table[i].name ) == 0 )
return( table[i].colour );
return table[i].colour;
}
/*
@ -2115,7 +2115,7 @@ gui_mch_get_color(char_u *name)
if (STRICMP(color, name) == 0)
{
fclose(fd);
return( (guicolor_T) RGB(r,g,b) );
return (guicolor_T)RGB(r, g, b);
}
}
@ -2451,8 +2451,8 @@ gui_mch_haskey(char_u *name)
for (i = 0; special_keys[i].key_sym != 0; i++)
if (name[0] == special_keys[i].vim_code0 &&
name[1] == special_keys[i].vim_code1)
return( OK );
return( FAIL );
return OK;
return FAIL;
}
/****************************************************************************/
@ -2512,7 +2512,7 @@ gui_ph_toolbar_load_icon( char_u *iconfile )
temp_phi = &external_icon;
}
return( temp_phi );
return temp_phi;
}
/*
@ -2541,16 +2541,16 @@ gui_ph_toolbar_find_icon( vimmenu_T *menu )
icon = gui_ph_toolbar_load_icon( full_pathname );
if( icon != NULL )
return( icon );
return icon;
}
if( menu->iconidx >= 0 &&
( menu->iconidx < ARRAY_LENGTH( gui_ph_toolbar_images ) ) )
{
return( gui_ph_toolbar_images[ menu->iconidx ] );
return gui_ph_toolbar_images[menu->iconidx];
}
return( NULL );
return NULL;
}
#endif
@ -2895,11 +2895,11 @@ gui_ph_get_font(
* at least has the bits we're checking for */
if( font_size == info.size &&
style == (info.style & style) )
return( (GuiFont) font_tag );
return (GuiFont)font_tag;
}
vim_free( font_tag );
}
return( NULL );
return NULL;
}
/*
@ -2957,9 +2957,9 @@ gui_ph_parse_font_name(
}
}
}
return( TRUE );
return TRUE;
}
return( FALSE );
return FALSE;
}
int
@ -2985,7 +2985,7 @@ gui_mch_init_font(char_u *vim_font_name, int fontset)
"pcterm12", -1, PHFONT_FIXED, NULL );
if( font_tag == NULL )
return( FAIL );
return FAIL;
gui_mch_free_font( gui.norm_font );
gui.norm_font = font_tag;
@ -2997,13 +2997,13 @@ gui_mch_init_font(char_u *vim_font_name, int fontset)
{
if( gui_ph_parse_font_name( vim_font_name, &font_name, &font_flags,
&font_size ) == FALSE )
return( FAIL );
return FAIL;
font_tag = gui_ph_get_font( font_name, font_flags, font_size, 0 );
if( font_tag == NULL )
{
vim_free( font_name );
return( FAIL );
return FAIL;
}
gui_mch_free_font( gui.norm_font );
@ -3026,7 +3026,7 @@ gui_mch_init_font(char_u *vim_font_name, int fontset)
gui.char_ascent = - extent.ul.y;
vim_free( font_name );
return( OK );
return OK;
}
/*
@ -3042,7 +3042,7 @@ gui_mch_adjust_charheight(void)
gui.char_height = - info.ascender + info.descender + p_linespace;
gui.char_ascent = - info.ascender + p_linespace / 2;
return( OK );
return OK;
}
GuiFont
@ -3060,13 +3060,13 @@ gui_mch_get_font(char_u *vim_font_name, int report_error)
vim_free( font_name );
if( font_tag != NULL )
return( (GuiFont) font_tag );
return (GuiFont)font_tag;
}
if( report_error )
EMSG2(e_font, vim_font_name );
return( FAIL );
return FAIL;
}
#if defined(FEAT_EVAL) || defined(PROTO)

2
src/version.c
View File

@ -709,6 +709,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
262,
/**/
261,
/**/