To: vim_dev@googlegroups.com

Subject: Patch 7.3.310

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.310

Problem:    Code not following Vim style.

Solution:   Fix the style. (Elias Diem)

Files:	    src/gui_photon.c

*** ../vim-7.3.309/src/gui_photon.c	2011-09-07 19:08:57.000000000 +0200

--- src/gui_photon.c	2011-09-14 16:01:55.000000000 +0200

***************

*** 477,483 ****

  	}

  #endif

! 	for(i = 0; special_keys[i].key_sym != 0; i++)

  	{

  	    if (special_keys[i].key_sym == key->key_cap)

  	    {

--- 477,483 ----

  	}

  #endif

! 	for (i = 0; special_keys[i].key_sym != 0; i++)

  	{

  	    if (special_keys[i].key_sym == key->key_cap)

  	    {

***************

*** 758,764 ****

      if (damage->next != NULL)

  	damage = damage->next;

!     while(damage != NULL)

      {

  	r = &damage->rect;

  	gui_redraw(

--- 758,764 ----

      if (damage->next != NULL)

  	damage = damage->next;

!     while (damage != NULL)

      {

  	r = &damage->rect;

  	gui_redraw(

***************

*** 798,809 ****

  /* This is used for pulldown/popup menus and also toolbar buttons */

      static int

! gui_ph_handle_menu( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )

  {

!     if( data != NULL )

      {

  	vimmenu_T *menu = (vimmenu_T *) data;

! 	gui_menu_cb( menu );

      }

      return Pt_CONTINUE;

  }

--- 798,809 ----

  /* This is used for pulldown/popup menus and also toolbar buttons */

      static int

! gui_ph_handle_menu(PtWidget_t *widget, void *data, PtCallbackInfo_t *info)

  {

!     if (data != NULL)

      {

  	vimmenu_T *menu = (vimmenu_T *) data;

! 	gui_menu_cb(menu);

      }

      return Pt_CONTINUE;

  }

***************

*** 813,821 ****

  gui_ph_handle_menu_unrealized(

  	PtWidget_t *widget,

  	void *data,

! 	PtCallbackInfo_t *info )

  {

!     PtGiveFocus( gui.vimTextArea, NULL );

      return Pt_CONTINUE;

  }

--- 813,821 ----

  gui_ph_handle_menu_unrealized(

  	PtWidget_t *widget,

  	void *data,

! 	PtCallbackInfo_t *info)

  {

!     PtGiveFocus(gui.vimTextArea, NULL);

      return Pt_CONTINUE;

  }

***************

*** 823,831 ****

  gui_ph_handle_window_open(

  	PtWidget_t *widget,

  	void *data,

! 	PtCallbackInfo_t *info )

  {

!     gui_set_shellsize( FALSE, TRUE, RESIZE_BOTH );

      return Pt_CONTINUE;

  }

--- 823,831 ----

  gui_ph_handle_window_open(

  	PtWidget_t *widget,

  	void *data,

! 	PtCallbackInfo_t *info)

  {

!     gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);

      return Pt_CONTINUE;

  }

***************

*** 836,909 ****

  /* TODO: Set a clipping rect? */

      static void

! gui_ph_draw_start( void )

  {

      PhGC_t *gc;

      gc = PgGetGC();

!     PgSetRegion( PtWidgetRid( PtFindDisjoint( gui.vimTextArea ) ) );

!     PgClearClippingsCx( gc );

!     PgClearTranslationCx( gc );

!     PtWidgetOffset( gui.vimTextArea, &gui_ph_raw_offset );

!     PhTranslatePoint( &gui_ph_raw_offset, PtWidgetPos( gui.vimTextArea, NULL ) );

!     PgSetTranslation( &gui_ph_raw_offset, Pg_RELATIVE );

  }

      static void

! gui_ph_draw_end( void )

  {

      gui_ph_raw_offset.x = -gui_ph_raw_offset.x;

      gui_ph_raw_offset.y = -gui_ph_raw_offset.y;

!     PgSetTranslation( &gui_ph_raw_offset, Pg_RELATIVE );

  }

  #ifdef USE_PANEL_GROUP

      static vimmenu_T *

! gui_ph_find_buffer_item( char_u *name )

  {

      vimmenu_T *top_level = root_menu;

      vimmenu_T *items = NULL;

!     while( top_level != NULL &&

! 	    ( STRCMP( top_level->dname, "Buffers" ) != 0 ) )

  	top_level = top_level->next;

!     if( top_level != NULL )

      {

  	items = top_level->children;

! 	while( items != NULL &&

! 		( STRCMP( items->dname, name ) != 0 ) )

  	    items = items->next;

      }

      return items;

  }

      static void

! gui_ph_pg_set_buffer_num( int_u buf_num )

  {

      int i;

      char search[16];

      char *mark;

!     if( gui.vimTextArea == NULL || buf_num == 0 )

  	return;

      search[0] = '(';

!     ultoa( buf_num, &search[1], 10 );

!     STRCAT( search, ")" );

!     for( i = 0; i < num_panels; i++ )

      {

  	/* find the last "(" in the panel title and see if the buffer

  	 * number in the title matches the one we're looking for */

! 	mark = STRRCHR( panel_titles[ i ], '(' );

! 	if( mark != NULL && STRCMP( mark, search ) == 0 )

  	{

! 	    PtSetResource( gui.vimPanelGroup, Pt_ARG_PG_CURRENT_INDEX,

! 		    i, 0 );

  	}

      }

  }

--- 836,909 ----

  /* TODO: Set a clipping rect? */

      static void

! gui_ph_draw_start(void)

  {

      PhGC_t *gc;

      gc = PgGetGC();

!     PgSetRegion(PtWidgetRid(PtFindDisjoint(gui.vimTextArea)));

!     PgClearClippingsCx(gc);

!     PgClearTranslationCx(gc);

!     PtWidgetOffset(gui.vimTextArea, &gui_ph_raw_offset);

!     PhTranslatePoint(&gui_ph_raw_offset, PtWidgetPos(gui.vimTextArea, NULL));

!     PgSetTranslation(&gui_ph_raw_offset, Pg_RELATIVE);

  }

      static void

! gui_ph_draw_end(void)

  {

      gui_ph_raw_offset.x = -gui_ph_raw_offset.x;

      gui_ph_raw_offset.y = -gui_ph_raw_offset.y;

!     PgSetTranslation(&gui_ph_raw_offset, Pg_RELATIVE);

  }

  #ifdef USE_PANEL_GROUP

      static vimmenu_T *

! gui_ph_find_buffer_item(char_u *name)

  {

      vimmenu_T *top_level = root_menu;

      vimmenu_T *items = NULL;

!     while (top_level != NULL &&

! 	    (STRCMP(top_level->dname, "Buffers") != 0))

  	top_level = top_level->next;

!     if (top_level != NULL)

      {

  	items = top_level->children;

! 	while (items != NULL &&

! 		(STRCMP(items->dname, name) != 0))

  	    items = items->next;

      }

      return items;

  }

      static void

! gui_ph_pg_set_buffer_num(int_u buf_num)

  {

      int i;

      char search[16];

      char *mark;

!     if (gui.vimTextArea == NULL || buf_num == 0)

  	return;

      search[0] = '(';

!     ultoa(buf_num, &search[1], 10);

!     STRCAT(search, ")");

!     for (i = 0; i < num_panels; i++)

      {

  	/* find the last "(" in the panel title and see if the buffer

  	 * number in the title matches the one we're looking for */

! 	mark = STRRCHR(panel_titles[ i ], '(');

! 	if (mark != NULL && STRCMP(mark, search) == 0)

  	{

! 	    PtSetResource(gui.vimPanelGroup, Pt_ARG_PG_CURRENT_INDEX,

! 		    i, 0);

  	}

      }

  }

***************

*** 912,930 ****

  gui_ph_handle_pg_change(

  	PtWidget_t *widget,

  	void *data,

! 	PtCallbackInfo_t *info )

  {

      vimmenu_T *menu;

      PtPanelGroupCallback_t *panel;

!     if( info->event != NULL )

      {

  	panel = info->cbdata;

! 	if( panel->new_panel != NULL )

  	{

! 	    menu = gui_ph_find_buffer_item( panel->new_panel );

! 	    if( menu )

! 		gui_menu_cb( menu );

  	}

      }

      return Pt_CONTINUE;

--- 912,930 ----

  gui_ph_handle_pg_change(

  	PtWidget_t *widget,

  	void *data,

! 	PtCallbackInfo_t *info)

  {

      vimmenu_T *menu;

      PtPanelGroupCallback_t *panel;

!     if (info->event != NULL)

      {

  	panel = info->cbdata;

! 	if (panel->new_panel != NULL)

  	{

! 	    menu = gui_ph_find_buffer_item(panel->new_panel);

! 	    if (menu)

! 		gui_menu_cb(menu);

  	}

      }

      return Pt_CONTINUE;

***************

*** 935,951 ****

  	short *top,

  	short *bottom,

  	short *left,

! 	short *right )

  {

      unsigned short abs_raw_x, abs_raw_y, abs_panel_x, abs_panel_y;

      const unsigned short *margin_top, *margin_bottom;

      const unsigned short *margin_left, *margin_right;

!     PtGetAbsPosition( gui.vimTextArea, &abs_raw_x, &abs_raw_y );

!     PtGetAbsPosition( gui.vimPanelGroup, &abs_panel_x, &abs_panel_y );

!     PtGetResource( gui.vimPanelGroup, Pt_ARG_MARGIN_RIGHT, &margin_right, 0 );

!     PtGetResource( gui.vimPanelGroup, Pt_ARG_MARGIN_BOTTOM, &margin_bottom, 0 );

      abs_raw_x -= abs_panel_x;

      abs_raw_y -= abs_panel_y;

--- 935,951 ----

  	short *top,

  	short *bottom,

  	short *left,

! 	short *right)

  {

      unsigned short abs_raw_x, abs_raw_y, abs_panel_x, abs_panel_y;

      const unsigned short *margin_top, *margin_bottom;

      const unsigned short *margin_left, *margin_right;

!     PtGetAbsPosition(gui.vimTextArea, &abs_raw_x, &abs_raw_y);

!     PtGetAbsPosition(gui.vimPanelGroup, &abs_panel_x, &abs_panel_y);

!     PtGetResource(gui.vimPanelGroup, Pt_ARG_MARGIN_RIGHT, &margin_right, 0);

!     PtGetResource(gui.vimPanelGroup, Pt_ARG_MARGIN_BOTTOM, &margin_bottom, 0);

      abs_raw_x -= abs_panel_x;

      abs_raw_y -= abs_panel_y;

***************

*** 959,979 ****

  /* Used for the tabs for PtPanelGroup */

      static int

! gui_ph_is_buffer_item( vimmenu_T *menu, vimmenu_T *parent )

  {

      char *mark;

!     if( STRCMP( parent->dname, "Buffers" ) == 0 )

      {

  	/* Look for '(' digits ')' */

! 	mark = vim_strchr( menu->dname, '(' );

! 	if( mark != NULL )

  	{

  	    mark++;

! 	    while( isdigit( *mark ) )

  		mark++;

! 	    if( *mark == ')' )

  		return TRUE;

  	}

      }

--- 959,979 ----

  /* Used for the tabs for PtPanelGroup */

      static int

! gui_ph_is_buffer_item(vimmenu_T *menu, vimmenu_T *parent)

  {

      char *mark;

!     if (STRCMP(parent->dname, "Buffers") == 0)

      {

  	/* Look for '(' digits ')' */

! 	mark = vim_strchr(menu->dname, '(');

! 	if (mark != NULL)

  	{

  	    mark++;

! 	    while (isdigit(*mark))

  		mark++;

! 	    if (*mark == ')')

  		return TRUE;

  	}

      }

***************

*** 981,1043 ****

  }

      static void

! gui_ph_pg_add_buffer(char *name )

  {

      char **new_titles = NULL;

!     new_titles = (char **) alloc( ( num_panels + 1 ) * sizeof( char ** ) );

!     if( new_titles != NULL )

      {

! 	if( num_panels > 0 )

! 	    memcpy( new_titles, panel_titles, num_panels * sizeof( char ** ) );

  	new_titles[ num_panels++ ] = name;

! 	PtSetResource( gui.vimPanelGroup, Pt_ARG_PG_PANEL_TITLES, new_titles,

! 		num_panels );

! 	vim_free( panel_titles );

  	panel_titles = new_titles;

      }

  }

      static void

! gui_ph_pg_remove_buffer( char *name )

  {

      int i;

      char **new_titles = NULL;

      /* If there is only 1 panel, we just use the temporary place holder */

!     if( num_panels > 1 )

      {

! 	new_titles = (char **) alloc( ( num_panels - 1 ) * sizeof( char ** ) );

! 	if( new_titles != NULL )

  	{

  	    char **s = new_titles;

  	    /* Copy all the titles except the one we're removing */

! 	    for( i = 0; i < num_panels; i++ )

  	    {

! 		if( STRCMP( panel_titles[ i ], name ) != 0 )

  		{

  		    *s++ = panel_titles[ i ];

  		}

  	    }

  	    num_panels--;

! 	    PtSetResource( gui.vimPanelGroup, Pt_ARG_PG_PANEL_TITLES, new_titles,

! 		    num_panels );

! 	    vim_free( panel_titles );

  	    panel_titles = new_titles;

  	}

      }

      else

      {

  	num_panels--;

! 	PtSetResource( gui.vimPanelGroup, Pt_ARG_PG_PANEL_TITLES, &empty_title,

! 		1 );

! 	vim_free( panel_titles );

  	panel_titles = NULL;

      }

  }

--- 981,1043 ----

  }

      static void

! gui_ph_pg_add_buffer(char *name)

  {

      char **new_titles = NULL;

!     new_titles = (char **) alloc((num_panels + 1) * sizeof(char **));

!     if (new_titles != NULL)

      {

! 	if (num_panels > 0)

! 	    memcpy(new_titles, panel_titles, num_panels * sizeof(char **));

  	new_titles[ num_panels++ ] = name;

! 	PtSetResource(gui.vimPanelGroup, Pt_ARG_PG_PANEL_TITLES, new_titles,

! 		num_panels);

! 	vim_free(panel_titles);

  	panel_titles = new_titles;

      }

  }

      static void

! gui_ph_pg_remove_buffer(char *name)

  {

      int i;

      char **new_titles = NULL;

      /* If there is only 1 panel, we just use the temporary place holder */

!     if (num_panels > 1)

      {

! 	new_titles = (char **) alloc((num_panels - 1) * sizeof(char **));

! 	if (new_titles != NULL)

  	{

  	    char **s = new_titles;

  	    /* Copy all the titles except the one we're removing */

! 	    for (i = 0; i < num_panels; i++)

  	    {

! 		if (STRCMP(panel_titles[ i ], name) != 0)

  		{

  		    *s++ = panel_titles[ i ];

  		}

  	    }

  	    num_panels--;

! 	    PtSetResource(gui.vimPanelGroup, Pt_ARG_PG_PANEL_TITLES, new_titles,

! 		    num_panels);

! 	    vim_free(panel_titles);

  	    panel_titles = new_titles;

  	}

      }

      else

      {

  	num_panels--;

! 	PtSetResource(gui.vimPanelGroup, Pt_ARG_PG_PANEL_TITLES, &empty_title,

! 		1);

! 	vim_free(panel_titles);

  	panel_titles = NULL;

      }

  }

***************

*** 1047,1060 ****

  gui_ph_handle_buffer_remove(

  	PtWidget_t *widget,

  	void *data,

! 	PtCallbackInfo_t *info )

  {

      vimmenu_T *menu;

!     if( data != NULL )

      {

  	menu = (vimmenu_T *) data;

! 	gui_ph_pg_remove_buffer( menu->dname );

      }

      return Pt_CONTINUE;

--- 1047,1060 ----

  gui_ph_handle_buffer_remove(

  	PtWidget_t *widget,

  	void *data,

! 	PtCallbackInfo_t *info)

  {

      vimmenu_T *menu;

!     if (data != NULL)

      {

  	menu = (vimmenu_T *) data;

! 	gui_ph_pg_remove_buffer(menu->dname);

      }

      return Pt_CONTINUE;

***************

*** 1062,1074 ****

  #endif

      static int

! gui_ph_pane_resize( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )

  {

!     if( PtWidgetIsRealized( widget ) )

      {

  	is_ignore_draw = TRUE;

! 	PtStartFlux( gui.vimContainer );

! 	PtContainerHold( gui.vimContainer );

      }

      return Pt_CONTINUE;

--- 1062,1074 ----

  #endif

      static int

! gui_ph_pane_resize(PtWidget_t *widget, void *data, PtCallbackInfo_t *info)

  {

!     if (PtWidgetIsRealized(widget))

      {

  	is_ignore_draw = TRUE;

! 	PtStartFlux(gui.vimContainer);

! 	PtContainerHold(gui.vimContainer);

      }

      return Pt_CONTINUE;

***************

*** 1078,1084 ****

  #ifdef FEAT_MBYTE

      void

! gui_ph_encoding_changed( int new_encoding )

  {

      /* Default encoding is latin1 */

      char *charset = "latin1";

--- 1078,1084 ----

  #ifdef FEAT_MBYTE

      void

! gui_ph_encoding_changed(int new_encoding)

  {

      /* Default encoding is latin1 */

      char *charset = "latin1";

***************

*** 1094,1106 ****

  	{ DBCS_CHS, "gb" }

      };

!     for( i = 0; i < ARRAY_LENGTH( charsets ); i++ )

      {

! 	if( new_encoding == charsets[ i ].encoding )

  	    charset = charsets[ i ].name;

      }

!     charset_translate = PxTranslateSet( charset_translate, charset );

  }

  #endif

--- 1094,1106 ----

  	{ DBCS_CHS, "gb" }

      };

!     for (i = 0; i < ARRAY_LENGTH(charsets); i++)

      {

! 	if (new_encoding == charsets[ i ].encoding)

  	    charset = charsets[ i ].name;

      }

!     charset_translate = PxTranslateSet(charset_translate, charset);

  }

  #endif

***************

*** 1112,1118 ****

      int	    *argc;

      char    **argv;

  {

!     PtInit( NULL );

  }

      int

--- 1112,1118 ----

      int	    *argc;

      char    **argv;

  {

!     PtInit(NULL);

  }

      int

***************

*** 1124,1213 ****

      PhDim_t	window_size = {100, 100}; /* Arbitrary values */

      PhPoint_t	pos = {0, 0};

!     gui.event_buffer = (PhEvent_t *) alloc( EVENT_BUFFER_SIZE );

!     if( gui.event_buffer == NULL )

  	return FAIL;

      /* Get a translation so we can convert from ISO Latin-1 to UTF */

!     charset_translate = PxTranslateSet( NULL, "latin1" );

      /* The +2 is for the 1 pixel dark line on each side */

      gui.border_offset = gui.border_width = GUI_PH_MARGIN + 2;

      /* Handle close events ourselves */

!     PtSetArg( &args[ n++ ], Pt_ARG_WINDOW_MANAGED_FLAGS, Pt_FALSE, Ph_WM_CLOSE );

!     PtSetArg( &args[ n++ ], Pt_ARG_WINDOW_NOTIFY_FLAGS, Pt_TRUE,

! 	    Ph_WM_CLOSE | Ph_WM_RESIZE | Ph_WM_FOCUS );

!     PtSetArg( &args[ n++ ], Pt_ARG_DIM, &window_size, 0 );

!     gui.vimWindow = PtCreateWidget( PtWindow, NULL, n, args );

!     if( gui.vimWindow == NULL )

  	return FAIL;

!     PtAddCallback( gui.vimWindow, Pt_CB_WINDOW, gui_ph_handle_window_cb, NULL );

!     PtAddCallback( gui.vimWindow, Pt_CB_WINDOW_OPENING,

! 	    gui_ph_handle_window_open, NULL );

      n = 0;

!     PtSetArg( &args[ n++ ], Pt_ARG_ANCHOR_FLAGS, Pt_ANCHOR_ALL, Pt_IS_ANCHORED );

!     PtSetArg( &args[ n++ ], Pt_ARG_DIM, &window_size, 0 );

!     PtSetArg( &args[ n++ ], Pt_ARG_POS, &pos, 0 );

  #ifdef USE_PANEL_GROUP

      /* Put in a temprary place holder title */

!     PtSetArg( &args[ n++ ], Pt_ARG_PG_PANEL_TITLES, &empty_title, 1 );

!     gui.vimPanelGroup = PtCreateWidget( PtPanelGroup, gui.vimWindow, n, args );

!     if( gui.vimPanelGroup == NULL )

  	return FAIL;

!     PtAddCallback( gui.vimPanelGroup, Pt_CB_PG_PANEL_SWITCHING,

! 	    gui_ph_handle_pg_change, NULL );

  #else

      /* Turn off all edge decorations */

!     PtSetArg( &args[ n++ ], Pt_ARG_BASIC_FLAGS, Pt_FALSE, Pt_ALL );

!     PtSetArg( &args[ n++ ], Pt_ARG_BEVEL_WIDTH, 0, 0 );

!     PtSetArg( &args[ n++ ], Pt_ARG_MARGIN_WIDTH, 0, 0 );

!     PtSetArg( &args[ n++ ], Pt_ARG_MARGIN_HEIGHT, 0, 0 );

!     PtSetArg( &args[ n++ ], Pt_ARG_CONTAINER_FLAGS, Pt_TRUE, Pt_AUTO_EXTENT );

!     gui.vimContainer = PtCreateWidget( PtPane, gui.vimWindow, n, args );

!     if( gui.vimContainer == NULL )

  	return FAIL;

!     PtAddCallback( gui.vimContainer, Pt_CB_RESIZE, gui_ph_pane_resize, NULL );

  #endif

      /* Size for the text area is set in gui_mch_set_text_area_pos */

      n = 0;

!     PtSetArg( &args[ n++ ], Pt_ARG_RAW_DRAW_F, gui_ph_handle_raw_draw, 1 );

!     PtSetArg( &args[ n++ ], Pt_ARG_BEVEL_WIDTH, GUI_PH_MARGIN, 0 );

      /*

       * Using focus render also causes the whole widget to be redrawn

       * whenever it changes focus, which is very annoying :p

       */

!     PtSetArg( &args[ n++ ], Pt_ARG_FLAGS, Pt_TRUE,

! 	    Pt_GETS_FOCUS | Pt_HIGHLIGHTED );

  #ifndef FEAT_MOUSESHAPE

!     PtSetArg( &args[ n++ ], Pt_ARG_CURSOR_TYPE, GUI_PH_MOUSE_TYPE, 0 );

!     PtSetArg( &args[ n++ ], Pt_ARG_CURSOR_COLOR, gui_ph_mouse_color, 0 );

  #endif

!     gui.vimTextArea = PtCreateWidget( PtRaw, Pt_DFLT_PARENT, n, args );

!     if( gui.vimTextArea == NULL)

  	return FAIL;

      /* TODO: use PtAddEventHandlers instead? */

      /* Not using Ph_EV_BUT_REPEAT because vim wouldn't use it anyway */

!     PtAddEventHandler( gui.vimTextArea,

  	    Ph_EV_BUT_PRESS | Ph_EV_BUT_RELEASE | Ph_EV_PTR_MOTION_BUTTON,

! 	    gui_ph_handle_mouse, NULL );

!     PtAddEventHandler( gui.vimTextArea, Ph_EV_KEY,

! 	    gui_ph_handle_keyboard, NULL );

!     PtAddCallback( gui.vimTextArea, Pt_CB_GOT_FOCUS,

! 	    gui_ph_handle_focus, NULL );

!     PtAddCallback( gui.vimTextArea, Pt_CB_LOST_FOCUS,

! 	    gui_ph_handle_focus, NULL );

      /*

       * Now that the text area widget has been created, set up the colours,

--- 1124,1213 ----

      PhDim_t	window_size = {100, 100}; /* Arbitrary values */

      PhPoint_t	pos = {0, 0};

!     gui.event_buffer = (PhEvent_t *) alloc(EVENT_BUFFER_SIZE);

!     if (gui.event_buffer == NULL)

  	return FAIL;

      /* Get a translation so we can convert from ISO Latin-1 to UTF */

!     charset_translate = PxTranslateSet(NULL, "latin1");

      /* The +2 is for the 1 pixel dark line on each side */

      gui.border_offset = gui.border_width = GUI_PH_MARGIN + 2;

      /* Handle close events ourselves */

!     PtSetArg(&args[ n++ ], Pt_ARG_WINDOW_MANAGED_FLAGS, Pt_FALSE, Ph_WM_CLOSE);

!     PtSetArg(&args[ n++ ], Pt_ARG_WINDOW_NOTIFY_FLAGS, Pt_TRUE,

! 	    Ph_WM_CLOSE | Ph_WM_RESIZE | Ph_WM_FOCUS);

!     PtSetArg(&args[ n++ ], Pt_ARG_DIM, &window_size, 0);

!     gui.vimWindow = PtCreateWidget(PtWindow, NULL, n, args);

!     if (gui.vimWindow == NULL)

  	return FAIL;

!     PtAddCallback(gui.vimWindow, Pt_CB_WINDOW, gui_ph_handle_window_cb, NULL);

!     PtAddCallback(gui.vimWindow, Pt_CB_WINDOW_OPENING,

! 	    gui_ph_handle_window_open, NULL);

      n = 0;

!     PtSetArg(&args[ n++ ], Pt_ARG_ANCHOR_FLAGS, Pt_ANCHOR_ALL, Pt_IS_ANCHORED);

!     PtSetArg(&args[ n++ ], Pt_ARG_DIM, &window_size, 0);

!     PtSetArg(&args[ n++ ], Pt_ARG_POS, &pos, 0);

  #ifdef USE_PANEL_GROUP

      /* Put in a temprary place holder title */

!     PtSetArg(&args[ n++ ], Pt_ARG_PG_PANEL_TITLES, &empty_title, 1);

!     gui.vimPanelGroup = PtCreateWidget(PtPanelGroup, gui.vimWindow, n, args);

!     if (gui.vimPanelGroup == NULL)

  	return FAIL;

!     PtAddCallback(gui.vimPanelGroup, Pt_CB_PG_PANEL_SWITCHING,

! 	    gui_ph_handle_pg_change, NULL);

  #else

      /* Turn off all edge decorations */

!     PtSetArg(&args[ n++ ], Pt_ARG_BASIC_FLAGS, Pt_FALSE, Pt_ALL);

!     PtSetArg(&args[ n++ ], Pt_ARG_BEVEL_WIDTH, 0, 0);

!     PtSetArg(&args[ n++ ], Pt_ARG_MARGIN_WIDTH, 0, 0);

!     PtSetArg(&args[ n++ ], Pt_ARG_MARGIN_HEIGHT, 0, 0);

!     PtSetArg(&args[ n++ ], Pt_ARG_CONTAINER_FLAGS, Pt_TRUE, Pt_AUTO_EXTENT);

!     gui.vimContainer = PtCreateWidget(PtPane, gui.vimWindow, n, args);

!     if (gui.vimContainer == NULL)

  	return FAIL;

!     PtAddCallback(gui.vimContainer, Pt_CB_RESIZE, gui_ph_pane_resize, NULL);

  #endif

      /* Size for the text area is set in gui_mch_set_text_area_pos */

      n = 0;

!     PtSetArg(&args[ n++ ], Pt_ARG_RAW_DRAW_F, gui_ph_handle_raw_draw, 1);

!     PtSetArg(&args[ n++ ], Pt_ARG_BEVEL_WIDTH, GUI_PH_MARGIN, 0);

      /*

       * Using focus render also causes the whole widget to be redrawn

       * whenever it changes focus, which is very annoying :p

       */

!     PtSetArg(&args[ n++ ], Pt_ARG_FLAGS, Pt_TRUE,

! 	    Pt_GETS_FOCUS | Pt_HIGHLIGHTED);

  #ifndef FEAT_MOUSESHAPE

!     PtSetArg(&args[ n++ ], Pt_ARG_CURSOR_TYPE, GUI_PH_MOUSE_TYPE, 0);

!     PtSetArg(&args[ n++ ], Pt_ARG_CURSOR_COLOR, gui_ph_mouse_color, 0);

  #endif

!     gui.vimTextArea = PtCreateWidget(PtRaw, Pt_DFLT_PARENT, n, args);

!     if (gui.vimTextArea == NULL)

  	return FAIL;

      /* TODO: use PtAddEventHandlers instead? */

      /* Not using Ph_EV_BUT_REPEAT because vim wouldn't use it anyway */

!     PtAddEventHandler(gui.vimTextArea,

  	    Ph_EV_BUT_PRESS | Ph_EV_BUT_RELEASE | Ph_EV_PTR_MOTION_BUTTON,

! 	    gui_ph_handle_mouse, NULL);

!     PtAddEventHandler(gui.vimTextArea, Ph_EV_KEY,

! 	    gui_ph_handle_keyboard, NULL);

!     PtAddCallback(gui.vimTextArea, Pt_CB_GOT_FOCUS,

! 	    gui_ph_handle_focus, NULL);

!     PtAddCallback(gui.vimTextArea, Pt_CB_LOST_FOCUS,

! 	    gui_ph_handle_focus, NULL);

      /*

       * Now that the text area widget has been created, set up the colours,

***************

*** 1218,1278 ****

       * Create the two timers, not as accurate as using the kernel timer

       * functions, but good enough

       */

!     gui_ph_timer_cursor  = PtCreateWidget( PtTimer, gui.vimWindow, 0, NULL );

!     if( gui_ph_timer_cursor == NULL )

  	return FAIL;

!     gui_ph_timer_timeout = PtCreateWidget( PtTimer, gui.vimWindow, 0, NULL );

!     if( gui_ph_timer_timeout == NULL )

  	return FAIL;

!     PtAddCallback( gui_ph_timer_cursor,  Pt_CB_TIMER_ACTIVATE,

  	    gui_ph_handle_timer_cursor, NULL);

!     PtAddCallback( gui_ph_timer_timeout, Pt_CB_TIMER_ACTIVATE,

  	    gui_ph_handle_timer_timeout, NULL);

  #ifdef FEAT_MENU

      n = 0;

!     PtSetArg( &args[ n++ ], Pt_ARG_WIDTH, window_size.w, 0 );

!     PtSetArg( &args[ n++ ], Pt_ARG_ANCHOR_FLAGS, Pt_ANCHOR_LEFT_RIGHT,

! 	    Pt_IS_ANCHORED );

!     gui.vimToolBarGroup = PtCreateWidget( PtToolbarGroup, gui.vimWindow,

! 	    n, args );

!     if( gui.vimToolBarGroup == NULL )

  	return FAIL;

!     PtAddCallback( gui.vimToolBarGroup, Pt_CB_RESIZE,

! 	    gui_ph_handle_menu_resize, NULL );

      n = 0;

      flags = 0;

!     PtSetArg( &args[ n++ ], Pt_ARG_WIDTH, window_size.w, 0 );

!     if( ! vim_strchr( p_go, GO_MENUS ) )

      {

  	flags |= Pt_DELAY_REALIZE;

! 	PtSetArg( &args[ n++ ], Pt_ARG_FLAGS, Pt_TRUE, flags );

      }

!     gui.vimMenuBar = PtCreateWidget( PtMenuBar, gui.vimToolBarGroup, n, args );

!     if( gui.vimMenuBar == NULL )

  	return FAIL;

  # ifdef FEAT_TOOLBAR

      n = 0;

!     PtSetArg( &args[ n++ ], Pt_ARG_ANCHOR_FLAGS,

! 	    Pt_ANCHOR_LEFT_RIGHT |Pt_TOP_ANCHORED_TOP, Pt_IS_ANCHORED );

!     PtSetArg( &args[ n++ ], Pt_ARG_RESIZE_FLAGS, Pt_TRUE,

! 	    Pt_RESIZE_Y_AS_REQUIRED );