1. 26 Oct, 2010 1 commit
  2. 01 Oct, 2010 1 commit
    • Dan Nicolaescu's avatar
      Do not include stdlib.h and string.h, config.h does it. · 4cacd822
      Dan Nicolaescu authored
      * src/xfont.c:
      * src/w32term.c:
      * src/w32reg.c:
      * src/w32inevt.c:
      * src/w32heap.c:
      * src/w32console.c:
      * src/w16select.c:
      * src/unexsol.c:
      * src/term.c:
      * src/sound.c:
      * src/scroll.c (m):
      * src/gtkutil.c:
      * src/font.c:
      * src/filelock.c:
      * src/fileio.c:
      * src/dosfns.c:
      * src/dbusbind.c:
      * src/bidi.c:
      * src/callproc.c:
      * src/process.c:
      * src/msdos.c:
      * src/charset.c: Do not include stdlib.h and string.h, config.h does it.
      
      * configure.in: Include stdlib.h and string.h unconditionally.
      4cacd822
  3. 17 Sep, 2010 2 commits
  4. 18 Aug, 2010 1 commit
  5. 17 Aug, 2010 1 commit
  6. 11 Aug, 2010 2 commits
    • Jan D's avatar
      Take colors for region face (selected text) from the Gtk+ theme. · 3a46642b
      Jan D authored
      * lisp/dynamic-setting.el (dynamic-setting-handle-config-changed-event):
      Handle theme-name change.
      
      * lisp/faces.el (region): Add type gtk that uses gtk colors.
      
      * src/gtkutil.c (xg_check_special_colors, style_changed_cb): New functions.
      (xg_create_frame_widgets): Connect theme name changes to
      style_changed_cb.
      
      * src/gtkutil.h (xg_check_special_colors): Declare.
      
      * src/xfns.c (x_defined_color): If USE_GTK, call xg_check_special_colors
      first.
      3a46642b
    • Jan D's avatar
      Fix -Wwrite_strings in general and for Gtk+ specific code. · 42ca4633
      Jan D authored
      * 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*.
      42ca4633
  7. 09 Aug, 2010 1 commit
    • Dan Nicolaescu's avatar
      Use const char* instead of char*. · 8ea90aa3
      Dan Nicolaescu authored
      Reduce the number of warnings with -Wwrite-strings.
      * src/xrdb.c (get_environ_db, get_system_name):
      * src/unexelf.c (find_section):
      * src/term.c (string_cost, string_cost_one_line, per_line_cost)
      (get_named_tty, init_tty):
      * src/sysdep.c (sys_subshell):
      * src/sound.c (sound_perror, sound_warning, vox_open, vox_init)
      (alsa_sound_perror, alsa_open, alsa_configure, alsa_init):
      * src/search.c (Freplace_match):
      * src/process.c (Fmake_network_process, send_process, init_process):
      * src/lread.c (Fload, init_lread):
      * src/keymap.c (Fdescribe_buffer_bindings, describe_map_tree):
      * src/keyboard.c (parse_tool_bar_item, struct event_head):
      * src/gtkutil.h (xg_get_font_name):
      * src/gtkutil.c (get_dialog_title, create_dialog, xg_get_font_name)
      (make_widget_for_menu_item, make_menu_item, create_menus)
      (xg_make_tool_item):
      * src/font.c (parse_matrix, font_parse_name):
      * src/floatfns.c (rounding_driver, float_error_fn_name):
      * src/filelock.c (get_boot_time_1, lock_file_1):
      * src/fileio.c (barf_or_query_if_file_exists, check_writable):
      * src/editfns.c (get_system_name, get_operating_system_release)
      (Fencode_time, Fset_time_zone_rule):
      * src/dispextern.h (string_cost, per_line_cost, get_named_tty, init_tty):
      * src/buffer.c (defvar_per_buffer): Use const.
      8ea90aa3
  8. 08 Aug, 2010 1 commit
    • Dan Nicolaescu's avatar
      Use const char* instead of char*. · 675e2c69
      Dan Nicolaescu authored
      * 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.
      675e2c69
  9. 06 Aug, 2010 1 commit
  10. 05 Aug, 2010 1 commit
    • Dan Nicolaescu's avatar
      Remove extern declarations in .c files, .h files have them. · 04bab72c
      Dan Nicolaescu authored
      * 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.
      04bab72c
  11. 02 Aug, 2010 1 commit
    • Jan Djärv's avatar
      Don't use Gtk+ tooltip unless Gtk+ version => 2.14. · ac01763e
      Jan Djärv authored
      * gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless
      USE_GTK_TOOLTIP.
      (xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP
      (xg_show_tooltip, xg_hide_tooltip): Do nothing unless
      USE_GTK_TOOLTIP.
      (xg_create_frame_widgets): Surrond tooltip-related code with ifdef
      USE_GTK_TOOLTIP.
      (xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP.
      
      * xterm.h (USE_GTK_TOOLTIP): New define.
      (struct x_output): Put ttip_* inside ifdef USE_GTK_TOOLTIP.
      ac01763e
  12. 01 Aug, 2010 1 commit
    • Jan D's avatar
      Use Gtk+ tooltips by default for Gtk+ Emacs. · aa1859f5
      Jan D authored
      * lisp/cus-start.el (x-gtk-use-system-tooltips): New variable.
      
      * src/gtkutil.c (hierarchy_ch_cb, qttip_cb, xg_prepare_tooltip)
      (xg_show_tooltip, xg_hide_tooltip, xg_free_frame_widgets): New
      functions.
      (xg_create_frame_widgets): Set ttip_* to 0.  Set a dummy tooltip
      text so qttip_cb is called.  Connect query-tooltip to qttip_cb.
      Remove code that is commented out.
      
      * src/gtkutil.h (xg_free_frame_widgets, xg_prepare_tooltip)
      (xg_show_tooltip, xg_hide_tooltip): Declare.
      
      * src/xfns.c (x_gtk_use_system_tooltips): New variable.
      (Fx_show_tip): If USE_GTK and x_gtk_use_system_tooltips, call
      new gtkutil tooltip functions to show the tooltip.
      (Fx_hide_tip): Call xg_hide_tooltip.
      (syms_of_xfns): Defvar x-gtk-use-system-tooltips.
      
      * src/xterm.c (x_clear_frame): Check FRAME_GTK_WIDGET (f) before
      calling gtk_widget_queue_draw.
      (x_free_frame_resources): Call xg_free_frame_widgets.
      
      * src/xterm.h (struct x_output): Add ttip_widget, ttip_window and
      ttip_lbl.
      aa1859f5
  13. 29 Jul, 2010 1 commit
    • Jan Djärv's avatar
      Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top. · bfeabdc3
      Jan Djärv authored
      * lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
      (menu-bar-showhide-tool-bar-menu-customize-disable)
      (menu-bar-showhide-tool-bar-menu-customize-enable-right)
      (menu-bar-showhide-tool-bar-menu-customize-enable-top)
      (menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions
      (menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
      make a menu for Options => toolbar that can move it.
      
      * src/frame.c (Qtool_bar_position): New variable.
      (make_frame): Set tool_bar_position to Qtop.
      (frame_parms): Add tool-bar-position.
      (x_report_frame_params): Store tool_bar_position.
      (x_set_fringe_width): Reset wm size hint after fringe changes.
      
      * src/frame.h (struct frame): Add tool_bar_position.
      (Qbottom): Declare.
      
      * src/gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
      (xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
      (xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
      (xg_create_frame_widgets): Create a hobox for placing widgets
      vertically.  Use gtk_box_pack_start.
      (xg_height_or_width_changed): Renamed from xg_height_changed.
      (x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
      (xg_update_frame_menubar, free_frame_menubar): Change to
      xg_height_or_width_changed.
      (xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
      size correctly.  Remove hardcoded 4, instead use handlebox size -
      toolbar size.
      (xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
      size correctly.  Use handlebox size + toolbar size as additional
      size.
      (xg_pack_tool_bar): POS is a new parameter.
      Set orientation of tool bar based on pos.
      Only make handlebox_widget if NULL.
      Check if tool bar goes to vbox or hbox depending on pos.
      (xg_update_tool_bar_sizes): New function.
      (update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar
      height, call xg_update_tool_bar_sizes instead.
      (free_frame_tool_bar): Remove from hbox or vbox depending on
      toolbar_in_hbox,  Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
      (xg_change_toolbar_position): New function.
      
      * src/gtkutil.h (xg_change_toolbar_position): Declare.
      
      * src/window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
      and FRAME_TOOLBAR_LEFT_WIDTH.
      
      * src/xfns.c (x_set_tool_bar_position): New function.
      (xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
      (x_frame_parm_handlers): Add x_set_tool_bar_position.
      (syms_of_xfns): if USE_GTK, provide move-toolbar.
      
      * src/xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
      
      * src/xterm.h (struct x_output): Add toolbar_top_height,
      toolbar_bottom_height, toolbar_left_width, toolbar_right_width.  Remove
      toolbar_height.
      if USE_GTK: Add hbox_widget and toolbar_in_hbox.
      (FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
      (FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
      (FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
      bfeabdc3
  14. 28 Jul, 2010 1 commit
    • Jan Djärv's avatar
      Add tool bar style text-image-horiz (text to the left of the image). · 8a52f00a
      Jan Djärv authored
      * lisp/cus-start.el (tool-bar-style): Add text-image-horiz.
      
      * src/gtkutil.c (xg_make_tool_item, xg_show_toolbar_item): Handle tool bar
      style text_image_horiz.
      
      * src/lisp.h (Qtext_image_horiz): Declare.
      
      * src/xdisp.c (Qtext_image_horiz): Define.
      (syms_of_xdisp): Initialize Qtext_image_horiz.  Add text-image-horiz
      to ducumentation of tool-bar-style.
      
      * src/xsettings.c (Ftool_bar_get_system_style): Also check for
      Qtext_image_horiz.
      8a52f00a
  15. 17 Jul, 2010 2 commits
  16. 14 Jul, 2010 1 commit
    • Jan D's avatar
      Fix menus as per bug 6499 and 6608. · b78f9767
      Jan D authored
      * gtkutil.c (xg_event_is_for_menubar): New function (Bug#6499).
      
      * gtkutil.h (xg_event_is_for_menubar): Declare.
      
      * xfns.c (x_menubar_window_to_frame): Take XEvent as second parameter
      instead of Window.  Call xg_event_is_for_menubar when
      USE_GTK (Bug#6499).
      
      * xmenu.c (x_activate_menubar): Revert previous fix for Bug#6499,
      i.e. don't put back ButtonRelease (Bug#6608).
      
      * xterm.c (handle_one_xevent): Pass event to x_menubar_window_to_frame.
      
      * xterm.h (x_menubar_window_to_frame): Second parameter is XEvent*.
      b78f9767
  17. 12 Jul, 2010 1 commit
    • Andreas Schwab's avatar
      Convert old-style definitions · d5a3eaaf
      Andreas Schwab authored
      * editfns.c (transpose_markers): Convert old-style definition.
      * emacs.c (abort, shut_down_emacs, fixup_locale)
      (synchronize_system_time_locale)
      (synchronize_system_messages_locale, syms_of_emacs): Likewise.
      * floatfns.c (extract_float, matherr, init_floatfns)
      (syms_of_floatfns): Likewise.
      * fns.c (make_hash_table): Likewise.
      * ftfont.c (ftfont_get_otf, ftfont_otf_features)
      (ftfont_otf_capability, ftfont_get_glyph_id, ftfont_get_metrics)
      (ftfont_drive_otf, ftfont_shape_by_flt, ftfont_shape)
      (ftfont_variation_glyphs): Likewise.
      * gtkutil.c (xg_create_widget, xg_modify_menubar_widgets): Likewise.
      * keymap.c (describe_map_tree, describe_map, describe_vector): Likewise.
      * lread.c (read_filtered_event): Likewise.
      * minibuf.c (read_minibuf_noninteractive, read_minibuf): Likewise.
      * process.c (wait_reading_process_output): Likewise.
      * scroll.c (do_line_insertion_deletion_costs): Likewise.
      * search.c (search_buffer, boyer_moore): Likewise.
      * syntax.c (scan_sexps_forward): Likewise.
      * xdisp.c (try_scrolling): Likewise.
      * xfaces.c (face_at_buffer_position, face_for_overlay_string)
      (face_at_string_position): Likewise.
      * xfns.c (x_default_scroll_bar_color_parameter): Likewise.
      * xselect.c (x_get_window_property, receive_incremental_selection)
      (x_get_window_property_as_lisp_data, lisp_data_to_selection_data):
      Likewise.
      * xterm.c (x_draw_relief_rect, x_draw_box_rect): Likewise.
      d5a3eaaf
  18. 05 Jul, 2010 2 commits
    • Jan D's avatar
      Fix some bad prototypes and formatting after conversion from K&R declaration. · e4c8d29a
      Jan D authored
      * lwlib/lwlib-Xaw.c: Include <ctype.h> for isdigit.
      (fill_xft_data, set_text): Remove unused variable screen.
      (draw_text): Cast bp to FcChar8*.
      (find_xft_data): Return 0 if inst or xft_data is not set.
      (wm_delete_window): Correct prototype.  Initialize widget to 0
      and return if widget is still 0 after loop.
      
      * lwlib/xlwmenu.c (XlwMenuSetValues, XlwMenuInitialize): Correct prototype.
      (display_menu_item): Remove unused variable gi.
      (make_windows_if_needed): Remove unused variable screen.
      (XlwMenuRedisplay): Remove unused variable i.
      
      * src/gtkutil.c (xg_get_pixbuf_from_pix_and_mask)
      (xg_get_image_for_pixmap, create_dialog)
      (xg_get_file_with_selection, xg_get_file_name, update_cl_data)
      (menuitem_highlight_callback, make_menu_item)
      (xg_create_one_menuitem, create_menus, xg_update_menu_item)
      (xg_create_scroll_bar, xg_update_scrollbar_pos)
      (xg_set_toolkit_scroll_bar_thumb, xg_tool_bar_button_cb)
      (xg_tool_bar_proxy_help_callback, xg_tool_bar_detach_callback)
      (xg_tool_bar_attach_callback, xg_tool_bar_help_callback)
      (xg_tool_bar_item_expose_callback): Reformat prototype.
      (xg_update_menubar): GList *group => GSList *group.
      (xg_modify_menubar_widgets): Initialize witem to 0, check witem != 0
      before use.
      (update_frame_tool_bar): 4:th param to xg_get_image_for_pixmap changed
      to GTK_IMAGE (wimage).
      
      * src/xsettings.c (something_changedCB, parse_settings)
      (apply_xft_settings): Reformat prototype.
      (something_changedCB, init_gconf): Remove unused variable i.
      (read_settings): Remove unused variable long_len.
      
      * src/xsmfns.c (SSDATA): New macro.
      (smc_save_yourself_CB, x_session_initialize): Use SSDATA for strings
      passed to strlen/strcpy/strcat.
      (create_client_leader_window): Surround with #ifndef USE_GTK.  Cast
      7:th arg to XChangeProperty to (unsigned char *)
      e4c8d29a
    • Dan Nicolaescu's avatar
      Convert declarations or definitions to standard C. · dd4c5104
      Dan Nicolaescu authored
      * src/xsmfns.c (smc_save_yourself_CB, smc_error_handler):
      * src/xrdb.c (get_system_name):
      * src/window.c (shrink_windows):
      * src/syntax.c (forw_comment):
      * src/scroll.c (calculate_scrolling, calculate_direct_scrolling)
      (ins_del_costs):
      * src/mem-limits.h (start_of_data):
      * src/lread.c (readevalloop):
      * src/gtkutil.c (xg_dialog_response_cb, xg_get_file_with_chooser)
      (xg_get_file_with_selection, xg_update_menubar, xg_update_submenu):
      * src/frame.c (x_get_focus_frame):
      * src/floatfns.c (fmod_float):
      * src/fileio.c (choose_write_coding_system):
      * src/emacs.c (fatal_error_signal, init_cmdargs, argmatch)
      (malloc_initialize_hook, sort_args, synchronize_locale):
      * src/doprnt.c (doprnt):
      * src/dired.c (compile_pattern):
      * src/data.c (fmod_float):
      * src/chartab.c (map_sub_char_table, map_sub_char_table_for_charset)
      (map_char_table_for_charset):
      * src/charset.c (define_charset_internal):
      * src/alloc.c (Fgarbage_collect): Convert declarations or definitions
      to standard C.
      dd4c5104
  19. 04 Jul, 2010 1 commit
    • Dan Nicolaescu's avatar
      Convert (most) functions in src to standard C. · 971de7fb
      Dan Nicolaescu authored
      * 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.
      971de7fb
  20. 02 Jul, 2010 1 commit
    • Jan D's avatar
      Remove __P and P_ from .c and .m files and definition of P_ · f57e2426
      Jan D authored
      * 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.
      f57e2426
  21. 28 Jun, 2010 1 commit
    • Jan D's avatar
      Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE. · e547b051
      Jan D authored
      * configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY,
      check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied
      by minimum required Gtk+ 2.6).  Add checks for functions introduced
      in Gtk+ 2.14 or newer.
      
      * xterm.h (gtk_widget_get_window, gtk_widget_get_mapped)
      (gtk_adjustment_get_page_size, gtk_adjustment_get_upper): New
      defines based on what configure finds.
      
      * xterm.c (XTflash): Use gtk_widget_get_window.
      (xg_scroll_callback): Use gtk_adjustment_get_upper and
      gtk_adjustment_get_page_size.
      (handle_one_xevent): Use gtk_widget_get_mapped.
      (x_term_init): Remove HAVE_GTK_MULTIDISPLAY and associated error
      messages.
      
      * xmenu.c (create_and_show_popup_menu): Call gtk_widget_get_mapped.
      
      * gtkutil.h: Replace HAVE_GTK_FILE_BOTH with
      HAVE_GTK_FILE_SELECTION_NEW.
      
      * gtkutil.c (xg_display_open, xg_display_close): Remove
      HAVE_GTK_MULTIDISPLAY, it is always defined.
      (xg_display_open): Return type is void.
      (gtk_widget_set_has_window)
      (gtk_dialog_get_action_area, gtk_dialog_get_content_area)
      (gtk_widget_get_sensitive, gtk_adjustment_set_page_size)
      (gtk_adjustment_set_page_increment)
      (gtk_adjustment_get_step_increment): #define these if not found
      by configure.
      (remove_submenu): New define based on Gtk+ version.
      (xg_set_cursor, xg_frame_resized, xg_event_is_for_scrollbar): Use
      gtk_widget_get_window.
      (xg_frame_resized, xg_update_frame_menubar): Use gtk_widget_get_mapped.
      (xg_create_frame_widgets): Use gtk_widget_set_has_window.
      (create_dialog): Use gtk_dialog_get_action_area and
      gtk_dialog_get_content_area.
      (xg_uses_old_file_dialog, xg_get_file_name): Remove HAVE_GTK_FILE_BOTH
      and HAVE_GTK_FILE_CHOOSER_DIALOG_NEW.  File chooser is always
      available, so checking for HAVE_GTK_FILE_SELECTION_NEW is enough.
      (xg_update_menubar, xg_update_submenu, xg_show_toolbar_item): Use
      g_object_ref and g_object_unref.
      (xg_update_menu_item, xg_tool_bar_menu_proxy): Use
      gtk_widget_get_sensitive.
      (xg_update_submenu): Use remove_submenu.
      (xg_update_scrollbar_pos): Don't use GtkFixedChild, use child
      properties instead to get old x and y position.
      (xg_set_toolkit_scroll_bar_thumb): Use gtk_adjustment_get_page_size,
      gtk_adjustment_get_step_increment, gtk_adjustment_set_page_size,
      gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment.
      (xg_get_tool_bar_widgets): New function.
      (xg_tool_bar_menu_proxy, xg_show_toolbar_item)
      (update_frame_tool_bar): Call xg_get_tool_bar_widgets.
      (toolbar_set_orientation): New #define based on if configure
      finds gtk_orientable_set_orientation.
      (xg_create_tool_bar): Call toolbar_set_orientation.
      (xg_make_tool_item, xg_show_toolbar_item): Call gtk_box_pack_start
      instead of gtk_box_pack_start_defaults.
      e547b051
  22. 24 Jun, 2010 1 commit
  23. 22 Jun, 2010 1 commit
    • Jan Djärv's avatar
      Hide scroll bar when window is too small to avoid Gtk+ warning. · bc869eca
      Jan Djärv authored
      * gtkutil.c (xg_update_scrollbar_pos): Show/hide scroll bar as needed
      if height is less than scroll bar min size.
      (xg_show_scroll_bar): Remove, show moved to xg_update_scrollbar_pos.
      
      * gtkutil.h (xg_show_scroll_bar): : Remove.
      
      * xterm.c (x_scroll_bar_create): Remove call to xg_show_scroll_bar.
      bc869eca
  24. 08 May, 2010 1 commit
    • Jan D's avatar
      Fix bug #6139, text is briefly shown in tool bar on startup. · 4721152c
      Jan D authored
       * xsettings.c (Ftool_bar_get_system_style): Correct comment.
      
       * gtkutil.c (xg_pack_tool_bar): Change show_all to show for handle
       box and toolbar (Bug #6139).
       (xg_create_tool_bar): Remove comment (Bug #6139).
       (xg_make_tool_item): Remove gtk_widget_show_all (Bug #6139).
       (xg_show_toolbar_item): Add gtk_widget_show for weventbox (Bug #6139).
      4721152c
  25. 23 Apr, 2010 1 commit
  26. 20 Apr, 2010 2 commits
    • Jan Djärv's avatar
      Gtk tool bars can be text, icons with text or just icons. · f904c0f9
      Jan Djärv authored
      * xsettings.c: Qmonospace_font_name, Qtool_bar_style and
      current_tool_bar_style are new.
      (store_config_changed_event): Rename from store_font_changed_event.
      (XSETTINGS_TOOL_BAR_STYLE): New define.
      (SEEN_FONT, SEEN_TB_STYLE): New enum values.
      (struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
      HAVE_XFT.
      (something_changedCB): store_font_changed_event is now
      store_config_changed_event
      (parse_settings): Rename from parse_xft_settings.  Read
      non-xft xsettings outside #ifdef HAVE_XFT.
      (read_settings): Renamed from read_xft_settings.
      (apply_xft_settings): Take current settings as parameter.  Do not
      call read_(xft)_settings.
      (read_and_apply_settings): New function.
      (xft_settings_event): Do non-xft stuff out of HAVE_XFT.  Call
      read_and_apply_settings if there are settings to be read.
      (init_xsettings): Renamed from init_xfd_settings.
      Call read_and_apply_settings unconditionally.
      (xsettings_initialize): Call init_xsettings.
      (Ftool_bar_get_system_style): New function.
      (syms_of_xsettings): Define Qmonospace_font_name and
      Qtool_bar_style.  Initialize current_tool_bar_style to nil.
      defsubr Stool_bar_get_system_style. Fprovide on
      dynamic-setting.
      
      * xsettings.h (Ftool_bar_get_system_style): Declare.
      
      * xdisp.c: Vtool_bar_style, tool_bar_max_label_size,
      Qtext, Qboth, Qboth_horiz are new.
      (syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR
      Vtool_bar_style, tool_bar_max_label_size.
      
      * lisp.h: Extern declare Qtext, Qboth, Qboth_horiz.
      
      * keyboard.c: QClabel is new.
      (parse_tool_bar_item): Take out QClabel from tool bar items.
      Try to construct a label if ther is no QClabel.
      (syms_of_keyboard): Intern :label as QClabel.
      
      * dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
      (Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE):
      New.
      
      * Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to
      dynamic-setting.el.
      
      * gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item.
      (xg_make_tool_item, xg_show_toolbar_item): New function.
      (update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL.
      Call xg_make_tool_item to make a tool bar item.
      Call xg_show_toolbar_item.  Use wtoolbar instead of x->toolbar_widget.
      
      * xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin
      into account for toolbars.
      
      * vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items.
      
      * tool-bar.el (tool-bar-setup): Add :label on some tool bar items.
      
      * loadup.el: Load dynamic-setting.el if feature dynamic-setting
      is present.
      
      * info.el (info-tool-bar-map): Add labels.
      
      * cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size.
      
      * cus-edit.el (custom-commands): Add labels for tool bar.
      (custom-buffer-create-internal, Custom-mode): Adjust for
      labels in custom-commands.
      
      * dynamic-setting.el: Renamed from font-setting.el.
      f904c0f9
    • Jan Djärv's avatar
  27. 18 Apr, 2010 1 commit
  28. 13 Apr, 2010 1 commit
  29. 24 Feb, 2010 1 commit
    • Jan Djärv's avatar
      Move declarations before statements. · 32e737d7
      Jan Djärv authored
      * xterm.c (XTflash): Move declarations before statements.
      
      * gtkutil.c (xg_get_gdk_display): Remove (unused).
      (xg_get_pixbuf_from_pix_and_mask, xg_create_frame_widgets)
      (xg_toggle_notify_cb, xg_set_toolkit_scroll_bar_thumb)
      (xg_create_tool_bar): Remove unused variables.
      (x_wm_set_size_hint): Move declarations before statements.
      (xg_create_frame_widgets): Remove variable grav,
      32e737d7
  30. 13 Jan, 2010 1 commit
  31. 05 Jan, 2010 1 commit
    • Jan Djärv's avatar
      Handle change of internal-border width when maximized. · 7c583cd8
      Jan Djärv authored
      * xterm.c (x_new_font): Move code for setting rows/cols before
      resizing ...
      (x_set_window_size): ... to here. bug #2568.
      
      * gtkutil.c (xg_clear_under_internal_border): New function.
      (xg_frame_resized, xg_frame_set_char_size): Call
      xg_clear_under_internal_border.
      (xg_update_scrollbar_pos): Clear under old scroll bar position.
      7c583cd8
  32. 13 Dec, 2009 1 commit
    • Jan Djärv's avatar
      Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel. · e5f0bc9a
      Jan Djärv authored
      * xterm.c (xg_scroll_callback): Parameter list changed,
      use parameter GtkScrollType to determine scroll/line/page.
      Only allow dragging if a button < 4 is grabbed (bug #5177).
      (xg_end_scroll_callback): New function.
      (x_create_toolkit_scroll_bar): Pass xg_end_scroll_callback to
      xg_create_scroll_bar.
      
      * gtkutil.c (xg_gtk_scroll_destroy): Remove XG_LAST_SB_DATA handling.
      (scroll_end_callback): Remove.
      (xg_create_scroll_bar): Add parameter end_callback, bind it to
      button-release-event.  Replace value-changed event with change-value,
      bug #5177,
      (xg_event_is_for_scrollbar): Only return true if button is less than 4,
      bug #5177.
      
      * gtkutil.h (XG_LAST_SB_DATA): Remove.
      (xg_create_scroll_bar): Add GCallback end_callback.
      e5f0bc9a
  33. 12 Dec, 2009 1 commit
  34. 09 Dec, 2009 1 commit
  35. 21 Nov, 2009 1 commit
    • Jan Djärv's avatar
      Use a select wrapper around the GLib event loop, thus taking into account GLib · 872870b2
      Jan Djärv authored
      timeouts and event sources.  This simplifies Gtk+-code a lot, and is needed
      for handling GConf death/restart.
      
      * xterm.c: #include xgselect.h.
      (x_initialize): Call xgselect_initialize.
      
      * xsettings.c (something_changedCB): C++ comments => C comments.
      (init_gconf): Do not deal with any GLib file descriptors, xg_select
      does that now.
      
      * gtkutil.c (xg_timer, xg_process_timeouts, xg_start_timer)
      (xg_stop_timer, menu_grab_callback_cnt, menu_grab_callback)
      (scroll_bar_button_cb): Remove.
      (create_menus): C++ comments => C comments. Don't bind grab-notify
      event.
      (xg_create_scroll_bar): Don't bind button-press-event and
      button-release-event.
      
      * process.c: Include xgselect.h if defined (USE_GTK) ||
      defined (HAVE_GCONF).
      (wait_reading_process_output): Call xg_select for the same condition.
      
      * xgselect.c (xg_select): New function to better integrate with
      GLib/Gtk event handling.  Needed if GConf daemon dies/restarts.
      
      * xgselect.h: New file, declare xg_select, xgselect_initialize.
      
      * Makefile.in (XOBJ): Add xgselect.o.
      872870b2