x-popup-menu

x-popup-menu

[Stefan Monnier]

I've just consolidated the X(&msdos), w32, and ns code of x-popup-menu
into menu.c.
I've only tested the X11 version, and left some #ifdefs which I suspect
are not needed.  Please test and fix as needed for other GUI backends,
and please take a look at the FIXMEs in it to see if you have some idea
what should be done,


        Stefan

Re: x-popup-menu

[Juri Linkov]

> I've just consolidated the X(&msdos), w32, and ns code of x-popup-menu
> into menu.c.
> I've only tested the X11 version, and left some #ifdefs which I suspect
> are not needed.  Please test and fix as needed for other GUI backends,

On a non-toolkit X build, `make bootstrap' fails with:

xmenu.c:2320: error: static declaration of 'xmenu_show' follows non-static declaration
menu.h:46: error: previous declaration of 'xmenu_show' was here
make[2]: *** [xmenu.o] Error 1

where xmenu.c:2320 contains:

static Lisp_Object
xmenu_show (f, x, y, for_click, keymaps, title, error, timestamp)

and menu.h:46 contains:

extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int,
			       Lisp_Object, char **, EMACS_UINT);

But the same function cannot be static and extern at the same time.

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: x-popup-menu

[Stefan Monnier]

>> I've just consolidated the X(&msdos), w32, and ns code of x-popup-menu
>> into menu.c.
>> I've only tested the X11 version, and left some #ifdefs which I suspect
>> are not needed.  Please test and fix as needed for other GUI backends,

> On a non-toolkit X build, `make bootstrap' fails with:

> xmenu.c:2320: error: static declaration of 'xmenu_show' follows non-static declaration
> menu.h:46: error: previous declaration of 'xmenu_show' was here
> make[2]: *** [xmenu.o] Error 1

IIUC this has been fixed,


        Stefan

Re: x-popup-menu

[Eli Zaretskii]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Date: Mon, 09 Nov 2009 01:23:01 -0500
> 
> I've just consolidated the X(&msdos), w32, and ns code of x-popup-menu
> into menu.c.
> I've only tested the X11 version, and left some #ifdefs which I suspect
> are not needed.  Please test and fix as needed for other GUI backends,
> and please take a look at the FIXMEs in it to see if you have some idea
> what should be done,

Works in the MSDOS port, after one small fix in menu.c (see today's
logs).

By the way, why didn't you move x-popup-dialog as well?

Re: x-popup-menu

[Stefan Monnier]

> Works in the MSDOS port, after one small fix in menu.c (see today's
> logs).

Thank you.

> By the way, why didn't you move x-popup-dialog as well?

Because I haven't done it yet.


        Stefan

Re: x-popup-menu

[Chad Brown]

In order to get menu.c to compile --with-ns, I had to remove some code  
that Stefan had marked FIXME.   That code was since changed by  
davidsweldt:

> revision 1.19
> date: 2009-11-11 16:26:11 -0800;  author: davidswelt;  state: Exp;   
> lines: +2 -6;  commitid: SpotPAAAts8c8abu;
> menu.c (Fx_popup_menu): Remove left-over debugging code and rename  
> variables to fix 2009-11-09 change.

the current code builds and seems to run fine with limited testing,  
but to address Stefan's FIXME:  I just removed the code and the result  
also seems to work fine under macosx, with limited testing.  I'd be  
happy to test further if someone could suggest areas to exercise.

Thanks,
*Chad


--- menu.c	2009-11-13 13:12:46.000000000 -0800
+++ menu.c-y	2009-11-11 01:34:10.000000000 -0800
@@ -1182,13 +1182,8 @@
  	CHECK_LIVE_WINDOW (window);
  	f = XFRAME (WINDOW_FRAME (win));

-#ifdef HAVE_NS		     /* FIXME: Is this necessary??  --Stef  */
-        xpos = FRAME_COLUMN_WIDTH (f) * WINDOW_LEFT_EDGE_COL (win);
-	ypos = FRAME_LINE_HEIGHT (f) * WINDOW_TOP_EDGE_LINE (win);
-#else
  	xpos = WINDOW_LEFT_EDGE_X (win);
  	ypos = WINDOW_TOP_EDGE_Y (win);
-#endif
        }
      else
        /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,

Re: x-popup-menu

[Stefan Monnier]

> --- menu.c	2009-11-13 13:12:46.000000000 -0800
> +++ menu.c-y	2009-11-11 01:34:10.000000000 -0800
> @@ -1182,13 +1182,8 @@
>  	CHECK_LIVE_WINDOW (window);
>  	f = XFRAME (WINDOW_FRAME (win));

> -#ifdef HAVE_NS		     /* FIXME: Is this necessary??  --Stef  */
> -        xpos = FRAME_COLUMN_WIDTH (f) * WINDOW_LEFT_EDGE_COL (win);
> -	ypos = FRAME_LINE_HEIGHT (f) * WINDOW_TOP_EDGE_LINE (win);
> -#else
>  	xpos = WINDOW_LEFT_EDGE_X (win);
>  	ypos = WINDOW_TOP_EDGE_Y (win);
> -#endif
>        }
>      else
>        /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,


Thanks,


        Stefan