Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-17 13:56:03 +00:00
Code Issues Projects Releases Packages Wiki Activity
96680 commits 254 branches 195 tags 722 MiB
Commit graph

31 commits

Author SHA1 Message Date
Jan D
42ca463309 Fix -Wwrite_strings in general and for Gtk+ specific code. 
* callproc.c (synch_process_death): Make const.
(Fcall_process): Make signame const.

* emacs.c (main): Pass char[] to putenv instead of literal.

* floatfns.c (matherr): Use a const char* variable for x->name.

* font.c (font_open_by_name): Make name const.

* font.h (font_open_by_name): Make name const.

* gtkutil.c (get_utf8_string): Always return an allocated string.
Parameter is const.
(create_dialog, xg_create_one_menuitem, create_menus)
(xg_item_label_same_p, xg_update_menu_item): Free result from
get_utf8_string.
(xg_separator_p, xg_item_label_same_p): label is const.

* gtkutil.h: Replace widget_value with struct _widget_value.
(enum button_type, struct _widget_value): Remove and use the one from
keyboard.h.

* keyboard.h (_widget_value): Add defined USE_GTK.  Replace Boolean
with unsigned char and XtPointer with void *.

* menu.c (Fx_popup_menu): error_name is const.

* menu.h (w32_menu_show, ns_menu_show, xmenu_show): error parameter
is const char **.

* w32menu.c (w32_menu_show):
* nsmenu.m (ns_menu_show): error parameter is const char **.

* process.h (synch_process_death): Is const char*.

* xmenu.c (Fx_popup_dialog): error_name is const char*.
(xmenu_show): error parameter is const char **. pane_string is const
char *.
(button_names): Is const char *.
(xdialog_show): error_name and pane_string is const.

* xrdb.c (get_system_app): Make path const and use char *p for non-const
char.

* xselect.c (Fx_get_atom_name): Use char empty[] instead of literal "".

* xsmfns.c (NOSPLASH_OPT): Change to char[].
(smc_save_yourself_CB): Do xstrdup on all ->type and ->name for
props.  Free them at the end.

* xterm.c (emacs_class): New char[] for EMACS_CLASS.
(xim_open_dpy, xim_initialize, xim_close_dpy): Use emacs_class.
(x_term_init): Use char[] display_opt and name_opt instead of
string literal. file is const char*.
 2010-08-11 14:34:46 +02:00
Dan Nicolaescu
675e2c697b Use const char* instead of char*. 
* src/xterm.c (x_create_toolkit_scroll_bar):
* src/xfont.c (xfont_list_pattern):
* src/xfns.c (x_default_scroll_bar_color_parameter)
(xic_create_fontsetname, x_default_font_parameter)
(x_screen_planes):
* src/xdisp.c (c_string_pos, number_of_chars, reseat_to_string)
(store_mode_line_string, decode_mode_spec, display_string):
* src/menu.c (digest_single_submenu):
* src/keymap.h (initial_define_key, initial_define_lispy_key):
* src/keymap.c (initial_define_key, initial_define_lispy_key):
* src/image.c (image_error, image_keyword):
* src/gtkutil.h (xg_create_widget, xg_create_scroll_bar):
* src/gtkutil.c (xg_create_widget, xg_create_scroll_bar):
* src/ftfont.c (struct fc_charset_table, ftfont_spec_pattern)
(ftfont_list, ftfont_match):
* src/frame.c (frame_parm_table):
* src/font.h (font_intern_prop, font_parse_xlfd, font_parse_fcname)
(font_unparse_fcname, font_unparse_fcname, font_open_by_name)
(font_add_log, font_deferred_log):
* src/font.c (font_intern_prop, font_parse_xlfd, font_parse_fcname)
(font_unparse_fcname, font_unparse_fcname, font_open_by_name)
(font_add_log, font_deferred_log):
* src/emacs.c (argmatch):
* src/dispextern.h (struct it):
* src/coding.c (ENCODE_DESIGNATION):
* src/charset.c (define_charset_internal): Use const.
 2010-08-08 14:03:45 -07:00
