Slackware 14.0slackware-14.0

Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!

We're perfectionists here at Slackware, so this release has been a long
time a-brewing.  But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Thanks to everyone who helped make this happen.  The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.

Have fun!  :-)

1 files changed, 3524 insertions, 0 deletions

diff --git a/source/ap/vim/patches/7.3.310 b/source/ap/vim/patches/7.3.310
new file mode 100644
index 000000000..e3ffa5a4c
--- /dev/null
+++ b/source/ap/vim/patches/7.3.310
@@ -0,0 +1,3524 @@
+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 );
+!     PtSetArg( &args[ n++ ], Pt_ARG_WIDTH, window_size.w, 0 );
+  
+      flags = Pt_GETS_FOCUS;
+!     if( ! vim_strchr( p_go, GO_TOOLBAR ) )
+  	flags |= Pt_DELAY_REALIZE;
+  
+!     PtSetArg( &args[ n++ ], Pt_ARG_FLAGS, Pt_DELAY_REALIZE, flags );
+  
+!     gui.vimToolBar = PtCreateWidget( PtToolbar, gui.vimToolBarGroup, n, args );
+!     if( gui.vimToolBar == NULL )
+  	return FAIL;
+  
+      /*
+--- 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);
+!     PtSetArg(&args[ n++ ], Pt_ARG_WIDTH, window_size.w, 0);
+  
+      flags = Pt_GETS_FOCUS;
+!     if (! vim_strchr(p_go, GO_TOOLBAR))
+  	flags |= Pt_DELAY_REALIZE;
+  
+!     PtSetArg(&args[ n++ ], Pt_ARG_FLAGS, Pt_DELAY_REALIZE, flags);
+  
+!     gui.vimToolBar = PtCreateWidget(PtToolbar, gui.vimToolBarGroup, n, args);
+!     if (gui.vimToolBar == NULL)
+  	return FAIL;
+  
+      /*
+***************
+*** 1310,1329 ****
+      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;
+  }
+  
+      void
+  gui_mch_exit(int rc)
+  {
+!     PtDestroyWidget( gui.vimWindow );
+  
+!     PxTranslateSet( charset_translate, NULL );
+  
+!     vim_free( gui.event_buffer );
+  
+  #ifdef USE_PANEL_GROUPS
+!     vim_free( panel_titles );
+  #endif
+  }
+  
+--- 1310,1329 ----
+      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;
+  }
+  
+      void
+  gui_mch_exit(int rc)
+  {
+!     PtDestroyWidget(gui.vimWindow);
+  
+!     PxTranslateSet(charset_translate, NULL);
+  
+!     vim_free(gui.event_buffer);
+  
+  #ifdef USE_PANEL_GROUPS
+!     vim_free(panel_titles);
+  #endif
+  }
+  
+***************
+*** 1333,1339 ****
+  /* When no events are available, photon will call this function, working is
+   * set to FALSE, and the gui_mch_update loop will exit. */
+      static int
+! exit_gui_mch_update( void *data )
+  {
+      *(int *)data = FALSE;
+      return Pt_END;
+--- 1333,1339 ----
+  /* When no events are available, photon will call this function, working is
+   * set to FALSE, and the gui_mch_update loop will exit. */
+      static int
+! exit_gui_mch_update(void *data)
+  {
+      *(int *)data = FALSE;
+      return Pt_END;
+***************
+*** 1344,1351 ****
+  {
+      int working = TRUE;
+  
+!     PtAppAddWorkProc( NULL, exit_gui_mch_update, &working );
+!     while( ( working == TRUE ) && !vim_is_input_buf_full())
+      {
+  	PtProcessEvent();
+      }
+--- 1344,1351 ----
+  {
+      int working = TRUE;
+  
+!     PtAppAddWorkProc(NULL, exit_gui_mch_update, &working);
+!     while ((working == TRUE) && !vim_is_input_buf_full())
+      {
+  	PtProcessEvent();
+      }
+***************
+*** 1356,1378 ****
+  {
+      is_timeout = FALSE;
+  
+!     if( wtime > 0 )
+! 	PtSetResource( gui_ph_timer_timeout, Pt_ARG_TIMER_INITIAL, wtime, 0 );
+  
+!     while( 1 )
+      {
+  	PtProcessEvent();
+! 	if( input_available() )
+  	{
+! 	    PtSetResource( gui_ph_timer_timeout, Pt_ARG_TIMER_INITIAL, 0, 0 );
+  	    return OK;
+  	}
+! 	else if( is_timeout == TRUE )
+  	    return FAIL;
+      }
+  }
+  
+! #if defined( FEAT_BROWSE ) || defined( PROTO )
+  /*
+   * Put up a file requester.
+   * Returns the selected name in allocated memory, or NULL for Cancel.
+--- 1356,1378 ----
+  {
+      is_timeout = FALSE;
+  
+!     if (wtime > 0)
+! 	PtSetResource(gui_ph_timer_timeout, Pt_ARG_TIMER_INITIAL, wtime, 0);
+  
+!     while (1)
+      {
+  	PtProcessEvent();
+! 	if (input_available())
+  	{
+! 	    PtSetResource(gui_ph_timer_timeout, Pt_ARG_TIMER_INITIAL, 0, 0);
+  	    return OK;
+  	}
+! 	else if (is_timeout == TRUE)
+  	    return FAIL;
+      }
+  }
+  
+! #if defined(FEAT_BROWSE) || defined(PROTO)
+  /*
+   * Put up a file requester.
+   * Returns the selected name in allocated memory, or NULL for Cancel.
+***************
+*** 1398,1409 ****
+      char_u  *open_text = NULL;
+  
+      flags = 0;
+!     memset( &file, 0, sizeof( file ) );
+  
+!     default_path = alloc( MAXPATHL + 1 + NAME_MAX + 1 );
+!     if( default_path != NULL )
+      {
+! 	if( saving == TRUE )
+  	{
+  	    /* Don't need Pt_FSR_CONFIRM_EXISTING, vim will ask anyway */
+  	    flags |= Pt_FSR_NO_FCHECK;
+--- 1398,1409 ----
+      char_u  *open_text = NULL;
+  
+      flags = 0;
+!     memset(&file, 0, sizeof(file));
+  
+!     default_path = alloc(MAXPATHL + 1 + NAME_MAX + 1);
+!     if (default_path != NULL)
+      {
+! 	if (saving == TRUE)
+  	{
+  	    /* Don't need Pt_FSR_CONFIRM_EXISTING, vim will ask anyway */
+  	    flags |= Pt_FSR_NO_FCHECK;
+***************
+*** 1411,1433 ****
+  	}
+  
+  	/* combine the directory and filename into a single path */
+! 	if( initdir == NULL || *initdir == NUL )
+  	{
+! 	    mch_dirname( default_path, MAXPATHL );
+  	    initdir = default_path;
+  	}
+  	else
+  	{
+! 	    STRCPY( default_path, initdir );
+  	    initdir = default_path;
+  	}
+  
+! 	if( default_name != NULL )
+  	{
+! 	    if( default_path[ STRLEN( default_path ) - 1 ] != '/' )
+! 		STRCAT( default_path, "/" );
+  
+! 	    STRCAT( default_path, default_name );
+  	}
+  
+  	/* TODO: add a filter? */
+--- 1411,1433 ----
+  	}
+  
+  	/* combine the directory and filename into a single path */
+! 	if (initdir == NULL || *initdir == NUL)
+  	{
+! 	    mch_dirname(default_path, MAXPATHL);
+  	    initdir = default_path;
+  	}
+  	else
+  	{
+! 	    STRCPY(default_path, initdir);
+  	    initdir = default_path;
+  	}
+  
+! 	if (default_name != NULL)
+  	{
+! 	    if (default_path[ STRLEN(default_path) - 1 ] != '/')
+! 		STRCAT(default_path, "/");
+  
+! 	    STRCAT(default_path, default_name);
+  	}
+  
+  	/* TODO: add a filter? */
+***************
+*** 1441,1495 ****
+  		NULL,
+  		NULL,
+  		&file,
+! 		flags );
+  
+! 	vim_free( default_path );
+  
+! 	if( file.ret == Pt_FSDIALOG_BTN1 )
+  	    return vim_strsave(file.path);
+      }
+      return NULL;
+  }
+  #endif
+  
+! #if defined( FEAT_GUI_DIALOG ) || defined( PROTO )
+  static PtWidget_t *gui_ph_dialog_text = NULL;
+  
+      static int
+! gui_ph_dialog_close( int button, void *data )
+  {
+      PtModalCtrl_t *modal_ctrl = data;
+      char_u *dialog_text, *vim_text;
+  
+!     if( gui_ph_dialog_text != NULL )
+      {
+! 	PtGetResource( gui_ph_dialog_text, Pt_ARG_TEXT_STRING, &dialog_text, 0 );
+! 	PtGetResource( gui_ph_dialog_text, Pt_ARG_POINTER, &vim_text, 0 );
+! 	STRNCPY( vim_text, dialog_text, IOSIZE - 1 );
+      }
+  
+!     PtModalUnblock( modal_ctrl, (void *) button );
+  
+      return Pt_TRUE;
+  }
+  
+      static int
+! 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;
+  }
+  
+      static int
+! gui_ph_dialog_esc( PtWidget_t *widget, void *data, PtCallbackInfo_t *info )
+  {
+      PhKeyEvent_t *key;
+  
+!     key = PhGetData( info->event );
+!     if( ( key->key_flags & Pk_KF_Cap_Valid ) && ( key->key_cap == Pk_Escape ) )
+      {
+! 	gui_ph_dialog_close( 0, data );
+  	return Pt_CONSUME;
+      }
+      return Pt_PROCESS;
+--- 1441,1495 ----
+  		NULL,
+  		NULL,
+  		&file,
+! 		flags);
+  
+! 	vim_free(default_path);
+  
+! 	if (file.ret == Pt_FSDIALOG_BTN1)
+  	    return vim_strsave(file.path);
+      }
+      return NULL;
+  }
+  #endif
+  
+! #if defined(FEAT_GUI_DIALOG) || defined(PROTO)
+  static PtWidget_t *gui_ph_dialog_text = NULL;
+  
+      static int
+! gui_ph_dialog_close(int button, void *data)
+  {
+      PtModalCtrl_t *modal_ctrl = data;
+      char_u *dialog_text, *vim_text;
+  
+!     if (gui_ph_dialog_text != NULL)
+      {
+! 	PtGetResource(gui_ph_dialog_text, Pt_ARG_TEXT_STRING, &dialog_text, 0);
+! 	PtGetResource(gui_ph_dialog_text, Pt_ARG_POINTER, &vim_text, 0);
+! 	STRNCPY(vim_text, dialog_text, IOSIZE - 1);
+      }
+  
+!     PtModalUnblock(modal_ctrl, (void *) button);
+  
+      return Pt_TRUE;
+  }
+  
+      static int
+! 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;
+  }
+  
+      static int
+! gui_ph_dialog_esc(PtWidget_t *widget, void *data, PtCallbackInfo_t *info)
+  {
+      PhKeyEvent_t *key;
+  
+!     key = PhGetData(info->event);
+!     if ((key->key_flags & Pk_KF_Cap_Valid) && (key->key_cap == Pk_Escape))
+      {
+! 	gui_ph_dialog_close(0, data);
+  	return Pt_CONSUME;
+      }
+      return Pt_PROCESS;
+***************
+*** 1518,1557 ****
+  
+      button_count = len = i = 0;
+  
+!     if( buttons == NULL || *buttons == NUL )
+  	return -1;
+  
+      /* There is one less separator than buttons, so bump up the button count */
+      button_count = 1;
+  
+      /* Count string length and number of seperators */
+!     for( str = buttons; *str; str++ )
+      {
+  	len++;
+! 	if( *str == DLG_BUTTON_SEP )
+  	    button_count++;
+      }
+  
+!     if ( title == NULL )
+  	title = "Vim";
+  
+!     buttons_copy = alloc( len + 1 );
+!     button_array = (char_u **) alloc( button_count * sizeof( char_u * ) );
+!     if( buttons_copy != NULL && button_array != NULL )
+      {
+! 	STRCPY( buttons_copy, buttons );
+  
+  	/*
+  	 * Convert DLG_BUTTON_SEP into NUL's and fill in
+  	 * button_array with the pointer to each NUL terminated string
+  	 */
+  	str = buttons_copy;
+! 	for( i = 0; i < button_count; i++ )
+  	{
+  	    button_array[ i ] = str;
+! 	    for( ; *str; str++ )
+  	    {
+! 		if( *str == DLG_BUTTON_SEP )
+  		{
+  		    *str++ = NUL;
+  		    break;
+--- 1518,1557 ----
+  
+      button_count = len = i = 0;
+  
+!     if (buttons == NULL || *buttons == NUL)
+  	return -1;
+  
+      /* There is one less separator than buttons, so bump up the button count */
+      button_count = 1;
+  
+      /* Count string length and number of seperators */
+!     for (str = buttons; *str; str++)
+      {
+  	len++;
+! 	if (*str == DLG_BUTTON_SEP)
+  	    button_count++;
+      }
+  
+!     if (title == NULL)
+  	title = "Vim";
+  
+!     buttons_copy = alloc(len + 1);
+!     button_array = (char_u **) alloc(button_count * sizeof(char_u *));
+!     if (buttons_copy != NULL && button_array != NULL)
+      {
+! 	STRCPY(buttons_copy, buttons);
+  
+  	/*
+  	 * Convert DLG_BUTTON_SEP into NUL's and fill in
+  	 * button_array with the pointer to each NUL terminated string
+  	 */
+  	str = buttons_copy;
+! 	for (i = 0; i < button_count; i++)
+  	{
+  	    button_array[ i ] = str;
+! 	    for (; *str; str++)
+  	    {
+! 		if (*str == DLG_BUTTON_SEP)
+  		{
+  		    *str++ = NUL;
+  		    break;
+***************
+*** 1565,1571 ****
+  		NULL,
+  		message, NULL,
+  		button_count, (const char **) button_array, NULL,
+! 		default_button, 0, Pt_MODAL );
+  #else
+  	/* Writing the dialog ourselves lets us add extra features, like
+  	 * trapping the escape key and returning 0 to vim */
+--- 1565,1571 ----
+  		NULL,
+  		message, NULL,
+  		button_count, (const char **) button_array, NULL,
+! 		default_button, 0, Pt_MODAL);
+  #else
+  	/* Writing the dialog ourselves lets us add extra features, like
+  	 * trapping the escape key and returning 0 to vim */
+***************
+*** 1576,1607 ****
+  	    PtModalCtrl_t modal_ctrl;
+  	    PtDialogInfo_t di;
+  
+! 	    memset( &di, 0, sizeof( di ) );
+! 	    memset( &modal_ctrl, 0, sizeof( modal_ctrl ) );
+  
+  	    n = 0;
+! 	    PtSetArg( &args[n++], Pt_ARG_GROUP_ROWS_COLS, 0, 0 );
+! 	    PtSetArg( &args[n++], Pt_ARG_WIDTH, 350, 0 );
+! 	    PtSetArg( &args[n++], Pt_ARG_GROUP_ORIENTATION,
+! 		    Pt_GROUP_VERTICAL, 0 );
+! 	    PtSetArg( &args[n++], Pt_ARG_GROUP_FLAGS,
+! 		    Pt_TRUE, Pt_GROUP_NO_KEYS | Pt_GROUP_STRETCH_HORIZONTAL );
+! 	    PtSetArg( &args[n++], Pt_ARG_CONTAINER_FLAGS, Pt_FALSE, Pt_TRUE );
+! 	    pane = PtCreateWidget( PtGroup, NULL, n, args );
+  
+  	    n = 0;
+! 	    PtSetArg( &args[n++], Pt_ARG_TEXT_STRING, message, 0 );
+! 	    PtCreateWidget( PtLabel, pane, n, args );
+  
+! 	    if( textfield != NULL )
+  	    {
+  		n = 0;
+! 		PtSetArg( &args[n++], Pt_ARG_MAX_LENGTH, IOSIZE - 1, 0 );
+! 		PtSetArg( &args[n++], Pt_ARG_TEXT_STRING, textfield, 0 );
+! 		PtSetArg( &args[n++], Pt_ARG_POINTER, textfield, 0 );
+! 		gui_ph_dialog_text = PtCreateWidget( PtText, pane, n, args );
+! 		PtAddCallback( gui_ph_dialog_text, Pt_CB_ACTIVATE,
+! 			gui_ph_dialog_text_enter, &modal_ctrl );
+  	    }
+  
+  	    di.parent = gui.vimWindow;
+--- 1576,1607 ----
+  	    PtModalCtrl_t modal_ctrl;
+  	    PtDialogInfo_t di;
+  
+! 	    memset(&di, 0, sizeof(di));
+! 	    memset(&modal_ctrl, 0, sizeof(modal_ctrl));
+  
+  	    n = 0;
+! 	    PtSetArg(&args[n++], Pt_ARG_GROUP_ROWS_COLS, 0, 0);
+! 	    PtSetArg(&args[n++], Pt_ARG_WIDTH, 350, 0);
+! 	    PtSetArg(&args[n++], Pt_ARG_GROUP_ORIENTATION,
+! 		    Pt_GROUP_VERTICAL, 0);
+! 	    PtSetArg(&args[n++], Pt_ARG_GROUP_FLAGS,
+! 		    Pt_TRUE, Pt_GROUP_NO_KEYS | Pt_GROUP_STRETCH_HORIZONTAL);
+! 	    PtSetArg(&args[n++], Pt_ARG_CONTAINER_FLAGS, Pt_FALSE, Pt_TRUE);
+! 	    pane = PtCreateWidget(PtGroup, NULL, n, args);
+  
+  	    n = 0;
+! 	    PtSetArg(&args[n++], Pt_ARG_TEXT_STRING, message, 0);
+! 	    PtCreateWidget(PtLabel, pane, n, args);
+  
+! 	    if (textfield != NULL)
+  	    {
+  		n = 0;
+! 		PtSetArg(&args[n++], Pt_ARG_MAX_LENGTH, IOSIZE - 1, 0);
+! 		PtSetArg(&args[n++], Pt_ARG_TEXT_STRING, textfield, 0);
+! 		PtSetArg(&args[n++], Pt_ARG_POINTER, textfield, 0);
+! 		gui_ph_dialog_text = PtCreateWidget(PtText, pane, n, args);
+! 		PtAddCallback(gui_ph_dialog_text, Pt_CB_ACTIVATE,
+! 			gui_ph_dialog_text_enter, &modal_ctrl);
+  	    }
+  
+  	    di.parent = gui.vimWindow;
+***************
+*** 1616,1641 ****
+  	    di.callback = gui_ph_dialog_close;
+  	    di.data = &modal_ctrl;
+  
+! 	    dialog = PtCreateDialog( &di );
+! 	    PtAddFilterCallback( dialog, Ph_EV_KEY,
+! 		    gui_ph_dialog_esc, &modal_ctrl );
+  
+! 	    if( gui_ph_dialog_text != NULL )
+! 		PtGiveFocus( gui_ph_dialog_text, NULL );
+  
+  	    /* Open dialog, block the vim window and wait for the dialog to close */
+! 	    PtRealizeWidget( dialog );
+! 	    PtMakeModal( dialog, Ph_CURSOR_NOINPUT, Ph_CURSOR_DEFAULT_COLOR );
+! 	    dialog_result = (int) PtModalBlock( &modal_ctrl, 0 );
+  
+! 	    PtDestroyWidget( dialog );
+  	    gui_ph_dialog_text = NULL;
+  	}
+  #endif
+      }
+  
+!     vim_free( button_array );
+!     vim_free( buttons_copy );
+  
+      return dialog_result;
+  }
+--- 1616,1641 ----
+  	    di.callback = gui_ph_dialog_close;
+  	    di.data = &modal_ctrl;
+  
+! 	    dialog = PtCreateDialog(&di);
+! 	    PtAddFilterCallback(dialog, Ph_EV_KEY,
+! 		    gui_ph_dialog_esc, &modal_ctrl);
+  
+! 	    if (gui_ph_dialog_text != NULL)
+! 		PtGiveFocus(gui_ph_dialog_text, NULL);
+  
+  	    /* Open dialog, block the vim window and wait for the dialog to close */
+! 	    PtRealizeWidget(dialog);
+! 	    PtMakeModal(dialog, Ph_CURSOR_NOINPUT, Ph_CURSOR_DEFAULT_COLOR);
+! 	    dialog_result = (int) PtModalBlock(&modal_ctrl, 0);
+  
+! 	    PtDestroyWidget(dialog);
+  	    gui_ph_dialog_text = NULL;
+  	}
+  #endif
+      }
+  
+!     vim_free(button_array);
+!     vim_free(buttons_copy);
+  
+      return dialog_result;
+  }
+***************
+*** 1648,1654 ****
+  {
+      PhPoint_t *pos;
+  
+!     pos = PtWidgetPos( gui.vimWindow, NULL );
+  
+      *x = pos->x;
+      *y = pos->y;
+--- 1648,1654 ----
+  {
+      PhPoint_t *pos;
+  
+!     pos = PtWidgetPos(gui.vimWindow, NULL);
+  
+      *x = pos->x;
+      *y = pos->y;
+***************
+*** 1661,1667 ****
+  {
+      PhPoint_t pos = { x, y };
+  
+!     PtSetResource( gui.vimWindow, Pt_ARG_POS, &pos, 0 );
+  }
+  
+      void
+--- 1661,1667 ----
+  {
+      PhPoint_t pos = { x, y };
+  
+!     PtSetResource(gui.vimWindow, Pt_ARG_POS, &pos, 0);
+  }
+  
+      void
+***************
+*** 1677,1686 ****
+      window_size.h += pg_margin_top + pg_margin_bottom;
+  #endif
+  
+!     PtSetResource( gui.vimWindow, Pt_ARG_MINIMUM_DIM, &min_size, 0 );
+!     PtSetResource( gui.vimWindow, Pt_ARG_DIM, &window_size, 0 );
+  
+!     if( ! PtWidgetIsRealized( gui.vimWindow ) )
+  	gui_ph_resize_container();
+  }
+  
+--- 1677,1686 ----
+      window_size.h += pg_margin_top + pg_margin_bottom;
+  #endif
+  
+!     PtSetResource(gui.vimWindow, Pt_ARG_MINIMUM_DIM, &min_size, 0);
+!     PtSetResource(gui.vimWindow, Pt_ARG_DIM, &window_size, 0);
+  
+!     if (! PtWidgetIsRealized(gui.vimWindow))
+  	gui_ph_resize_container();
+  }
+  
+***************
+*** 1693,1700 ****
+  {
+      PhRect_t console;
+  
+!     PhWindowQueryVisible( Ph_QUERY_WORKSPACE, 0,
+! 	    PhInputGroup( NULL ), &console );
+  
+      *screen_w = console.lr.x - console.ul.x + 1;
+      *screen_h = console.lr.y - console.ul.y + 1;
+--- 1693,1700 ----
+  {
+      PhRect_t console;
+  
+!     PhWindowQueryVisible(Ph_QUERY_WORKSPACE, 0,
+! 	    PhInputGroup(NULL), &console);
+  
+      *screen_w = console.lr.x - console.ul.x + 1;
+      *screen_h = console.lr.y - console.ul.y + 1;
+***************
+*** 1705,1715 ****
+  {
+      PhWindowEvent_t event;
+  
+!     memset( &event, 0, sizeof (event) );
+      event.event_f = Ph_WM_HIDE;
+      event.event_state = Ph_WM_EVSTATE_HIDE;
+!     event.rid = PtWidgetRid( gui.vimWindow );
+!     PtForwardWindowEvent( &event );
+  }
+  
+  #if defined(FEAT_EVAL) || defined(PROTO)
+--- 1705,1715 ----
+  {
+      PhWindowEvent_t event;
+  
+!     memset(&event, 0, sizeof (event));
+      event.event_f = Ph_WM_HIDE;
+      event.event_state = Ph_WM_EVSTATE_HIDE;
+!     event.rid = PtWidgetRid(gui.vimWindow);
+!     PtForwardWindowEvent(&event);
+  }
+  
+  #if defined(FEAT_EVAL) || defined(PROTO)
+***************
+*** 1721,1731 ****
+  {
+      PhWindowEvent_t event;
+  
+!     memset( &event, 0, sizeof (event) );
+      event.event_f = Ph_WM_TOFRONT;
+      event.event_state = Ph_WM_EVSTATE_FFRONT;
+!     event.rid = PtWidgetRid( gui.vimWindow );
+!     PtForwardWindowEvent( &event );
+  }
+  #endif
+  
+--- 1721,1731 ----
+  {
+      PhWindowEvent_t event;
+  
+!     memset(&event, 0, sizeof (event));
+      event.event_f = Ph_WM_TOFRONT;
+      event.event_state = Ph_WM_EVSTATE_FFRONT;
+!     event.rid = PtWidgetRid(gui.vimWindow);
+!     PtForwardWindowEvent(&event);
+  }
+  #endif
+  
+***************
+*** 1733,1741 ****
+  gui_mch_settitle(char_u *title,	char_u *icon)
+  {
+  #ifdef USE_PANEL_GROUP
+!     gui_ph_pg_set_buffer_num( curwin->w_buffer->b_fnum );
+  #endif
+!     PtSetResource( gui.vimWindow, Pt_ARG_WINDOW_TITLE, title, 0 );
+      /* Not sure what to do with the icon text, set balloon text somehow? */
+  }
+  
+--- 1733,1741 ----
+  gui_mch_settitle(char_u *title,	char_u *icon)
+  {
+  #ifdef USE_PANEL_GROUP
+!     gui_ph_pg_set_buffer_num(curwin->w_buffer->b_fnum);
+  #endif
+!     PtSetResource(gui.vimWindow, Pt_ARG_WINDOW_TITLE, title, 0);
+      /* Not sure what to do with the icon text, set balloon text somehow? */
+  }
+  
+***************
+*** 1748,1757 ****
+      int	    n = 0;
+      PtArg_t args[3];
+  
+!     PtSetArg( &args[ n++ ], Pt_ARG_MAXIMUM, max, 0 );
+!     PtSetArg( &args[ n++ ], Pt_ARG_SLIDER_SIZE, size, 0 );
+!     PtSetArg( &args[ n++ ], Pt_ARG_GAUGE_VALUE, val, 0 );
+!     PtSetResources( sb->id, n, args );
+  }
+  
+      void
+--- 1748,1757 ----
+      int	    n = 0;
+      PtArg_t args[3];
+  
+!     PtSetArg(&args[ n++ ], Pt_ARG_MAXIMUM, max, 0);
+!     PtSetArg(&args[ n++ ], Pt_ARG_SLIDER_SIZE, size, 0);
+!     PtSetArg(&args[ n++ ], Pt_ARG_GAUGE_VALUE, val, 0);
+!     PtSetResources(sb->id, n, args);
+  }
+  
+      void
+***************
+*** 1759,1765 ****
+  {
+      PhArea_t area = {{ x, y }, { w, h }};
+  
+!     PtSetResource( sb->id, Pt_ARG_AREA, &area, 0 );
+  }
+  
+      void
+--- 1759,1765 ----
+  {
+      PhArea_t area = {{ x, y }, { w, h }};
+  
+!     PtSetResource(sb->id, Pt_ARG_AREA, &area, 0);
+  }
+  
+      void
+***************
+*** 1775,1786 ****
+       *
+       * Also, don't let the scrollbar get focus
+       */
+!     PtSetArg( &args[ n++ ], Pt_ARG_FLAGS, Pt_DELAY_REALIZE,
+! 	    Pt_DELAY_REALIZE | Pt_GETS_FOCUS );
+!     PtSetArg( &args[ n++ ], Pt_ARG_SCROLLBAR_FLAGS, Pt_SCROLLBAR_SHOW_ARROWS, 0);
+  #if 0
+      /* Don't need this anchoring for the scrollbars */
+!     if( orient == SBAR_HORIZ )
+      {
+  	anchor_flags = Pt_BOTTOM_ANCHORED_BOTTOM |
+  	    Pt_LEFT_ANCHORED_LEFT | Pt_RIGHT_ANCHORED_RIGHT;
+--- 1775,1786 ----
+       *
+       * Also, don't let the scrollbar get focus
+       */
+!     PtSetArg(&args[ n++ ], Pt_ARG_FLAGS, Pt_DELAY_REALIZE,
+! 	    Pt_DELAY_REALIZE | Pt_GETS_FOCUS);
+!     PtSetArg(&args[ n++ ], Pt_ARG_SCROLLBAR_FLAGS, Pt_SCROLLBAR_SHOW_ARROWS, 0);
+  #if 0
+      /* Don't need this anchoring for the scrollbars */
+!     if (orient == SBAR_HORIZ)
+      {
+  	anchor_flags = Pt_BOTTOM_ANCHORED_BOTTOM |
+  	    Pt_LEFT_ANCHORED_LEFT | Pt_RIGHT_ANCHORED_RIGHT;
+***************
+*** 1788,1827 ****
+      else
+      {
+  	anchor_flags = Pt_BOTTOM_ANCHORED_BOTTOM | Pt_TOP_ANCHORED_TOP;
+! 	if( sb->wp != NULL )
+  	{
+! 	    if( sb == &sb->wp->w_scrollbars[ SBAR_LEFT ] )
+  		anchor_flags |= Pt_LEFT_ANCHORED_LEFT;
+  	    else
+  		anchor_flags |= Pt_RIGHT_ANCHORED_RIGHT;
+  	}
+      }
+!     PtSetArg( &args[ n++ ], Pt_ARG_ANCHOR_FLAGS, anchor_flags, Pt_IS_ANCHORED );
+  #endif
+!     PtSetArg( &args[ n++ ], Pt_ARG_ORIENTATION,
+! 	    (orient == SBAR_HORIZ) ? Pt_HORIZONTAL : Pt_VERTICAL, 0 );
+  #ifdef USE_PANEL_GROUP
+!     sb->id = PtCreateWidget( PtScrollbar, gui.vimPanelGroup, n, args );
+  #else
+!     sb->id = PtCreateWidget( PtScrollbar, gui.vimContainer, n, args );
+  #endif
+  
+!     PtAddCallback( sb->id, Pt_CB_SCROLLBAR_MOVE, gui_ph_handle_scrollbar, sb );
+  }
+  
+      void
+  gui_mch_enable_scrollbar(scrollbar_T *sb, int flag)
+  {
+!     if( flag != 0 )
+! 	PtRealizeWidget( sb->id );
+      else
+! 	PtUnrealizeWidget( sb->id );
+  }
+  
+      void
+  gui_mch_destroy_scrollbar(scrollbar_T *sb)
+  {
+!     PtDestroyWidget( sb->id );
+      sb->id = NULL;
+  }
+  
+--- 1788,1827 ----
+      else
+      {
+  	anchor_flags = Pt_BOTTOM_ANCHORED_BOTTOM | Pt_TOP_ANCHORED_TOP;
+! 	if (sb->wp != NULL)
+  	{
+! 	    if (sb == &sb->wp->w_scrollbars[ SBAR_LEFT ])
+  		anchor_flags |= Pt_LEFT_ANCHORED_LEFT;
+  	    else
+  		anchor_flags |= Pt_RIGHT_ANCHORED_RIGHT;
+  	}
+      }
+!     PtSetArg(&args[ n++ ], Pt_ARG_ANCHOR_FLAGS, anchor_flags, Pt_IS_ANCHORED);
+  #endif
+!     PtSetArg(&args[ n++ ], Pt_ARG_ORIENTATION,
+! 	    (orient == SBAR_HORIZ) ? Pt_HORIZONTAL : Pt_VERTICAL, 0);
+  #ifdef USE_PANEL_GROUP
+!     sb->id = PtCreateWidget(PtScrollbar, gui.vimPanelGroup, n, args);
+  #else
+!     sb->id = PtCreateWidget(PtScrollbar, gui.vimContainer, n, args);
+  #endif
+  
+!     PtAddCallback(sb->id, Pt_CB_SCROLLBAR_MOVE, gui_ph_handle_scrollbar, sb);
+  }
+  
+      void
+  gui_mch_enable_scrollbar(scrollbar_T *sb, int flag)
+  {
+!     if (flag != 0)
+! 	PtRealizeWidget(sb->id);
+      else
+! 	PtUnrealizeWidget(sb->id);
+  }
+  
+      void
+  gui_mch_destroy_scrollbar(scrollbar_T *sb)
+  {
+!     PtDestroyWidget(sb->id);
+      sb->id = NULL;
+  }
+  
+***************
+*** 1866,1873 ****
+  	return;
+  
+      if (shape == MSHAPE_HIDE || gui.pointer_hidden)
+! 	PtSetResource( gui.vimTextArea, Pt_ARG_CURSOR_TYPE, Ph_CURSOR_NONE,
+! 		0 );
+      else
+      {
+  	if (shape >= MSHAPE_NUMBERED)
+--- 1866,1873 ----
+  	return;
+  
+      if (shape == MSHAPE_HIDE || gui.pointer_hidden)
+! 	PtSetResource(gui.vimTextArea, Pt_ARG_CURSOR_TYPE, Ph_CURSOR_NONE,
+! 		0);
+      else
+      {
+  	if (shape >= MSHAPE_NUMBERED)
+***************
+*** 1875,1881 ****
+  	else
+  	    id = mshape_ids[shape];
+  
+! 	PtSetResource( gui.vimTextArea, Pt_ARG_CURSOR_TYPE, id,	0 );
+      }
+      if (shape != MSHAPE_HIDE)
+  	last_shape = shape;
+--- 1875,1881 ----
+  	else
+  	    id = mshape_ids[shape];
+  
+! 	PtSetResource(gui.vimTextArea, Pt_ARG_CURSOR_TYPE, id,	0);
+      }
+      if (shape != MSHAPE_HIDE)
+  	last_shape = shape;
+***************
+*** 1885,1903 ****
+      void
+  gui_mch_mousehide(int hide)
+  {
+!     if( gui.pointer_hidden != hide )
+      {
+  	gui.pointer_hidden = hide;
+  #ifdef FEAT_MOUSESHAPE
+! 	if( hide )
+! 	    PtSetResource( gui.vimTextArea, Pt_ARG_CURSOR_TYPE,
+! 		    Ph_CURSOR_NONE, 0 );
+  	else
+! 	    mch_set_mouse_shape( last_shape );
+  #else
+! 	PtSetResource( gui.vimTextArea, Pt_ARG_CURSOR_TYPE,
+! 		( hide == MOUSE_SHOW ) ? GUI_PH_MOUSE_TYPE : Ph_CURSOR_NONE,
+! 		0 );
+  #endif
+      }
+  }
+--- 1885,1903 ----
+      void
+  gui_mch_mousehide(int hide)
+  {
+!     if (gui.pointer_hidden != hide)
+      {
+  	gui.pointer_hidden = hide;
+  #ifdef FEAT_MOUSESHAPE
+! 	if (hide)
+! 	    PtSetResource(gui.vimTextArea, Pt_ARG_CURSOR_TYPE,
+! 		    Ph_CURSOR_NONE, 0);
+  	else
+! 	    mch_set_mouse_shape(last_shape);
+  #else
+! 	PtSetResource(gui.vimTextArea, Pt_ARG_CURSOR_TYPE,
+! 		(hide == MOUSE_SHOW) ? GUI_PH_MOUSE_TYPE : Ph_CURSOR_NONE,
+! 		0);
+  #endif
+      }
+  }
+***************
+*** 1910,1917 ****
+  
+      /* FIXME: does this return the correct position,
+       * with respect to the border? */
+!     PhQueryCursor( PhInputGroup( NULL ), &info );
+!     PtGetAbsPosition( gui.vimTextArea , &ix, &iy );
+  
+      *x = info.pos.x - ix;
+      *y = info.pos.y - iy;
+--- 1910,1917 ----
+  
+      /* FIXME: does this return the correct position,
+       * with respect to the border? */
+!     PhQueryCursor(PhInputGroup(NULL), &info);
+!     PtGetAbsPosition(gui.vimTextArea , &ix, &iy);
+  
+      *x = info.pos.x - ix;
+      *y = info.pos.y - iy;
+***************
+*** 1922,1930 ****
+  {
+      short abs_x, abs_y;
+  
+!     PtGetAbsPosition( gui.vimTextArea, &abs_x, &abs_y );
+      /* Add the border offset? */
+!     PhMoveCursorAbs( PhInputGroup( NULL ), abs_x + x, abs_y + y );
+  }
+  
+  /****************************************************************************/
+--- 1922,1930 ----
+  {
+      short abs_x, abs_y;
+  
+!     PtGetAbsPosition(gui.vimTextArea, &abs_x, &abs_y);
+      /* Add the border offset? */
+!     PhMoveCursorAbs(PhInputGroup(NULL), abs_x + x, abs_y + y);
+  }
+  
+  /****************************************************************************/
+***************
+*** 1952,1974 ****
+      color_diff = gui_get_lightness(gui_ph_mouse_color)
+  					  - gui_get_lightness(gui.back_pixel);
+  
+!     if( abs( color_diff ) < 64 )
+      {
+  	short r, g, b;
+  	/* not a great algorithm... */
+! 	r = PgRedValue( gui_ph_mouse_color ) ^ 255;
+! 	g = PgGreenValue( gui_ph_mouse_color ) ^ 255;
+! 	b = PgBlueValue( gui_ph_mouse_color ) ^ 255;
+  
+  #ifndef FEAT_MOUSESHAPE
+! 	gui_ph_mouse_color = PgRGB( r, g, b );
+! 	PtSetResource( gui.vimTextArea, Pt_ARG_CURSOR_COLOR,
+! 		gui_ph_mouse_color, 0 );
+  #endif
+      }
+  #endif
+  
+!     PtSetResource( gui.vimTextArea, Pt_ARG_FILL_COLOR, gui.back_pixel, 0 );
+  }
+  
+      static int
+--- 1952,1974 ----
+      color_diff = gui_get_lightness(gui_ph_mouse_color)
+  					  - gui_get_lightness(gui.back_pixel);
+  
+!     if (abs(color_diff) < 64)
+      {
+  	short r, g, b;
+  	/* not a great algorithm... */
+! 	r = PgRedValue(gui_ph_mouse_color) ^ 255;
+! 	g = PgGreenValue(gui_ph_mouse_color) ^ 255;
+! 	b = PgBlueValue(gui_ph_mouse_color) ^ 255;
+  
+  #ifndef FEAT_MOUSESHAPE
+! 	gui_ph_mouse_color = PgRGB(r, g, b);
+! 	PtSetResource(gui.vimTextArea, Pt_ARG_CURSOR_COLOR,
+! 		gui_ph_mouse_color, 0);
+  #endif
+      }
+  #endif
+  
+!     PtSetResource(gui.vimTextArea, Pt_ARG_FILL_COLOR, gui.back_pixel, 0);
+  }
+  
+      static int
+***************
+*** 2058,2076 ****
+      };
+  
+      /* is name #rrggbb format? */
+!     if( name[0] == '#' && STRLEN( name ) == 7 )
+      {
+! 	r = hex_digit( name[1] ) * 16 + hex_digit( name[2] );
+! 	g = hex_digit( name[3] ) * 16 + hex_digit( name[4] );
+! 	b = hex_digit( name[5] ) * 16 + hex_digit( name[6] );
+! 	if( r < 0 || g < 0 || b < 0 )
+  	    return INVALCOLOR;
+  	return RGB(r, g, b);
+      }
+  
+!     for( i = 0; i < ARRAY_LENGTH( table ); i++ )
+      {
+! 	if( STRICMP( name, table[i].name ) == 0 )
+  	    return table[i].colour;
+      }
+  
+--- 2058,2076 ----
+      };
+  
+      /* is name #rrggbb format? */
+!     if (name[0] == '#' && STRLEN(name) == 7)
+      {
+! 	r = hex_digit(name[1]) * 16 + hex_digit(name[2]);
+! 	g = hex_digit(name[3]) * 16 + hex_digit(name[4]);
+! 	b = hex_digit(name[5]) * 16 + hex_digit(name[6]);
+! 	if (r < 0 || g < 0 || b < 0)
+  	    return INVALCOLOR;
+  	return RGB(r, g, b);
+      }
+  
+!     for (i = 0; i < ARRAY_LENGTH(table); i++)
+      {
+! 	if (STRICMP(name, table[i].name) == 0)
+  	    return table[i].colour;
+      }
+  
+***************
+*** 2129,2141 ****
+      void
+  gui_mch_set_fg_color(guicolor_T color)
+  {
+!     PgSetTextColor( color );
+  }
+  
+      void
+  gui_mch_set_bg_color(guicolor_T color)
+  {
+!     PgSetFillColor( color );
+  }
+  
+      void
+--- 2129,2141 ----
+      void
+  gui_mch_set_fg_color(guicolor_T color)
+  {
+!     PgSetTextColor(color);
+  }
+  
+      void
+  gui_mch_set_bg_color(guicolor_T color)
+  {
+!     PgSetFillColor(color);
+  }
+  
+      void
+***************
+*** 2148,2168 ****
+  {
+      PhRect_t rect;
+  
+!     rect.ul.x = FILL_X( col );
+!     rect.ul.y = FILL_Y( row );
+  
+      /* FIXME: This has an off by one pixel problem */
+      rect.lr.x = rect.ul.x + nc * gui.char_width;
+      rect.lr.y = rect.ul.y + nr * gui.char_height;
+!     if( nc > 0 )
+  	rect.lr.x -= 1;
+!     if( nr > 0 )
+  	rect.lr.y -= 1;
+  
+      DRAW_START;
+!     PgSetDrawMode( Pg_DrawModeDSTINVERT );
+!     PgDrawRect( &rect, Pg_DRAW_FILL );
+!     PgSetDrawMode( Pg_DrawModeSRCCOPY );
+      DRAW_END;
+  }
+  
+--- 2148,2168 ----
+  {
+      PhRect_t rect;
+  
+!     rect.ul.x = FILL_X(col);
+!     rect.ul.y = FILL_Y(row);
+  
+      /* FIXME: This has an off by one pixel problem */
+      rect.lr.x = rect.ul.x + nc * gui.char_width;
+      rect.lr.y = rect.ul.y + nr * gui.char_height;
+!     if (nc > 0)
+  	rect.lr.x -= 1;
+!     if (nr > 0)
+  	rect.lr.y -= 1;
+  
+      DRAW_START;
+!     PgSetDrawMode(Pg_DrawModeDSTINVERT);
+!     PgDrawRect(&rect, Pg_DRAW_FILL);
+!     PgSetDrawMode(Pg_DrawModeSRCCOPY);
+      DRAW_END;
+  }
+  
+***************
+*** 2170,2182 ****
+  gui_mch_clear_block(int row1, int col1, int row2, int col2)
+  {
+      PhRect_t block = {
+! 	{ FILL_X( col1 ), FILL_Y( row1 ) },
+! 	{ FILL_X( col2 + 1 ) - 1, FILL_Y( row2 + 1 ) - 1}
+      };
+  
+      DRAW_START;
+!     gui_mch_set_bg_color( gui.back_pixel );
+!     PgDrawRect( &block, Pg_DRAW_FILL );
+      DRAW_END;
+  }
+  
+--- 2170,2182 ----
+  gui_mch_clear_block(int row1, int col1, int row2, int col2)
+  {
+      PhRect_t block = {
+! 	{ FILL_X(col1), FILL_Y(row1) },
+! 	{ FILL_X(col2 + 1) - 1, FILL_Y(row2 + 1) - 1}
+      };
+  
+      DRAW_START;
+!     gui_mch_set_bg_color(gui.back_pixel);
+!     PgDrawRect(&block, Pg_DRAW_FILL);
+      DRAW_END;
+  }
+  
+***************
+*** 2189,2200 ****
+  	    Rows * gui.char_height + gui.border_width - 1 }
+      };
+  
+!     if( is_ignore_draw == TRUE )
+  	return;
+  
+      DRAW_START;
+!     gui_mch_set_bg_color( gui.back_pixel );
+!     PgDrawRect( &text_rect, Pg_DRAW_FILL );
+      DRAW_END;
+  }
+  
+--- 2189,2200 ----
+  	    Rows * gui.char_height + gui.border_width - 1 }
+      };
+  
+!     if (is_ignore_draw == TRUE)
+  	return;
+  
+      DRAW_START;
+!     gui_mch_set_bg_color(gui.back_pixel);
+!     PgDrawRect(&text_rect, Pg_DRAW_FILL);
+      DRAW_END;
+  }
+  
+***************
+*** 2204,2231 ****
+      PhRect_t    rect;
+      PhPoint_t   delta;
+  
+!     rect.ul.x = FILL_X( gui.scroll_region_left );
+!     rect.ul.y = FILL_Y( row + num_lines );
+  
+!     rect.lr.x = FILL_X( gui.scroll_region_right + 1 ) - 1;
+!     rect.lr.y = FILL_Y( gui.scroll_region_bot + 1) - 1;
+  
+!     PtWidgetOffset( gui.vimTextArea, &gui_ph_raw_offset );
+!     PhTranslatePoint( &gui_ph_raw_offset, PtWidgetPos(gui.vimTextArea, NULL));
+!     PhTranslateRect( &rect, &gui_ph_raw_offset );
+  
+      delta.x = 0;
+      delta.y = -num_lines * gui.char_height;
+  
+      PgFlush();
+  
+!     PhBlit( PtWidgetRid( PtFindDisjoint( gui.vimTextArea ) ), &rect, &delta );
+  
+      gui_clear_block(
+  	gui.scroll_region_bot - num_lines + 1,
+  	gui.scroll_region_left,
+  	gui.scroll_region_bot,
+! 	gui.scroll_region_right );
+  }
+  
+      void
+--- 2204,2231 ----
+      PhRect_t    rect;
+      PhPoint_t   delta;
+  
+!     rect.ul.x = FILL_X(gui.scroll_region_left);
+!     rect.ul.y = FILL_Y(row + num_lines);
+  
+!     rect.lr.x = FILL_X(gui.scroll_region_right + 1) - 1;
+!     rect.lr.y = FILL_Y(gui.scroll_region_bot + 1) - 1;
+  
+!     PtWidgetOffset(gui.vimTextArea, &gui_ph_raw_offset);
+!     PhTranslatePoint(&gui_ph_raw_offset, PtWidgetPos(gui.vimTextArea, NULL));
+!     PhTranslateRect(&rect, &gui_ph_raw_offset);
+  
+      delta.x = 0;
+      delta.y = -num_lines * gui.char_height;
+  
+      PgFlush();
+  
+!     PhBlit(PtWidgetRid(PtFindDisjoint(gui.vimTextArea)), &rect, &delta);
+  
+      gui_clear_block(
+  	gui.scroll_region_bot - num_lines + 1,
+  	gui.scroll_region_left,
+  	gui.scroll_region_bot,
+! 	gui.scroll_region_right);
+  }
+  
+      void
+***************
+*** 2234,2258 ****
+      PhRect_t    rect;
+      PhPoint_t   delta;
+  
+!     rect.ul.x = FILL_X( gui.scroll_region_left );
+!     rect.ul.y = FILL_Y( row );
+  
+!     rect.lr.x = FILL_X( gui.scroll_region_right + 1 ) - 1;
+!     rect.lr.y = FILL_Y( gui.scroll_region_bot - num_lines + 1 ) - 1;
+  
+!     PtWidgetOffset( gui.vimTextArea, &gui_ph_raw_offset );
+!     PhTranslatePoint( &gui_ph_raw_offset, PtWidgetPos( gui.vimTextArea, NULL ) );
+!     PhTranslateRect( &rect, &gui_ph_raw_offset );
+  
+      delta.x = 0;
+      delta.y = num_lines * gui.char_height;
+  
+      PgFlush();
+  
+!     PhBlit( PtWidgetRid( PtFindDisjoint( gui.vimTextArea ) ) , &rect, &delta );
+  
+!     gui_clear_block( row, gui.scroll_region_left,
+! 	    row + num_lines - 1, gui.scroll_region_right );
+  }
+  
+      void
+--- 2234,2258 ----
+      PhRect_t    rect;
+      PhPoint_t   delta;
+  
+!     rect.ul.x = FILL_X(gui.scroll_region_left);
+!     rect.ul.y = FILL_Y(row);
+  
+!     rect.lr.x = FILL_X(gui.scroll_region_right + 1) - 1;
+!     rect.lr.y = FILL_Y(gui.scroll_region_bot - num_lines + 1) - 1;
+  
+!     PtWidgetOffset(gui.vimTextArea, &gui_ph_raw_offset);
+!     PhTranslatePoint(&gui_ph_raw_offset, PtWidgetPos(gui.vimTextArea, NULL));
+!     PhTranslateRect(&rect, &gui_ph_raw_offset);
+  
+      delta.x = 0;
+      delta.y = num_lines * gui.char_height;
+  
+      PgFlush();
+  
+!     PhBlit(PtWidgetRid(PtFindDisjoint(gui.vimTextArea)) , &rect, &delta);
+  
+!     gui_clear_block(row, gui.scroll_region_left,
+! 	    row + num_lines - 1, gui.scroll_region_right);
+  }
+  
+      void
+***************
+*** 2261,2297 ****
+      static char *utf8_buffer = NULL;
+      static int	utf8_len = 0;
+  
+!     PhPoint_t	pos = { TEXT_X( col ), TEXT_Y( row ) };
+      PhRect_t	rect;
+  
+!     if( is_ignore_draw == TRUE )
+  	return;
+  
+      DRAW_START;
+  
+!     if( !( flags & DRAW_TRANSP ) )
+      {
+  	PgDrawIRect(
+! 		FILL_X( col ), FILL_Y( row ),
+! 		FILL_X( col + len ) - 1, FILL_Y( row + 1 ) - 1,
+! 		Pg_DRAW_FILL );
+      }
+  
+!     if( flags & DRAW_UNDERL )
+! 	PgSetUnderline( gui.norm_pixel, Pg_TRANSPARENT, 0 );
+  
+!     if( charset_translate != NULL
+  #ifdef FEAT_MBYTE
+  	    && enc_utf8 == 0
+  #endif
+! 	    )
+      {
+  	int src_taken, dst_made;
+  
+  	/* Use a static buffer to avoid large amounts of de/allocations */
+! 	if( utf8_len < len )
+  	{
+! 	    utf8_buffer = realloc( utf8_buffer, len * MB_LEN_MAX );
+  	    utf8_len = len;
+  	}
+  
+--- 2261,2297 ----
+      static char *utf8_buffer = NULL;
+      static int	utf8_len = 0;
+  
+!     PhPoint_t	pos = { TEXT_X(col), TEXT_Y(row) };
+      PhRect_t	rect;
+  
+!     if (is_ignore_draw == TRUE)
+  	return;
+  
+      DRAW_START;
+  
+!     if (!(flags & DRAW_TRANSP))
+      {
+  	PgDrawIRect(
+! 		FILL_X(col), FILL_Y(row),
+! 		FILL_X(col + len) - 1, FILL_Y(row + 1) - 1,
+! 		Pg_DRAW_FILL);
+      }
+  
+!     if (flags & DRAW_UNDERL)
+! 	PgSetUnderline(gui.norm_pixel, Pg_TRANSPARENT, 0);
+  
+!     if (charset_translate != NULL
+  #ifdef FEAT_MBYTE
+  	    && enc_utf8 == 0
+  #endif
+! 	   )
+      {
+  	int src_taken, dst_made;
+  
+  	/* Use a static buffer to avoid large amounts of de/allocations */
+! 	if (utf8_len < len)
+  	{
+! 	    utf8_buffer = realloc(utf8_buffer, len * MB_LEN_MAX);
+  	    utf8_len = len;
+  	}
+  
+***************
+*** 2302,2337 ****
+  		&src_taken,
+  		utf8_buffer,
+  		utf8_len,
+! 		&dst_made );
+  	s = utf8_buffer;
+  	len = dst_made;
+      }
+  
+!     PgDrawText( s, len, &pos, 0 );
+  
+!     if( flags & DRAW_BOLD )
+      {
+  	/* FIXME: try and only calculate these values once... */
+! 	rect.ul.x = FILL_X( col ) + 1;
+! 	rect.ul.y = FILL_Y( row );
+! 	rect.lr.x = FILL_X( col + len ) - 1;
+! 	rect.lr.y = FILL_Y( row + 1) - 1;
+! 	/* PgSetUserClip( NULL ) causes the scrollbar to not redraw... */
+  #if 0
+  	pos.x++;
+  
+! 	PgSetUserClip( &rect );
+! 	PgDrawText( s, len, &pos, 0 );
+! 	PgSetUserClip( NULL );
+  #else
+! 	rect.lr.y -= ( p_linespace + 1 ) / 2;
+  	/* XXX: DrawTextArea doesn't work with phditto */
+! 	PgDrawTextArea( s, len, &rect, Pg_TEXT_BOTTOM );
+  #endif
+      }
+  
+!     if( flags & DRAW_UNDERL )
+! 	PgSetUnderline( Pg_TRANSPARENT, Pg_TRANSPARENT, 0 );
+  
+      DRAW_END;
+  }
+--- 2302,2337 ----
+  		&src_taken,
+  		utf8_buffer,
+  		utf8_len,
+! 		&dst_made);
+  	s = utf8_buffer;
+  	len = dst_made;
+      }
+  
+!     PgDrawText(s, len, &pos, 0);
+  
+!     if (flags & DRAW_BOLD)
+      {
+  	/* FIXME: try and only calculate these values once... */
+! 	rect.ul.x = FILL_X(col) + 1;
+! 	rect.ul.y = FILL_Y(row);
+! 	rect.lr.x = FILL_X(col + len) - 1;
+! 	rect.lr.y = FILL_Y(row + 1) - 1;
+! 	/* PgSetUserClip(NULL) causes the scrollbar to not redraw... */
+  #if 0
+  	pos.x++;
+  
+! 	PgSetUserClip(&rect);
+! 	PgDrawText(s, len, &pos, 0);
+! 	PgSetUserClip(NULL);
+  #else
+! 	rect.lr.y -= (p_linespace + 1) / 2;
+  	/* XXX: DrawTextArea doesn't work with phditto */
+! 	PgDrawTextArea(s, len, &rect, Pg_TEXT_BOTTOM);
+  #endif
+      }
+  
+!     if (flags & DRAW_UNDERL)
+! 	PgSetUnderline(Pg_TRANSPARENT, Pg_TRANSPARENT, 0);
+  
+      DRAW_END;
+  }
+***************
+*** 2346,2359 ****
+  
+      /* FIXME: Double width characters */
+  
+!     r.ul.x = FILL_X( gui.col );
+!     r.ul.y = FILL_Y( gui.row );
+      r.lr.x = r.ul.x + gui.char_width - 1;
+      r.lr.y = r.ul.y + gui.char_height - 1;
+  
+      DRAW_START;
+!     PgSetStrokeColor( color );
+!     PgDrawRect( &r, Pg_DRAW_STROKE );
+      DRAW_END;
+  }
+  
+--- 2346,2359 ----
+  
+      /* FIXME: Double width characters */
+  
+!     r.ul.x = FILL_X(gui.col);
+!     r.ul.y = FILL_Y(gui.row);
+      r.lr.x = r.ul.x + gui.char_width - 1;
+      r.lr.y = r.ul.y + gui.char_height - 1;
+  
+      DRAW_START;
+!     PgSetStrokeColor(color);
+!     PgDrawRect(&r, Pg_DRAW_STROKE);
+      DRAW_END;
+  }
+  
+***************
+*** 2362,2375 ****
+  {
+      PhRect_t r;
+  
+!     r.ul.x = FILL_X( gui.col );
+!     r.ul.y = FILL_Y( gui.row ) + gui.char_height - h;
+      r.lr.x = r.ul.x + w - 1;
+      r.lr.y = r.ul.y + h - 1;
+  
+      DRAW_START;
+!     gui_mch_set_bg_color( color );
+!     PgDrawRect( &r, Pg_DRAW_FILL );
+      DRAW_END;
+  }
+  
+--- 2362,2375 ----
+  {
+      PhRect_t r;
+  
+!     r.ul.x = FILL_X(gui.col);
+!     r.ul.y = FILL_Y(gui.row) + gui.char_height - h;
+      r.lr.x = r.ul.x + w - 1;
+      r.lr.y = r.ul.y + h - 1;
+  
+      DRAW_START;
+!     gui_mch_set_bg_color(color);
+!     PgDrawRect(&r, Pg_DRAW_FILL);
+      DRAW_END;
+  }
+  
+***************
+*** 2385,2394 ****
+  gui_mch_start_blink(void)
+  {
+      /* Only turn on the timer on if none of the times are zero */
+!     if( blink_waittime && blink_ontime && blink_offtime && gui.in_focus)
+      {
+! 	PtSetResource( gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL,
+! 		blink_waittime, 0 );
+  	blink_state = BLINK_ON;
+  	gui_update_cursor(TRUE, FALSE);
+      }
+--- 2385,2394 ----
+  gui_mch_start_blink(void)
+  {
+      /* Only turn on the timer on if none of the times are zero */
+!     if (blink_waittime && blink_ontime && blink_offtime && gui.in_focus)
+      {
+! 	PtSetResource(gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL,
+! 		blink_waittime, 0);
+  	blink_state = BLINK_ON;
+  	gui_update_cursor(TRUE, FALSE);
+      }
+***************
+*** 2397,2405 ****
+      void
+  gui_mch_stop_blink(void)
+  {
+!     PtSetResource( gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL, 0, 0 );
+  
+!     if( blink_state == BLINK_OFF )
+  	gui_update_cursor(TRUE, FALSE);
+  
+      blink_state = BLINK_NONE;
+--- 2397,2405 ----
+      void
+  gui_mch_stop_blink(void)
+  {
+!     PtSetResource(gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL, 0, 0);
+  
+!     if (blink_state == BLINK_OFF)
+  	gui_update_cursor(TRUE, FALSE);
+  
+      blink_state = BLINK_NONE;
+***************
+*** 2417,2431 ****
+      void
+  gui_mch_flash(int msec)
+  {
+!     PgSetFillXORColor( Pg_BLACK, Pg_WHITE );
+!     PgSetDrawMode( Pg_DRAWMODE_XOR );
+      gui_mch_clear_all();
+      gui_mch_flush();
+  
+!     ui_delay( (long) msec, TRUE );
+  
+      gui_mch_clear_all();
+!     PgSetDrawMode( Pg_DRAWMODE_OPAQUE );
+      gui_mch_flush();
+  }
+  
+--- 2417,2431 ----
+      void
+  gui_mch_flash(int msec)
+  {
+!     PgSetFillXORColor(Pg_BLACK, Pg_WHITE);
+!     PgSetDrawMode(Pg_DRAWMODE_XOR);
+      gui_mch_clear_all();
+      gui_mch_flush();
+  
+!     ui_delay((long) msec, TRUE);
+  
+      gui_mch_clear_all();
+!     PgSetDrawMode(Pg_DRAWMODE_OPAQUE);
+      gui_mch_flush();
+  }
+  
+***************
+*** 2440,2446 ****
+  {
+      PhArea_t area = {{x, y}, {w, h}};
+  
+!     PtSetResource( gui.vimTextArea, Pt_ARG_AREA, &area, 0 );
+  }
+  
+      int
+--- 2440,2446 ----
+  {
+      PhArea_t area = {{x, y}, {w, h}};
+  
+!     PtSetResource(gui.vimTextArea, Pt_ARG_AREA, &area, 0);
+  }
+  
+      int
+***************
+*** 2496,2514 ****
+  };
+  
+  static PhImage_t *
+! gui_ph_toolbar_load_icon( char_u *iconfile )
+  {
+      static PhImage_t external_icon;
+      PhImage_t *temp_phi = NULL;
+  
+!     temp_phi = PxLoadImage( iconfile, NULL );
+!     if( temp_phi != NULL )
+      {
+  	/* The label widget will free the image/palette/etc. for us when
+  	 * it's destroyed */
+  	temp_phi->flags |= Ph_RELEASE_IMAGE_ALL;
+! 	memcpy( &external_icon, temp_phi, sizeof( external_icon ) );
+! 	free( temp_phi );
+  
+  	temp_phi = &external_icon;
+      }
+--- 2496,2514 ----
+  };
+  
+  static PhImage_t *
+! gui_ph_toolbar_load_icon(char_u *iconfile)
+  {
+      static PhImage_t external_icon;
+      PhImage_t *temp_phi = NULL;
+  
+!     temp_phi = PxLoadImage(iconfile, NULL);
+!     if (temp_phi != NULL)
+      {
+  	/* The label widget will free the image/palette/etc. for us when
+  	 * it's destroyed */
+  	temp_phi->flags |= Ph_RELEASE_IMAGE_ALL;
+! 	memcpy(&external_icon, temp_phi, sizeof(external_icon));
+! 	free(temp_phi);
+  
+  	temp_phi = &external_icon;
+      }
+***************
+*** 2523,2551 ****
+   * PhImage_t are copied, and the original PhImage_t aren't needed anymore).
+   */
+  static PhImage_t *
+! gui_ph_toolbar_find_icon( vimmenu_T *menu )
+  {
+      char_u full_pathname[ MAXPATHL + 1 ];
+      PhImage_t *icon = NULL;
+  
+!     if( menu->icon_builtin == FALSE )
+      {
+! 	if( menu->iconfile != NULL )
+  	    /* TODO: use gui_find_iconfile() */
+! 	    icon = gui_ph_toolbar_load_icon( menu->iconfile );
+  
+  	/* TODO: Restrict loading to just .png? Search for any format? */
+! 	if( ( icon == NULL ) &&
+! 	    ( ( gui_find_bitmap( menu->name, full_pathname, "gif" ) == OK ) ||
+! 	      ( gui_find_bitmap( menu->name, full_pathname, "png" ) == OK ) ) )
+! 	    icon = gui_ph_toolbar_load_icon( full_pathname );
+  
+! 	if( icon != NULL )
+  	    return icon;
+      }
+  
+!     if( menu->iconidx >= 0 &&
+! 	    ( menu->iconidx < ARRAY_LENGTH( gui_ph_toolbar_images ) ) )
+      {
+  	return gui_ph_toolbar_images[menu->iconidx];
+      }
+--- 2523,2551 ----
+   * PhImage_t are copied, and the original PhImage_t aren't needed anymore).
+   */
+  static PhImage_t *
+! gui_ph_toolbar_find_icon(vimmenu_T *menu)
+  {
+      char_u full_pathname[ MAXPATHL + 1 ];
+      PhImage_t *icon = NULL;
+  
+!     if (menu->icon_builtin == FALSE)
+      {
+! 	if (menu->iconfile != NULL)
+  	    /* TODO: use gui_find_iconfile() */
+! 	    icon = gui_ph_toolbar_load_icon(menu->iconfile);
+  
+  	/* TODO: Restrict loading to just .png? Search for any format? */
+! 	if ((icon == NULL) &&
+! 	    ((gui_find_bitmap(menu->name, full_pathname, "gif") == OK) ||
+! 	      (gui_find_bitmap(menu->name, full_pathname, "png") == OK)))
+! 	    icon = gui_ph_toolbar_load_icon(full_pathname);
+  
+! 	if (icon != NULL)
+  	    return icon;
+      }
+  
+!     if (menu->iconidx >= 0 &&
+! 	    (menu->iconidx < ARRAY_LENGTH(gui_ph_toolbar_images)))
+      {
+  	return gui_ph_toolbar_images[menu->iconidx];
+      }
+***************
+*** 2554,2567 ****
+  }
+  #endif
+  
+! #if defined( FEAT_MENU ) || defined( PROTO )
+      void
+  gui_mch_enable_menu(int flag)
+  {
+!     if( flag != 0 )
+! 	PtRealizeWidget( gui.vimMenuBar );
+      else
+! 	PtUnrealizeWidget( gui.vimMenuBar );
+  }
+  
+      void
+--- 2554,2567 ----
+  }
+  #endif
+  
+! #if defined(FEAT_MENU) || defined(PROTO)
+      void
+  gui_mch_enable_menu(int flag)
+  {
+!     if (flag != 0)
+! 	PtRealizeWidget(gui.vimMenuBar);
+      else
+! 	PtUnrealizeWidget(gui.vimMenuBar);
+  }
+  
+      void
+***************
+*** 2572,2601 ****
+  
+  /* Change the position of a menu button in the parent */
+      static void
+! gui_ph_position_menu( PtWidget_t *widget, int priority )
+  {
+      PtWidget_t	*traverse;
+      vimmenu_T	*menu;
+  
+!     traverse = PtWidgetChildBack( PtWidgetParent( widget ) );
+  
+      /* Iterate through the list of widgets in traverse, until
+       * we find the position we want to insert our widget into */
+      /* TODO: traverse from front to back, possible speedup? */
+!     while( traverse != NULL )
+      {
+! 	PtGetResource( traverse, Pt_ARG_POINTER, &menu, 0 );
+  
+! 	if( menu != NULL &&
+  		priority < menu->priority &&
+! 		widget != traverse )
+  	{
+  	    /* Insert the widget before the current traverse widget */
+! 	    PtWidgetInsert( widget, traverse, 1 );
+  	    return;
+  	}
+  
+! 	traverse = PtWidgetBrotherInFront( traverse );
+      }
+  }
+  
+--- 2572,2601 ----
+  
+  /* Change the position of a menu button in the parent */
+      static void
+! gui_ph_position_menu(PtWidget_t *widget, int priority)
+  {
+      PtWidget_t	*traverse;
+      vimmenu_T	*menu;
+  
+!     traverse = PtWidgetChildBack(PtWidgetParent(widget));
+  
+      /* Iterate through the list of widgets in traverse, until
+       * we find the position we want to insert our widget into */
+      /* TODO: traverse from front to back, possible speedup? */
+!     while (traverse != NULL)
+      {
+! 	PtGetResource(traverse, Pt_ARG_POINTER, &menu, 0);
+  
+! 	if (menu != NULL &&
+  		priority < menu->priority &&
+! 		widget != traverse)
+  	{
+  	    /* Insert the widget before the current traverse widget */
+! 	    PtWidgetInsert(widget, traverse, 1);
+  	    return;
+  	}
+  
+! 	traverse = PtWidgetBrotherInFront(traverse);
+      }
+  }
+  
+***************
+*** 2611,2621 ****
+  
+      menu->submenu_id = menu->id = NULL;
+  
+!     if( menu_is_menubar( menu->name ) )
+      {
+  
+! 	accel_key = vim_strchr( menu->name, '&' );
+! 	if( accel_key != NULL )
+  	{
+  	    mnemonic_str[0] = accel_key[1];
+  	    mnemonic_str[1] = NUL;
+--- 2611,2621 ----
+  
+      menu->submenu_id = menu->id = NULL;
+  
+!     if (menu_is_menubar(menu->name))
+      {
+  
+! 	accel_key = vim_strchr(menu->name, '&');
+! 	if (accel_key != NULL)
+  	{
+  	    mnemonic_str[0] = accel_key[1];
+  	    mnemonic_str[1] = NUL;
+***************
+*** 2623,2673 ****
+  
+  	/* Create the menu button */
+  	n = 0;
+! 	PtSetArg( &args[ n++ ], Pt_ARG_TEXT_STRING, menu->dname, 0 );
+! 	PtSetArg( &args[ n++ ], Pt_ARG_ACCEL_TEXT, menu->actext, 0 );
+! 	if( accel_key != NULL )
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_ACCEL_KEY, mnemonic_str, 0 );
+! 	PtSetArg( &args[ n++ ], Pt_ARG_POINTER, menu, 0 );
+  
+! 	if( parent != NULL )
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_BUTTON_TYPE, Pt_MENU_RIGHT, 0 );
+  
+! 	menu->id = PtCreateWidget( PtMenuButton,
+  		(parent == NULL) ? gui.vimMenuBar : parent->submenu_id,
+! 		n, args );
+  
+! 	PtAddCallback( menu->id, Pt_CB_ARM, gui_ph_handle_pulldown_menu, menu );
+  
+  	/* Create the actual menu */
+  	n = 0;
+! 	if( parent != NULL )
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_MENU_FLAGS, Pt_TRUE, Pt_MENU_CHILD );
+  
+! 	menu->submenu_id = PtCreateWidget( PtMenu, menu->id, n, args );
+  
+! 	if( parent == NULL )
+  	{
+! 	    PtAddCallback( menu->submenu_id, Pt_CB_UNREALIZED,
+! 		    gui_ph_handle_menu_unrealized, menu );
+  
+! 	    if( menu->mnemonic != 0 )
+  	    {
+! 		PtAddHotkeyHandler( gui.vimWindow, tolower( menu->mnemonic ),
+! 			Pk_KM_Alt, 0, menu, gui_ph_handle_pulldown_menu );
+  	    }
+  	}
+  
+! 	gui_ph_position_menu( menu->id, menu->priority );
+  
+  	/* Redraw menubar here instead of gui_mch_draw_menubar */
+! 	if( gui.menu_is_active )
+! 	    PtRealizeWidget( menu->id );
+      }
+!     else if( menu_is_popup( menu->name ) )
+      {
+! 	menu->submenu_id = PtCreateWidget( PtMenu, gui.vimWindow, 0, NULL );
+! 	PtAddCallback( menu->submenu_id, Pt_CB_UNREALIZED,
+! 		gui_ph_handle_menu_unrealized, menu );
+      }
+  }
+  
+--- 2623,2673 ----
+  
+  	/* Create the menu button */
+  	n = 0;
+! 	PtSetArg(&args[ n++ ], Pt_ARG_TEXT_STRING, menu->dname, 0);
+! 	PtSetArg(&args[ n++ ], Pt_ARG_ACCEL_TEXT, menu->actext, 0);
+! 	if (accel_key != NULL)
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_ACCEL_KEY, mnemonic_str, 0);
+! 	PtSetArg(&args[ n++ ], Pt_ARG_POINTER, menu, 0);
+  
+! 	if (parent != NULL)
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_BUTTON_TYPE, Pt_MENU_RIGHT, 0);
+  
+! 	menu->id = PtCreateWidget(PtMenuButton,
+  		(parent == NULL) ? gui.vimMenuBar : parent->submenu_id,
+! 		n, args);
+  
+! 	PtAddCallback(menu->id, Pt_CB_ARM, gui_ph_handle_pulldown_menu, menu);
+  
+  	/* Create the actual menu */
+  	n = 0;
+! 	if (parent != NULL)
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_MENU_FLAGS, Pt_TRUE, Pt_MENU_CHILD);
+  
+! 	menu->submenu_id = PtCreateWidget(PtMenu, menu->id, n, args);
+  
+! 	if (parent == NULL)
+  	{
+! 	    PtAddCallback(menu->submenu_id, Pt_CB_UNREALIZED,
+! 		    gui_ph_handle_menu_unrealized, menu);
+  
+! 	    if (menu->mnemonic != 0)
+  	    {
+! 		PtAddHotkeyHandler(gui.vimWindow, tolower(menu->mnemonic),
+! 			Pk_KM_Alt, 0, menu, gui_ph_handle_pulldown_menu);
+  	    }
+  	}
+  
+! 	gui_ph_position_menu(menu->id, menu->priority);
+  
+  	/* Redraw menubar here instead of gui_mch_draw_menubar */
+! 	if (gui.menu_is_active)
+! 	    PtRealizeWidget(menu->id);
+      }
+!     else if (menu_is_popup(menu->name))
+      {
+! 	menu->submenu_id = PtCreateWidget(PtMenu, gui.vimWindow, 0, NULL);
+! 	PtAddCallback(menu->submenu_id, Pt_CB_UNREALIZED,
+! 		gui_ph_handle_menu_unrealized, menu);
+      }
+  }
+  
+***************
+*** 2681,2784 ****
+      PtArg_t args[13];
+  
+      n = 0;
+!     PtSetArg( &args[ n++ ], Pt_ARG_POINTER, menu, 0 );
+  
+  #ifdef FEAT_TOOLBAR
+!     if( menu_is_toolbar( parent->name ) )
+      {
+! 	if( menu_is_separator( menu->name ) )
+  	{
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_SEP_FLAGS,
+! 		    Pt_SEP_VERTICAL, Pt_SEP_ORIENTATION );
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_SEP_TYPE, Pt_ETCHED_IN, 0 );
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_ANCHOR_FLAGS,
+! 		    Pt_TRUE, Pt_ANCHOR_TOP_BOTTOM );
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_WIDTH, 2, 0 );
+! 	    menu->id = PtCreateWidget( PtSeparator, gui.vimToolBar, n, args );
+  	}
+  	else
+  	{
+! 	    if( strstr( (const char *) p_toolbar, "text" ) != NULL )
+  	    {
+! 		PtSetArg( &args[ n++ ], Pt_ARG_BALLOON_POSITION,
+! 			Pt_BALLOON_BOTTOM, 0 );
+! 		PtSetArg( &args[ n++ ], Pt_ARG_TEXT_STRING, menu->dname, 0 );
+! 		PtSetArg( &args[ n++ ], Pt_ARG_TEXT_FONT, "TextFont08", 0 );
+  	    }
+! 	    if( ( strstr( (const char *) p_toolbar, "icons" ) != NULL ) &&
+! 		    ( gui_ph_toolbar_images != NULL ) )
+  	    {
+! 		PtSetArg( &args[ n++ ], Pt_ARG_LABEL_IMAGE,
+! 			gui_ph_toolbar_find_icon( menu ), 0 );
+! 		PtSetArg( &args[ n++ ], Pt_ARG_LABEL_TYPE, Pt_TEXT_IMAGE, 0 );
+! 		PtSetArg( &args[ n++ ], Pt_ARG_TEXT_IMAGE_SPACING, 0, 0 );
+  	    }
+! 	    if( strstr( (const char *) p_toolbar, "tooltips" ) != NULL )
+  	    {
+! 		PtSetArg( &args[ n++ ], Pt_ARG_LABEL_BALLOON,
+! 			gui_ph_show_tooltip, 0 );
+! 		PtSetArg( &args[ n++ ], Pt_ARG_LABEL_FLAGS,
+! 			Pt_TRUE, Pt_SHOW_BALLOON );
+  	    }
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_MARGIN_HEIGHT, 1, 0 );
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_MARGIN_WIDTH, 1, 0 );
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_FLAGS, Pt_FALSE,
+! 		    Pt_HIGHLIGHTED | Pt_GETS_FOCUS );
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_FILL_COLOR, Pg_TRANSPARENT, 0 );
+! 	    menu->id = PtCreateWidget( PtButton, gui.vimToolBar, n, args );
+  
+! 	    PtAddCallback( menu->id, Pt_CB_ACTIVATE, gui_ph_handle_menu, menu );
+  	}
+  	/* Update toolbar if it's open */
+! 	if( PtWidgetIsRealized( gui.vimToolBar ) )
+! 	    PtRealizeWidget( menu->id );
+      }
+      else
+  #endif
+! 	if( menu_is_separator( menu->name ) )
+      {
+! 	menu->id = PtCreateWidget( PtSeparator, parent->submenu_id, n, args );
+      }
+      else
+      {
+! 	accel_key = vim_strchr( menu->name, '&' );
+! 	if( accel_key != NULL )
+  	{
+  	    mnemonic_str[0] = accel_key[1];
+  	    mnemonic_str[1] = NUL;
+  	}
+  
+! 	PtSetArg( &args[ n++ ], Pt_ARG_TEXT_STRING, menu->dname, 0 );
+! 	if( accel_key != NULL )
+! 	    PtSetArg( &args[ n++ ], Pt_ARG_ACCEL_KEY, mnemonic_str,
+! 		    0 );
+  
+! 	PtSetArg( &args[ n++ ], Pt_ARG_ACCEL_TEXT, menu->actext, 0 );
+  
+! 	menu->id = PtCreateWidget( PtMenuButton, parent->submenu_id, n, args );
+  
+! 	PtAddCallback( menu->id, Pt_CB_ACTIVATE, gui_ph_handle_menu, menu );
+  
+  #ifdef USE_PANEL_GROUP
+! 	if( gui_ph_is_buffer_item( menu, parent ) == TRUE )
+  	{
+! 	    PtAddCallback( menu->id, Pt_CB_DESTROYED,
+! 		    gui_ph_handle_buffer_remove, menu );
+! 	    gui_ph_pg_add_buffer( menu->dname );
+  	}
+  #endif
+      }
+  
+!     gui_ph_position_menu( menu->id, menu->priority );
+  }
+  
+      void
+  gui_mch_destroy_menu(vimmenu_T *menu)
+  {
+!     if( menu->submenu_id != NULL )
+! 	PtDestroyWidget( menu->submenu_id );
+!     if( menu->id != NULL )
+! 	PtDestroyWidget( menu->id );
+  
+      menu->submenu_id = NULL;
+      menu->id = NULL;
+--- 2681,2784 ----
+      PtArg_t args[13];
+  
+      n = 0;
+!     PtSetArg(&args[ n++ ], Pt_ARG_POINTER, menu, 0);
+  
+  #ifdef FEAT_TOOLBAR
+!     if (menu_is_toolbar(parent->name))
+      {
+! 	if (menu_is_separator(menu->name))
+  	{
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_SEP_FLAGS,
+! 		    Pt_SEP_VERTICAL, Pt_SEP_ORIENTATION);
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_SEP_TYPE, Pt_ETCHED_IN, 0);
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_ANCHOR_FLAGS,
+! 		    Pt_TRUE, Pt_ANCHOR_TOP_BOTTOM);
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_WIDTH, 2, 0);
+! 	    menu->id = PtCreateWidget(PtSeparator, gui.vimToolBar, n, args);
+  	}
+  	else
+  	{
+! 	    if (strstr((const char *) p_toolbar, "text") != NULL)
+  	    {
+! 		PtSetArg(&args[ n++ ], Pt_ARG_BALLOON_POSITION,
+! 			Pt_BALLOON_BOTTOM, 0);
+! 		PtSetArg(&args[ n++ ], Pt_ARG_TEXT_STRING, menu->dname, 0);
+! 		PtSetArg(&args[ n++ ], Pt_ARG_TEXT_FONT, "TextFont08", 0);
+  	    }
+! 	    if ((strstr((const char *) p_toolbar, "icons") != NULL) &&
+! 		    (gui_ph_toolbar_images != NULL))
+  	    {
+! 		PtSetArg(&args[ n++ ], Pt_ARG_LABEL_IMAGE,
+! 			gui_ph_toolbar_find_icon(menu), 0);
+! 		PtSetArg(&args[ n++ ], Pt_ARG_LABEL_TYPE, Pt_TEXT_IMAGE, 0);
+! 		PtSetArg(&args[ n++ ], Pt_ARG_TEXT_IMAGE_SPACING, 0, 0);
+  	    }
+! 	    if (strstr((const char *) p_toolbar, "tooltips") != NULL)
+  	    {
+! 		PtSetArg(&args[ n++ ], Pt_ARG_LABEL_BALLOON,
+! 			gui_ph_show_tooltip, 0);
+! 		PtSetArg(&args[ n++ ], Pt_ARG_LABEL_FLAGS,
+! 			Pt_TRUE, Pt_SHOW_BALLOON);
+  	    }
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_MARGIN_HEIGHT, 1, 0);
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_MARGIN_WIDTH, 1, 0);
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_FLAGS, Pt_FALSE,
+! 		    Pt_HIGHLIGHTED | Pt_GETS_FOCUS);
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_FILL_COLOR, Pg_TRANSPARENT, 0);
+! 	    menu->id = PtCreateWidget(PtButton, gui.vimToolBar, n, args);
+  
+! 	    PtAddCallback(menu->id, Pt_CB_ACTIVATE, gui_ph_handle_menu, menu);
+  	}
+  	/* Update toolbar if it's open */
+! 	if (PtWidgetIsRealized(gui.vimToolBar))
+! 	    PtRealizeWidget(menu->id);
+      }
+      else
+  #endif
+! 	if (menu_is_separator(menu->name))
+      {
+! 	menu->id = PtCreateWidget(PtSeparator, parent->submenu_id, n, args);
+      }
+      else
+      {
+! 	accel_key = vim_strchr(menu->name, '&');
+! 	if (accel_key != NULL)
+  	{
+  	    mnemonic_str[0] = accel_key[1];
+  	    mnemonic_str[1] = NUL;
+  	}
+  
+! 	PtSetArg(&args[ n++ ], Pt_ARG_TEXT_STRING, menu->dname, 0);
+! 	if (accel_key != NULL)
+! 	    PtSetArg(&args[ n++ ], Pt_ARG_ACCEL_KEY, mnemonic_str,
+! 		    0);
+  
+! 	PtSetArg(&args[ n++ ], Pt_ARG_ACCEL_TEXT, menu->actext, 0);
+  
+! 	menu->id = PtCreateWidget(PtMenuButton, parent->submenu_id, n, args);
+  
+! 	PtAddCallback(menu->id, Pt_CB_ACTIVATE, gui_ph_handle_menu, menu);
+  
+  #ifdef USE_PANEL_GROUP
+! 	if (gui_ph_is_buffer_item(menu, parent) == TRUE)
+  	{
+! 	    PtAddCallback(menu->id, Pt_CB_DESTROYED,
+! 		    gui_ph_handle_buffer_remove, menu);
+! 	    gui_ph_pg_add_buffer(menu->dname);
+  	}
+  #endif
+      }
+  
+!     gui_ph_position_menu(menu->id, menu->priority);
+  }
+  
+      void
+  gui_mch_destroy_menu(vimmenu_T *menu)
+  {
+!     if (menu->submenu_id != NULL)
+! 	PtDestroyWidget(menu->submenu_id);
+!     if (menu->id != NULL)
+! 	PtDestroyWidget(menu->id);
+  
+      menu->submenu_id = NULL;
+      menu->id = NULL;
+***************
+*** 2789,2800 ****
+  {
+      long    flags, mask, fields;
+  
+!     if( menu->id == NULL )
+  	return;
+  
+!     flags = PtWidgetFlags( menu->id );
+!     if( PtWidgetIsClass( menu->id, PtMenuButton ) &&
+! 	    PtWidgetIsClass( PtWidgetParent( menu->id ), PtMenu ) )
+      {
+  	fields = Pt_FALSE;
+  	mask = Pt_SELECTABLE | Pt_HIGHLIGHTED;
+--- 2789,2800 ----
+  {
+      long    flags, mask, fields;
+  
+!     if (menu->id == NULL)
+  	return;
+  
+!     flags = PtWidgetFlags(menu->id);
+!     if (PtWidgetIsClass(menu->id, PtMenuButton) &&
+! 	    PtWidgetIsClass(PtWidgetParent(menu->id), PtMenu))
+      {
+  	fields = Pt_FALSE;
+  	mask = Pt_SELECTABLE | Pt_HIGHLIGHTED;
+***************
+*** 2805,2815 ****
+  	mask = Pt_BLOCKED | Pt_GHOST;
+      }
+  
+!     if( ! grey )
+  	fields = ~fields;
+  
+!     PtSetResource( menu->id, Pt_ARG_FLAGS, fields,
+! 	    mask );
+  }
+  
+      void
+--- 2805,2815 ----
+  	mask = Pt_BLOCKED | Pt_GHOST;
+      }
+  
+!     if (! grey)
+  	fields = ~fields;
+  
+!     PtSetResource(menu->id, Pt_ARG_FLAGS, fields,
+! 	    mask);
+  }
+  
+      void
+***************
+*** 2830,2837 ****
+      void
+  gui_mch_show_popupmenu(vimmenu_T *menu)
+  {
+!     PtSetResource( menu->submenu_id, Pt_ARG_POS, &abs_mouse, 0 );
+!     PtRealizeWidget( menu->submenu_id );
+  }
+  
+      void
+--- 2830,2837 ----
+      void
+  gui_mch_show_popupmenu(vimmenu_T *menu)
+  {
+!     PtSetResource(menu->submenu_id, Pt_ARG_POS, &abs_mouse, 0);
+!     PtRealizeWidget(menu->submenu_id);
+  }
+  
+      void
+***************
+*** 2842,2855 ****
+  
+  #endif
+  
+! #if defined( FEAT_TOOLBAR ) || defined( PROTO )
+      void
+  gui_mch_show_toolbar(int showit)
+  {
+!     if( showit )
+! 	PtRealizeWidget( gui.vimToolBar );
+      else
+! 	PtUnrealizeWidget( gui.vimToolBar );
+  }
+  #endif
+  
+--- 2842,2855 ----
+  
+  #endif
+  
+! #if defined(FEAT_TOOLBAR) || defined(PROTO)
+      void
+  gui_mch_show_toolbar(int showit)
+  {
+!     if (showit)
+! 	PtRealizeWidget(gui.vimToolBar);
+      else
+! 	PtUnrealizeWidget(gui.vimToolBar);
+  }
+  #endif
+  
+***************
+*** 2870,2903 ****
+      FontQueryInfo   info;
+      int_u	    style;
+  
+!     font_tag = alloc( MAX_FONT_TAG );
+!     if( font_tag != NULL )
+      {
+! 	if( PfGenerateFontName( font_name, font_flags, font_size,
+! 		    font_tag ) != NULL )
+  	{
+  	    /* Enforce some limits on the font used */
+  	    style = PHFONT_INFO_FIXED;
+  
+! 	    if( enforce & PF_STYLE_BOLD )
+  		style |= PHFONT_INFO_BOLD;
+! 	    if( enforce & PF_STYLE_ANTIALIAS )
+  		style |= PHFONT_INFO_ALIAS;
+! 	    if( enforce & PF_STYLE_ITALIC )
+  		style |= PHFONT_INFO_ITALIC;
+  
+! 	    PfQueryFontInfo( font_tag, &info );
+  
+! 	    if( info.size == 0 )
+  		font_size = 0;
+  
+  	    /* Make sure font size matches, and that the font style
+  	     * at least has the bits we're checking for */
+! 	    if( font_size == info.size &&
+! 		    style == (info.style & style) )
+  		return (GuiFont)font_tag;
+  	}
+! 	vim_free( font_tag );
+      }
+      return NULL;
+  }
+--- 2870,2903 ----
+      FontQueryInfo   info;
+      int_u	    style;
+  
+!     font_tag = alloc(MAX_FONT_TAG);
+!     if (font_tag != NULL)
+      {
+! 	if (PfGenerateFontName(font_name, font_flags, font_size,
+! 		    font_tag) != NULL)
+  	{
+  	    /* Enforce some limits on the font used */
+  	    style = PHFONT_INFO_FIXED;
+  
+! 	    if (enforce & PF_STYLE_BOLD)
+  		style |= PHFONT_INFO_BOLD;
+! 	    if (enforce & PF_STYLE_ANTIALIAS)
+  		style |= PHFONT_INFO_ALIAS;
+! 	    if (enforce & PF_STYLE_ITALIC)
+  		style |= PHFONT_INFO_ITALIC;
+  
+! 	    PfQueryFontInfo(font_tag, &info);
+  
+! 	    if (info.size == 0)
+  		font_size = 0;
+  
+  	    /* Make sure font size matches, and that the font style
+  	     * at least has the bits we're checking for */
+! 	    if (font_size == info.size &&
+! 		    style == (info.style & style))
+  		return (GuiFont)font_tag;
+  	}
+! 	vim_free(font_tag);
+      }
+      return NULL;
+  }
+***************
+*** 2919,2936 ****
+  	char_u *vim_font,
+  	char_u **font_name,
+  	int_u *font_flags,
+! 	int_u *font_size )
+  {
+      char_u  *mark;
+      int_u   name_len, size;
+  
+!     mark = vim_strchr( vim_font, ':' );
+!     if( mark == NULL )
+! 	name_len = STRLEN( vim_font );
+      else
+! 	name_len = (int_u) ( mark - vim_font );
+  
+!     *font_name = vim_strnsave( vim_font, name_len );
+      if (*font_name != NULL)
+      {
+  	if (mark != NULL)
+--- 2919,2936 ----
+  	char_u *vim_font,
+  	char_u **font_name,
+  	int_u *font_flags,
+! 	int_u *font_size)
+  {
+      char_u  *mark;
+      int_u   name_len, size;
+  
+!     mark = vim_strchr(vim_font, ':');
+!     if (mark == NULL)
+! 	name_len = STRLEN(vim_font);
+      else
+! 	name_len = (int_u) (mark - vim_font);
+  
+!     *font_name = vim_strnsave(vim_font, name_len);
+      if (*font_name != NULL)
+      {
+  	if (mark != NULL)
+***************
+*** 2944,2950 ****
+  		    case 'i': *font_flags |= PF_STYLE_ITALIC; break;
+  
+  		    case 's':
+! 			size = getdigits( &mark );
+  			/* Restrict the size to some vague limits */
+  			if (size < 1 || size > 100)
+  			    size = 8;
+--- 2944,2950 ----
+  		    case 'i': *font_flags |= PF_STYLE_ITALIC; break;
+  
+  		    case 's':
+! 			size = getdigits(&mark);
+  			/* Restrict the size to some vague limits */
+  			if (size < 1 || size > 100)
+  			    size = 8;
+***************
+*** 2979,3031 ****
+  	vim_font_name = "PC Terminal";
+      }
+  
+!     if (STRCMP( vim_font_name, "*" ) == 0)
+      {
+! 	font_tag = PtFontSelection( gui.vimWindow, NULL, NULL,
+! 		"pcterm12", -1, PHFONT_FIXED, NULL );
+  
+  	if (font_tag == NULL)
+  	    return FAIL;
+  
+! 	gui_mch_free_font( gui.norm_font );
+  	gui.norm_font = font_tag;
+  
+! 	PfQueryFontInfo( font_tag, &info );
+! 	font_name = vim_strsave( info.font );
+      }
+      else
+      {
+! 	if (gui_ph_parse_font_name( vim_font_name, &font_name, &font_flags,
+! 		    &font_size ) == FALSE)
+  	    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;
+  	}
+  
+! 	gui_mch_free_font( gui.norm_font );
+  	gui.norm_font = font_tag;
+      }
+  
+!     gui_mch_free_font( gui.bold_font );
+!     gui.bold_font = gui_ph_get_font( font_name, font_flags | PF_STYLE_BOLD,
+! 	    font_size, PF_STYLE_BOLD );
+! 
+!     gui_mch_free_font( gui.ital_font );
+!     gui.ital_font = gui_ph_get_font( font_name, font_flags | PF_STYLE_ITALIC,
+! 	    font_size, PF_STYLE_ITALIC );
+  
+      /* This extent was brought to you by the letter 'g' */
+!     PfExtentText( &extent, NULL, font_tag, "g", 1 );
+  
+      gui.char_width = extent.lr.x - extent.ul.x + 1;
+      gui.char_height = (- extent.ul.y) + extent.lr.y + 1;
+      gui.char_ascent = - extent.ul.y;
+  
+!     vim_free( font_name );
+      return OK;
+  }
+  
+--- 2979,3031 ----
+  	vim_font_name = "PC Terminal";
+      }
+  
+!     if (STRCMP(vim_font_name, "*") == 0)
+      {
+! 	font_tag = PtFontSelection(gui.vimWindow, NULL, NULL,
+! 		"pcterm12", -1, PHFONT_FIXED, NULL);
+  
+  	if (font_tag == NULL)
+  	    return FAIL;
+  
+! 	gui_mch_free_font(gui.norm_font);
+  	gui.norm_font = font_tag;
+  
+! 	PfQueryFontInfo(font_tag, &info);
+! 	font_name = vim_strsave(info.font);
+      }
+      else
+      {
+! 	if (gui_ph_parse_font_name(vim_font_name, &font_name, &font_flags,
+! 		    &font_size) == FALSE)
+  	    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;
+  	}
+  
+! 	gui_mch_free_font(gui.norm_font);
+  	gui.norm_font = font_tag;
+      }
+  
+!     gui_mch_free_font(gui.bold_font);
+!     gui.bold_font = gui_ph_get_font(font_name, font_flags | PF_STYLE_BOLD,
+! 	    font_size, PF_STYLE_BOLD);
+! 
+!     gui_mch_free_font(gui.ital_font);
+!     gui.ital_font = gui_ph_get_font(font_name, font_flags | PF_STYLE_ITALIC,
+! 	    font_size, PF_STYLE_ITALIC);
+  
+      /* This extent was brought to you by the letter 'g' */
+!     PfExtentText(&extent, NULL, font_tag, "g", 1);
+  
+      gui.char_width = extent.lr.x - extent.ul.x + 1;
+      gui.char_height = (- extent.ul.y) + extent.lr.y + 1;
+      gui.char_ascent = - extent.ul.y;
+  
+!     vim_free(font_name);
+      return OK;
+  }
+  
+***************
+*** 3037,3043 ****
+  {
+      FontQueryInfo info;
+  
+!     PfQueryFontInfo( gui.norm_font, &info );
+  
+      gui.char_height = - info.ascender + info.descender + p_linespace;
+      gui.char_ascent = - info.ascender + p_linespace / 2;
+--- 3037,3043 ----
+  {
+      FontQueryInfo info;
+  
+!     PfQueryFontInfo(gui.norm_font, &info);
+  
+      gui.char_height = - info.ascender + info.descender + p_linespace;
+      gui.char_ascent = - info.ascender + p_linespace / 2;
+***************
+*** 3053,3070 ****
+      int_u   font_size = 12;
+      int_u   font_flags = 0;
+  
+!     if (gui_ph_parse_font_name( vim_font_name, &font_name, &font_flags,
+! 		&font_size ) != FALSE)
+      {
+! 	font_tag = gui_ph_get_font( font_name, font_flags, font_size, -1 );
+! 	vim_free( font_name );
+  
+  	if (font_tag != NULL)
+  	    return (GuiFont)font_tag;
+      }
+  
+      if (report_error)
+! 	EMSG2(e_font, vim_font_name );
+  
+      return FAIL;
+  }
+--- 3053,3070 ----
+      int_u   font_size = 12;
+      int_u   font_flags = 0;
+  
+!     if (gui_ph_parse_font_name(vim_font_name, &font_name, &font_flags,
+! 		&font_size) != FALSE)
+      {
+! 	font_tag = gui_ph_get_font(font_name, font_flags, font_size, -1);
+! 	vim_free(font_name);
+  
+  	if (font_tag != NULL)
+  	    return (GuiFont)font_tag;
+      }
+  
+      if (report_error)
+! 	EMSG2(e_font, vim_font_name);
+  
+      return FAIL;
+  }
+***************
+*** 3088,3099 ****
+      void
+  gui_mch_set_font(GuiFont font)
+  {
+!     PgSetFont( font );
+  }
+  
+      void
+  gui_mch_free_font(GuiFont font)
+  {
+!     vim_free( font );
+  }
+  
+--- 3088,3099 ----
+      void
+  gui_mch_set_font(GuiFont font)
+  {
+!     PgSetFont(font);
+  }
+  
+      void
+  gui_mch_free_font(GuiFont font)
+  {
+!     vim_free(font);
+  }
+  
+*** ../vim-7.3.309/src/version.c	2011-09-14 15:41:54.000000000 +0200
+--- src/version.c	2011-09-14 16:01:50.000000000 +0200
+***************
+*** 711,712 ****
+--- 711,714 ----
+  {   /* Add new patch number below this line */
++ /**/
++     310,
+  /**/
+
+-- 
+An operatingsystem is just a name you give to the rest of bloating
+idiosyncratic machine-based-features you left out of your editor.
+			(author unknown)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///