Dan Nicolaescu
04bab72cc6 Remove extern declarations in .c files, .h files have them. 
* src/data.c:
* src/dired.c:
* src/editfns.c:
* src/filelock.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/ftfont.c:
* src/gtkutil.c:
* src/indent.c:
* src/keyboard.c:
* src/keymap.c:
* src/lread.c:
* src/menu.c:
* src/print.c:
* src/search.c:
* src/sound.c:
* src/window.c:
* src/xdisp.c:
* src/xfaces.c:
* src/xfns.c:
* src/xfont.c:
* src/xftfont.c:
* src/xmenu.c:
* src/xterm.c: Remove declarations.
 2010-08-05 16:34:12 -07:00
Juanma Barranquero
94da839793 * menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS". 2010-07-23 12:32:02 +02:00
Dan Nicolaescu
5842a27bbf Convert DEFUNs to standard C. 
* src/alloc.c: Convert DEFUNs to standard C.
* src/buffer.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/dosfns.c:
* src/editfns.c:
* src/emacs.c:
* src/eval.c:
* src/fileio.c:
* src/filelock.c:
* src/floatfns.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/image.c:
* src/indent.c:
* src/insdel.c:
* src/keyboard.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/menu.c:
* src/minibuf.c:
* src/msdos.c:
* src/nsfns.m:
* src/nsmenu.m:
* src/nsselect.m:
* src/print.c:
* src/process.c:
* src/search.c:
* src/sound.c:
* src/syntax.c:
* src/term.c:
* src/terminal.c:
* src/textprop.c:
* src/undo.c:
* src/w16select.c:
* src/w32console.c:
* src/w32fns.c:
* src/w32font.c:
* src/w32menu.c:
* src/w32proc.c:
* src/w32select.c:
* src/window.c:
* src/xdisp.c:
* src/xfaces.c:
* src/xfns.c:
* src/xmenu.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c: Likewise.
 2010-07-08 14:25:08 -07:00
Dan Nicolaescu
971de7fb15 Convert (most) functions in src to standard C. 
* src/alloc.c: Convert function definitions to standard C.
* src/atimer.c:
* src/bidi.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/ccl.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/doprnt.c:
* src/ecrt0.c:
* src/editfns.c:
* src/fileio.c:
* src/filelock.c:
* src/filemode.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/ftfont.c:
* src/ftxfont.c:
* src/gtkutil.c:
* src/indent.c:
* src/insdel.c:
* src/intervals.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/md5.c:
* src/menu.c:
* src/minibuf.c:
* src/prefix-args.c:
* src/print.c:
* src/ralloc.c:
* src/regex.c:
* src/region-cache.c:
* src/scroll.c:
* src/search.c:
* src/sound.c:
* src/strftime.c:
* src/syntax.c:
* src/sysdep.c:
* src/termcap.c:
* src/terminal.c:
* src/terminfo.c:
* src/textprop.c:
* src/tparam.c:
* src/undo.c:
* src/unexelf.c:
* src/window.c:
* src/xfaces.c:
* src/xfns.c:
* src/xfont.c:
* src/xftfont.c:
* src/xgselect.c:
* src/xmenu.c:
* src/xrdb.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c:
* src/xterm.c: Likewise.
 2010-07-04 00:50:25 -07:00
Jan D
f57e2426f0 Remove __P and P_ from .c and .m files and definition of P_ 
* lisp.h:
* atimer.h: Remove define for P_.

* alloc.c: Remove __P and P_ from .c and .m files.
* atimer.c:
* buffer.c:
* callint.c:
* category.c:
* charset.c:
* chartab.c:
* cm.c:
* coding.c:
* composite.c:
* data.c:
* dired.c:
* dispnew.c:
* doc.c:
* editfns.c:
* emacs.c:
* eval.c:
* fileio.c:
* filelock.c:
* fns.c:
* font.c:
* fontset.c:
* frame.c:
* ftfont.c:
* ftxfont.c:
* gmalloc.c:
* gtkutil.c:
* image.c:
* indent.c:
* intervals.c:
* keyboard.c:
* keymap.c:
* lread.c:
* marker.c:
* menu.c:
* minibuf.c:
* print.c:
* process.c:
* scroll.c:
* search.c:
* sound.c:
* strftime.c:
* syntax.c:
* sysdep.c:
* term.c:
* terminal.c:
* textprop.c:
* unexalpha.c:
* w32console.c:
* w32fns.c:
* w32font.c:
* w32menu.c:
* w32term.c:
* w32uniscribe.c:
* window.c:
* xdisp.c:
* xfaces.c:
* xfns.c:
* xfont.c:
* xftfont.c:
* xmenu.c:
* xselect.c:
* xterm.c: Likewise.

* ebrowse.c: Remove P_ and __P.
* etags.c:
* movemail.c:
* pop.c:
* update-game-score.c: Likewise.
 2010-07-02 14:19:53 +02:00
Jan Djärv
99852628a8 Lucid menus can now use Xft for fonts. 
* xsettings.c (current_font, SYSTEM_FONT, XSETTINGS_FONT_NAME): New.
(parse_xft_settings): Also check for XSETTINGS_FONT_NAME and save that
in current_font.
(init_gconf): Read value of SYSTEM_FONT and save it in current_font.
(Ffont_get_system_normal_font, xsettings_get_system_normal_font): New
functions.
(syms_of_xsettings): Initialize current_font. defsubr
Sfont_get_system_normal_font.

* xsettings.h (Ffont_get_system_normal_font,
xsettings_get_system_normal_font): Declare.

* xfns.c (extern xlwmenu_default_font): Remove.
(Fx_create_frame): Remove setting of xlwmenu_default_font, moved
to xlwmenu.c.

* menu.c (digest_single_submenu): If USE_LUCID and HAVE_XFT, encode
menu items in UTF-8.

* xmenu.c: include xsettings.h and xlwmenu.h if USE_LUCID.
(apply_systemfont_to_menu): New function.
(set_frame_menubar, create_and_show_popup_menu): Call
apply_systemfont_to_menu.

* xlwmenu.c (xlwmenu_default_font): Make static.
(xlwMenuResources): Add XtNfaceName and XtNdefaultFace.
(string_width): Use XftTextExtentsUtf8 if HAVE_XFT.
(MENU_FONT_HEIGHT, MENU_FONT_ASCENT): Add versions for
HAVE_XFT.
(size_menu): Set max_rest_width in window_state structure.
(display_menu_item): If HAVE_XFT and xft_draw is set, use
XftDrawRect and XftDrawStringUtf8 to draw text.
(make_windows_if_needed): Set max_rest_width and xft_draw
in windows[i].
(openXftFont): New.
(XlwMenuInitialize): Call openXftFont if HAVE_XFT. If mw->menu.font
is not set, load font fixed and save it in xlwmenu_default_font.
(XlwMenuInitialize): Set max_rest_width and xft_draw in windows[0].
(XlwMenuClassInitialize): Initialize xlwmenu_default_font.
(XlwMenuRealize): Set xft_fg, xft_bg, xft_disabled_fg and
windows[0].xft_draw if xft_font is set.
(XlwMenuDestroy): Destroy all xft_draw and close xft_font.
(facename_changed): New.
(XlwMenuSetValues): Call facename_changed. If face name did change,
close old fonts and destroy xft_draw:s.  Then create new ones.

* xlwmenu.h (XtNfaceName, XtCFaceName, XtNdefaultFace,
XtCDefaultFace): New.

* xlwmenuP.h (_window_state): Add max_rest_width and xft_draw.
(_XlwMenu_part): Add faceName,xft_fg, xft_bg, xft_disabled_fg and
xft_font.

* xresources.texi (Lucid Resources): Mention faceName to set Xft fonts.
 2010-04-08 18:20:32 +02:00
Chong Yidong
a6d676d9f4 * menu.c (Fx_popup_menu): Use last_event_timestamp (Bug#4930). 2010-03-30 19:26:38 -04:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Stefan Monnier
b7c7a4d1f8 (Fx_popup_menu) [HAVE_NS]: Use generic code for window edge. 
Suggested by Chad Brown <yandros@mit.edu>.
(push_menu_item): Use MENU_ITEMS_ITEM_* names.
 2009-11-17 03:32:04 +00:00
Eli Zaretskii
dc92c039bc (Fx_popup_menu): Call Fx_hide_tip only if HAVE_WINDOW_SYSTEM. 2009-11-13 10:09:05 +00:00
David Reitter
cf54c75498 menu.c (Fx_popup_menu): Remove left-over debugging code and rename variables to fix 2009-11-09 change. 2009-11-12 00:26:09 +00:00
Stefan Monnier
045b83c00a (Fx_popup_menu) [HAVE_NS]: Remove unused vars. 2009-11-10 18:07:09 +00:00
Juanma Barranquero
04e452cb31 * menu.c [HAVE_NTGUI]: Declare current_popup_menu. 2009-11-09 11:07:05 +00:00
Stefan Monnier
ef7417fd76 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c, 
w32menu.c, and nsmenu.m.
Simplify the obsolete case where position is nil.
(cleanup_popup_menu): New function, moved from nsmenu.m.
(struct skp): Remove slot `notreal'.
(single_keymap_panes, keymap_panes): Remove arg `notreal' and adjust callers.
(single_menu_item): Adjust call to parse_menu_item.
(syms_of_menu): Defsubr x-popup-menu.
* menu.h (Vmenu_updating_frame): Consolidate declarations from *menu.c.
(keymap_panes): Don't export any more.
(mouse_position_for_popup, w32_menu_show, ns_menu_show, xmenu_show): Declare.
* keyboard.c (parse_menu_item): Remove arg `notreal'.
(menu_bar_item, read_char_minibuf_menu_prompt): Adjust callers.
* keyboard.h (parse_menu_item): Update declaration.
* xmenu.c (Fx_popup_menu): Remove.
(syms_of_xmenu): Don't defsubr x-popup-menu.
* w32menu.c (Fx_popup_menu): Remove.
(syms_of_w32menu): Don't defsubr x-popup-menu.
* nsmenu.m (cleanup_popup_menu): Remove.
(ns_menu_show): Rename from ns_popup_menu and remove all the code
moved to menu.c's Fx_popup_menu.
(Fx_popup_menu): Remove.
(syms_of_nsmenu): Don't defsubr x-popup-menu, and don't initialize
menu_items (it's done in menu.c already).
 2009-11-09 06:21:03 +00:00
Dan Nicolaescu
d7306fe6b1 * alloc.c: Do not define struct catchtag. 
* eval.c: Move struct catchtag definition ...
* lisp.h: ... here.

* image.c: Move png.h #include earlier to avoid warnings.

* xterm.c:
* xsmfns.c:
* xselect.c:
* xrdb.c:
* xmenu.c:
* xftfont.c:
* xfont.c:
* xfns.c:
* xfaces.c:
* xdisp.c:
* window.c:
* widget.c:
* w32xfns.c:
* w32uniscribe.c:
* w32term.c:
* w32select.c:
* w32reg.c:
* w32proc.c:
* w32menu.c:
* w32inevt.c:
* w32heap.c:
* w32font.c:
* w32fns.c:
* w32console.c:
* w32.c:
* w16select.c:
* vm-limit.c:
* unexsol.c:
* unexec.c:
* unexcw.c:
* unexaix.c:
* undo.c:
* tparam.c:
* textprop.c:
* terminfo.c:
* terminal.c:
* termcap.c:
* term.c:
* syntax.c:
* sound.c:
* sheap.c:
* search.c:
* scroll.c:
* region-cache.c:
* regex.c:
* ralloc.c:
* process.c:
* print.c:
* msdos.c:
* minibuf.c:
* menu.c:
* marker.c:
* macros.c:
* keymap.c:
* keyboard.c:
* intervals.c:
* insdel.c:
* indent.c:
* gtkutil.c:
* ftxfont.c:
* ftfont.c:
* fringe.c:
* frame.c:
* fontset.c:
* font.c:
* fns.c:
* floatfns.c:
* filelock.c:
* fileio.c:
* emacs.c:
* editfns.c:
* dosfns.c:
* doprnt.c:
* doc.c:
* dispnew.c:
* dired.c:
* dbusbind.c:
* data.c:
* composite.c:
* coding.c:
* cmds.c:
* cm.c:
* chartab.c:
* charset.c:
* character.c:
* ccl.c:
* category.c:
* casetab.c:
* casefiddle.c:
* callproc.c:
* callint.c:
* bytecode.c:
* buffer.c:
* atimer.c: Include setjmp.h.  (Bug#4643)

* xlwmenu.c:
* lwlib.c:
* lwlib-utils.c:
* lwlib-Xm.c:
* lwlib-Xlw.c:
* lwlib-Xaw.c: Include setjmp.h.
 2009-10-19 04:27:09 +00:00
Adrian Robert
31c2d41266 * menu.c (find_and_return_menu_selection) [HAVE_NS]: Remove double-casting in client_data comparison. 2009-09-27 16:21:47 +00:00
Glenn Morris
76b6f70759 Add 2009 to copyright years. 2009-01-08 03:15:17 +00:00
Adrian Robert
2da2fd38fb * menu.c (find_and_return_menu_selection) Add cast. 2008-10-04 01:20:43 +00:00
Eli Zaretskii
dda8632194 (single_menu_item) [!HAVE_BOXES]: Enable emulation of toggle boxes and 
radio buttons on MS-DOS as well.
 2008-09-05 14:42:05 +00:00
Adrian Robert
07b87a106a fix popup menu selection return (menu.c); add use of popup_activated under NS (nsmenu.m, xdisp.c); improve comments (lisp.h, s/darwin.h); use FORWARD_SIGNAL_TO_MAIN_THREAD (syssignal.h) 2008-08-04 16:57:44 +00:00
Stefan Monnier
facfbbbdad * Makefile.in: Undef LIB_STANDARD before defining it to silence warning 
in case it was defined already.
USE @GNUSTEP_MAKEFILES@ rather than envvars.
* nsterm.m (ns_term_init): Pass Qt and Qnil rather than YES/NO to
ns_default.
(applicationShouldTerminate, setValuesFromPanel): Use EQ to compare
Lisp_Objects.
* nsterm.h (Fx_display_grayscale_p, Fx_display_planes)
(ns_defined_color, ns_color_to_lisp): Declare.
* nsselect.m (ns_handle_selection_request, ns_handle_selection_clear)
(Fns_own_selection_internal): Make the big ugly hack more explicit, so
it's accepted even with USE_LISP_UNION_TYPE.
* nsmenu.m (ns_update_menubar): Use EQ to compare Lisp_Objects.
(update_frame_tool_bar): Remove apparently obsolete tests for
non-integerness of f->tool_bar_lines.
(windowShouldClose, addButton, clicked, runDialogAt): Make the big ugly
hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE.
* nsfont.m (nsfont_driver): Use just 0 rather than an invalid cast.
(nsfont_open): Don't confuse NULL for Qnil.
* nsfns.m (ns_implicitly_set_icon_type): Use EQ to compare Lisp_Objects.
* menu.h (find_and_call_menu_selection):
* menu.c (find_and_call_menu_selection): Use just int for vector size.
(find_and_return_menu_selection): Always return something.
* frame.h: Include dispextern.h for Display_Info.
(display_x_get_resource): Declare.
* configure.in: Extract and substitute GNUSTEP_MAKEFILES.
 2008-07-17 03:33:59 +00:00
Adrian Robert
edfda78355 merging Emacs.app (NeXTstep port) 2008-07-15 18:15:18 +00:00
Andreas Schwab
e7c9048f9d * menu.h: New file. 
* menu.c: Include it.
* xmenu.c: Likewise.
* Makefile.in: Update dependencies.
 2008-07-11 11:20:21 +00:00
Jason Rumney
593c843ca9 (single_keymap_panes, push_menu_pane, push_menu_item): Make static again. 2008-06-09 21:55:16 +00:00
Jason Rumney
3a408e5854 * menu.c [HAVE_NTGUI]: Include w32term.h, move widget related 
defs to w32gui.h.
(single_keymap_panes, push_menu_item, push_menu_pane): Make
globally visible.
 2008-06-09 12:57:42 +00:00
Jason Rumney
a8495745c0 Include w32term.h, move widget related 
defs there.
 2008-06-09 12:36:49 +00:00
Miles Bader
041fa0d4e3 Add arch tagline 2008-06-08 18:09:06 +00:00
Andreas Schwab
a4240420ba * menu.c [HAVE_X_WINDOWS]: Include "xterm.h". 
* Makefile.in (menu.o): Update dependencies.
 2008-06-08 09:26:02 +00:00
Chong Yidong
279a1d4b0b * menu.c: New file. Relocate platform-independent menu definitions 
from xmenu.c.
 2008-06-08 04:36:08 +00:00