1994-03-11 09:56:39 +00:00
|
|
|
|
/* The lwlib interface to Athena widgets.
|
2011-02-10 05:03:29 +00:00
|
|
|
|
|
2007-02-27 03:08:59 +00:00
|
|
|
|
Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
|
2018-01-01 08:21:42 +00:00
|
|
|
|
Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
|
1994-03-11 09:56:39 +00:00
|
|
|
|
|
|
|
|
|
This file is part of the Lucid Widget Library.
|
|
|
|
|
|
2003-02-04 14:56:31 +00:00
|
|
|
|
The Lucid Widget Library is free software; you can redistribute it and/or
|
1994-03-11 09:56:39 +00:00
|
|
|
|
modify it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 1, or (at your option)
|
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
|
|
The Lucid Widget Library is distributed in the hope that it will be useful,
|
2003-02-04 14:56:31 +00:00
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
1994-03-11 09:56:39 +00:00
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
|
along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
|
1994-03-11 09:56:39 +00:00
|
|
|
|
|
Add support for large files, plus some locale improvements.
* dispatch.c, lwlib-Xaw.c, lwlib-Xlw.c, lwlib-Xm.c, lwlib.c, xlwmenu.c,
xrdb-cpp.c, xrdb.c:
Include <config.h> before any system include files.
* lwlib-Xm.c, lwlib.c:
Do not include <stdlib.h> or <string.h>, as <config.h> does this.
1999-10-19 07:21:16 +00:00
|
|
|
|
#include <config.h>
|
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
#include <stdio.h>
|
2009-10-19 04:27:09 +00:00
|
|
|
|
#include <setjmp.h>
|
1994-03-11 09:56:39 +00:00
|
|
|
|
|
2011-02-10 05:03:29 +00:00
|
|
|
|
#include <lisp.h>
|
2001-12-02 05:00:27 +00:00
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
#include "lwlib-Xaw.h"
|
|
|
|
|
|
|
|
|
|
#include <X11/StringDefs.h>
|
|
|
|
|
#include <X11/IntrinsicP.h>
|
|
|
|
|
#include <X11/CoreP.h>
|
|
|
|
|
#include <X11/Shell.h>
|
|
|
|
|
|
2007-06-13 17:34:30 +00:00
|
|
|
|
#ifdef HAVE_XAW3D
|
|
|
|
|
#include <X11/Xaw3d/Scrollbar.h>
|
|
|
|
|
#include <X11/Xaw3d/Paned.h>
|
|
|
|
|
#include <X11/Xaw3d/Dialog.h>
|
|
|
|
|
#include <X11/Xaw3d/Form.h>
|
|
|
|
|
#include <X11/Xaw3d/Command.h>
|
|
|
|
|
#include <X11/Xaw3d/Label.h>
|
|
|
|
|
#else /* !HAVE_XAW3D */
|
1994-03-11 09:56:39 +00:00
|
|
|
|
#include <X11/Xaw/Scrollbar.h>
|
|
|
|
|
#include <X11/Xaw/Paned.h>
|
|
|
|
|
#include <X11/Xaw/Dialog.h>
|
|
|
|
|
#include <X11/Xaw/Form.h>
|
|
|
|
|
#include <X11/Xaw/Command.h>
|
|
|
|
|
#include <X11/Xaw/Label.h>
|
2007-06-13 17:34:30 +00:00
|
|
|
|
#endif /* HAVE_XAW3D */
|
1994-03-11 09:56:39 +00:00
|
|
|
|
|
|
|
|
|
#include <X11/Xatom.h>
|
|
|
|
|
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XFT
|
|
|
|
|
#include <X11/Xft/Xft.h>
|
|
|
|
|
|
|
|
|
|
struct widget_xft_data
|
|
|
|
|
{
|
|
|
|
|
Widget widget;
|
|
|
|
|
XftFont *xft_font;
|
|
|
|
|
XftDraw *xft_draw;
|
|
|
|
|
XftColor xft_fg, xft_bg;
|
|
|
|
|
int p_width, p_height;
|
|
|
|
|
Pixmap p;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
Change function definition from K&R to prototype. Fix prototype warnings.
* lwlib-Xaw.c (xaw_generic_callback, command_reset)
(xaw_update_one_value): Reformat.
(xaw_update_one_widget): Reformat and remove dead code.
(xaw_scrollbar_scroll, xaw_scrollbar_jump, xaw_create_scrollbar)
(xaw_update_scrollbar): Remove (not used).
(make_dialog): Change from K&R to prototype. Remove dead code.
(xaw_creation_table): Remove scrollbar entry.
* lwlib-Xlw.c (x_print_complete_resource_name): Change from K&R to
prototype.
(xlw_update_one_value): Reformat.
* lwlib-Xm.c (x_print_complete_resource_name)
(make_destroyed_instance, free_destroyed_instance, first_child)
(lw_motif_widget_p, resource_motif_string, destroy_all_children)
(xm_arm_callback, xm_update_label, xm_update_list)
(xm_update_pushbutton, xm_update_cascadebutton)
(xm_update_toggle, xm_update_radiobox, make_menu_in_widget)
(update_one_menu_entry, xm_update_menu, xm_update_text)
(xm_update_text_field, xm_update_one_widget)
(xm_update_one_value, activate_button, dialog_key_cb)
(make_dialog, mark_dead_instance_destroyed)
(find_matching_instance, recenter_widget, recycle_instance)
(xm_create_dialog, make_menubar, remove_grabs, make_popup_menu)
(make_main, xm_destroy_instance, xm_popup_menu)
(set_min_dialog_size, xm_pop_instance, do_call)
(xm_internal_update_other_instances, xm_generic_callback)
(xm_nosel_callback, xm_pull_down_callback, xm_pop_down_callback)
(xm_set_keyboard_focus, xm_set_main_areas, xm_manage_resizing): Change
from K&R to prototype.
* lwlib-int.h (widget_creation_function): Fix prototype.
* lwlib.c (allocate_widget_info, lw_register_widget): Change from K&R
to prototype.
(lw_internal_update_other_instances, merge_widget_value): Reformat.
* xlwmenu.c (size_menu_item): Change from K&R to prototype.
Change label_width and height to int.
(draw_arrow, draw_shadow_rectangle, draw_shadow_rhombus)
(draw_separator, display_menu, fit_to_screen, motion_event_is_in_menu)
(map_event_to_widget_value): Reformat.
(display_menu_item): Change from K&R to prototype.
2010-07-08 10:29:51 +00:00
|
|
|
|
static void xaw_generic_callback (Widget widget,
|
|
|
|
|
XtPointer closure,
|
|
|
|
|
XtPointer call_data);
|
1994-03-11 09:56:39 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Boolean
|
2010-07-04 05:47:55 +00:00
|
|
|
|
lw_xaw_widget_p (Widget widget)
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
|
|
|
|
return (XtIsSubclass (widget, scrollbarWidgetClass) ||
|
|
|
|
|
XtIsSubclass (widget, dialogWidgetClass));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XFT
|
|
|
|
|
static void
|
|
|
|
|
fill_xft_data (struct widget_xft_data *data, Widget widget, XftFont *font)
|
|
|
|
|
{
|
|
|
|
|
Pixel bg, fg;
|
|
|
|
|
XColor colors[2];
|
|
|
|
|
|
2010-04-21 16:13:55 +00:00
|
|
|
|
data->widget = widget;
|
|
|
|
|
data->xft_font = font;
|
2010-04-11 18:25:09 +00:00
|
|
|
|
XtVaGetValues (widget,
|
|
|
|
|
XtNbackground, &bg,
|
|
|
|
|
XtNforeground, &fg,
|
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
|
|
colors[0].pixel = data->xft_fg.pixel = fg;
|
|
|
|
|
colors[1].pixel = data->xft_bg.pixel = bg;
|
|
|
|
|
XQueryColors (XtDisplay (widget),
|
|
|
|
|
DefaultColormapOfScreen (XtScreen (widget)),
|
|
|
|
|
colors, 2);
|
|
|
|
|
|
|
|
|
|
data->xft_fg.color.alpha = 0xFFFF;
|
|
|
|
|
data->xft_fg.color.red = colors[0].red;
|
|
|
|
|
data->xft_fg.color.green = colors[0].green;
|
|
|
|
|
data->xft_fg.color.blue = colors[0].blue;
|
|
|
|
|
data->xft_bg.color.alpha = 0xFFFF;
|
|
|
|
|
data->xft_bg.color.red = colors[1].red;
|
|
|
|
|
data->xft_bg.color.green = colors[1].green;
|
|
|
|
|
data->xft_bg.color.blue = colors[1].blue;
|
|
|
|
|
|
|
|
|
|
data->p = None;
|
|
|
|
|
data->xft_draw = 0;
|
|
|
|
|
data->p_width = data->p_height = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static XftFont*
|
|
|
|
|
openFont (Widget widget, char *name)
|
|
|
|
|
{
|
|
|
|
|
char *fname = name;
|
|
|
|
|
int screen = XScreenNumberOfScreen (XtScreen (widget));
|
|
|
|
|
int len = strlen (fname), i = len-1;
|
|
|
|
|
XftFont *fn;
|
|
|
|
|
|
|
|
|
|
/* Try to convert Gtk-syntax (Sans 9) to Xft syntax Sans-9. */
|
Use ASCII tests for character types.
* admin/merge-gnulib (GNULIB_MODULES): Add c-ctype.
* lwlib/lwlib-Xaw.c, lwlib/lwlib.c, lwlib/xlwmenu.c:
Don't include <ctype.h>; no longer needed.
* lwlib/lwlib-Xaw.c (openFont):
* lwlib/xlwmenu.c (openXftFont): Test just for ASCII digits.
* src/category.c, src/dispnew.c, src/doprnt.c, src/editfns.c, src/syntax.c
* src/term.c, src/xfns.c, src/xterm.c:
Don't include <ctype.h>; was not needed.
* src/charset.c, src/doc.c, src/fileio.c, src/font.c, src/frame.c:
* src/gtkutil.c, src/image.c, src/sysdep.c, src/xfaces.c:
Include <c-ctype.h> instead of <ctype.h>.
* src/nsterm.m: Include <c-ctype.h>.
* src/charset.c (read_hex):
* src/doc.c (Fsnarf_documentation):
* src/fileio.c (IS_DRIVE) [WINDOWSNT]:
(DRIVE_LETTER) [DOS_NT]:
(Ffile_name_directory, Fexpand_file_name)
(Fsubstitute_in_file_name):
* src/font.c (font_parse_xlfd, font_parse_fcname):
* src/frame.c (x_set_font_backend):
* src/gtkutil.c (xg_get_font):
* src/image.c (xbm_scan, xpm_scan, pbm_scan_number):
* src/nsimage.m (hexchar):
* src/nsterm.m (ns_xlfd_to_fontname):
* src/sysdep.c (system_process_attributes):
* src/xfaces.c (hash_string_case_insensitive):
Use C-locale tests instead of locale-specific tests for character
types, since we want the ASCII interpretation here, not the
interpretation suitable for whatever happens to be the current locale.
2012-08-16 21:58:44 +00:00
|
|
|
|
while (i > 0 && '0' <= fname[i] && fname[i] <= '9')
|
2010-04-11 18:25:09 +00:00
|
|
|
|
--i;
|
|
|
|
|
if (fname[i] == ' ')
|
|
|
|
|
{
|
|
|
|
|
fname = xstrdup (name);
|
|
|
|
|
fname[i] = '-';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn = XftFontOpenName (XtDisplay (widget), screen, fname);
|
2011-10-13 14:55:46 +00:00
|
|
|
|
if (fname != name) xfree (fname);
|
2010-04-11 18:25:09 +00:00
|
|
|
|
|
|
|
|
|
return fn;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
get_text_width_and_height (Widget widget, char *text,
|
|
|
|
|
XftFont *xft_font,
|
|
|
|
|
int *height)
|
|
|
|
|
{
|
|
|
|
|
int w = 0, h = 0;
|
|
|
|
|
char *bp = text;
|
2012-06-26 01:05:39 +00:00
|
|
|
|
|
2010-04-11 18:25:09 +00:00
|
|
|
|
while (bp && *bp != '\0')
|
|
|
|
|
{
|
|
|
|
|
XGlyphInfo gi;
|
|
|
|
|
char *cp = strchr (bp, '\n');
|
|
|
|
|
XftTextExtentsUtf8 (XtDisplay (widget), xft_font,
|
|
|
|
|
(FcChar8 *) bp,
|
|
|
|
|
cp ? cp - bp : strlen (bp),
|
|
|
|
|
&gi);
|
|
|
|
|
bp = cp ? cp + 1 : NULL;
|
|
|
|
|
h += xft_font->height;
|
|
|
|
|
if (w < gi.width) w = gi.width;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*height = h;
|
|
|
|
|
return w;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
draw_text (struct widget_xft_data *data, char *lbl, int inverse)
|
|
|
|
|
{
|
|
|
|
|
Screen *sc = XtScreen (data->widget);
|
|
|
|
|
int screen = XScreenNumberOfScreen (sc);
|
|
|
|
|
int y = data->xft_font->ascent;
|
|
|
|
|
int x = inverse ? 0 : 2;
|
|
|
|
|
char *bp = lbl;
|
|
|
|
|
|
|
|
|
|
data->xft_draw = XftDrawCreate (XtDisplay (data->widget),
|
|
|
|
|
data->p,
|
|
|
|
|
DefaultVisual (XtDisplay (data->widget),
|
|
|
|
|
screen),
|
|
|
|
|
DefaultColormapOfScreen (sc));
|
|
|
|
|
XftDrawRect (data->xft_draw,
|
|
|
|
|
inverse ? &data->xft_fg : &data->xft_bg,
|
|
|
|
|
0, 0, data->p_width, data->p_height);
|
|
|
|
|
|
|
|
|
|
if (!inverse) y += 2;
|
|
|
|
|
while (bp && *bp != '\0')
|
|
|
|
|
{
|
|
|
|
|
char *cp = strchr (bp, '\n');
|
|
|
|
|
XftDrawStringUtf8 (data->xft_draw,
|
|
|
|
|
inverse ? &data->xft_bg : &data->xft_fg,
|
Fix some bad prototypes and formatting after conversion from K&R declaration.
* 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 *)
2010-07-05 09:17:12 +00:00
|
|
|
|
data->xft_font, x, y,
|
|
|
|
|
(FcChar8 *) bp,
|
|
|
|
|
cp ? cp - bp : strlen (bp));
|
2010-04-11 18:25:09 +00:00
|
|
|
|
bp = cp ? cp + 1 : NULL;
|
|
|
|
|
/* 1.2 gives reasonable line spacing. */
|
|
|
|
|
y += data->xft_font->height * 1.2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_text (struct widget_xft_data *data, Widget toplevel, char *lbl, int margin)
|
|
|
|
|
{
|
|
|
|
|
int width, height;
|
|
|
|
|
|
|
|
|
|
width = get_text_width_and_height (data->widget, lbl, data->xft_font,
|
|
|
|
|
&height);
|
|
|
|
|
data->p_width = width + margin;
|
|
|
|
|
data->p_height = height + margin;
|
|
|
|
|
|
|
|
|
|
data->p = XCreatePixmap (XtDisplay (data->widget),
|
|
|
|
|
XtWindow (toplevel),
|
|
|
|
|
data->p_width,
|
|
|
|
|
data->p_height,
|
|
|
|
|
DefaultDepthOfScreen (XtScreen (data->widget)));
|
|
|
|
|
draw_text (data, lbl, 0);
|
|
|
|
|
XtVaSetValues (data->widget, XtNbitmap, data->p, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct widget_xft_data *
|
|
|
|
|
find_xft_data (Widget widget)
|
|
|
|
|
{
|
|
|
|
|
widget_instance *inst = NULL;
|
|
|
|
|
Widget parent = XtParent (widget);
|
|
|
|
|
struct widget_xft_data *data = NULL;
|
|
|
|
|
int nr;
|
2012-06-26 01:05:39 +00:00
|
|
|
|
while (parent && !inst)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
inst = lw_get_widget_instance (parent);
|
|
|
|
|
parent = XtParent (parent);
|
|
|
|
|
}
|
Fix some bad prototypes and formatting after conversion from K&R declaration.
* 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 *)
2010-07-05 09:17:12 +00:00
|
|
|
|
if (!inst || !inst->xft_data || !inst->xft_data[0].xft_font) return 0;
|
2010-04-11 18:25:09 +00:00
|
|
|
|
|
2012-06-26 01:05:39 +00:00
|
|
|
|
for (nr = 0; data == NULL && nr < inst->nr_xft_data; ++nr)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
2012-06-26 01:05:39 +00:00
|
|
|
|
if (inst->xft_data[nr].widget == widget)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
data = &inst->xft_data[nr];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
command_press (Widget widget,
|
|
|
|
|
XEvent* event,
|
|
|
|
|
String *params,
|
|
|
|
|
Cardinal *num_params)
|
|
|
|
|
{
|
|
|
|
|
struct widget_xft_data *data = find_xft_data (widget);
|
2012-06-26 01:05:39 +00:00
|
|
|
|
if (data)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
char *lbl;
|
|
|
|
|
/* Since this isn't used for rectangle buttons, use it to for armed. */
|
|
|
|
|
XtVaSetValues (widget, XtNcornerRoundPercent, 1, NULL);
|
|
|
|
|
|
|
|
|
|
XtVaGetValues (widget, XtNlabel, &lbl, NULL);
|
|
|
|
|
draw_text (data, lbl, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
command_reset (Widget widget,
|
Change function definition from K&R to prototype. Fix prototype warnings.
* lwlib-Xaw.c (xaw_generic_callback, command_reset)
(xaw_update_one_value): Reformat.
(xaw_update_one_widget): Reformat and remove dead code.
(xaw_scrollbar_scroll, xaw_scrollbar_jump, xaw_create_scrollbar)
(xaw_update_scrollbar): Remove (not used).
(make_dialog): Change from K&R to prototype. Remove dead code.
(xaw_creation_table): Remove scrollbar entry.
* lwlib-Xlw.c (x_print_complete_resource_name): Change from K&R to
prototype.
(xlw_update_one_value): Reformat.
* lwlib-Xm.c (x_print_complete_resource_name)
(make_destroyed_instance, free_destroyed_instance, first_child)
(lw_motif_widget_p, resource_motif_string, destroy_all_children)
(xm_arm_callback, xm_update_label, xm_update_list)
(xm_update_pushbutton, xm_update_cascadebutton)
(xm_update_toggle, xm_update_radiobox, make_menu_in_widget)
(update_one_menu_entry, xm_update_menu, xm_update_text)
(xm_update_text_field, xm_update_one_widget)
(xm_update_one_value, activate_button, dialog_key_cb)
(make_dialog, mark_dead_instance_destroyed)
(find_matching_instance, recenter_widget, recycle_instance)
(xm_create_dialog, make_menubar, remove_grabs, make_popup_menu)
(make_main, xm_destroy_instance, xm_popup_menu)
(set_min_dialog_size, xm_pop_instance, do_call)
(xm_internal_update_other_instances, xm_generic_callback)
(xm_nosel_callback, xm_pull_down_callback, xm_pop_down_callback)
(xm_set_keyboard_focus, xm_set_main_areas, xm_manage_resizing): Change
from K&R to prototype.
* lwlib-int.h (widget_creation_function): Fix prototype.
* lwlib.c (allocate_widget_info, lw_register_widget): Change from K&R
to prototype.
(lw_internal_update_other_instances, merge_widget_value): Reformat.
* xlwmenu.c (size_menu_item): Change from K&R to prototype.
Change label_width and height to int.
(draw_arrow, draw_shadow_rectangle, draw_shadow_rhombus)
(draw_separator, display_menu, fit_to_screen, motion_event_is_in_menu)
(map_event_to_widget_value): Reformat.
(display_menu_item): Change from K&R to prototype.
2010-07-08 10:29:51 +00:00
|
|
|
|
XEvent* event,
|
|
|
|
|
String *params,
|
|
|
|
|
Cardinal *num_params)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
struct widget_xft_data *data = find_xft_data (widget);
|
2012-06-26 01:05:39 +00:00
|
|
|
|
if (data)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
Dimension cr;
|
|
|
|
|
XtVaGetValues (widget, XtNcornerRoundPercent, &cr, NULL);
|
2012-06-26 01:05:39 +00:00
|
|
|
|
if (cr == 1)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
char *lbl;
|
|
|
|
|
XtVaSetValues (widget, XtNcornerRoundPercent, 0, NULL);
|
|
|
|
|
XtVaGetValues (widget, XtNlabel, &lbl, NULL);
|
|
|
|
|
draw_text (data, lbl, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
void
|
Change function definition from K&R to prototype. Fix prototype warnings.
* lwlib-Xaw.c (xaw_generic_callback, command_reset)
(xaw_update_one_value): Reformat.
(xaw_update_one_widget): Reformat and remove dead code.
(xaw_scrollbar_scroll, xaw_scrollbar_jump, xaw_create_scrollbar)
(xaw_update_scrollbar): Remove (not used).
(make_dialog): Change from K&R to prototype. Remove dead code.
(xaw_creation_table): Remove scrollbar entry.
* lwlib-Xlw.c (x_print_complete_resource_name): Change from K&R to
prototype.
(xlw_update_one_value): Reformat.
* lwlib-Xm.c (x_print_complete_resource_name)
(make_destroyed_instance, free_destroyed_instance, first_child)
(lw_motif_widget_p, resource_motif_string, destroy_all_children)
(xm_arm_callback, xm_update_label, xm_update_list)
(xm_update_pushbutton, xm_update_cascadebutton)
(xm_update_toggle, xm_update_radiobox, make_menu_in_widget)
(update_one_menu_entry, xm_update_menu, xm_update_text)
(xm_update_text_field, xm_update_one_widget)
(xm_update_one_value, activate_button, dialog_key_cb)
(make_dialog, mark_dead_instance_destroyed)
(find_matching_instance, recenter_widget, recycle_instance)
(xm_create_dialog, make_menubar, remove_grabs, make_popup_menu)
(make_main, xm_destroy_instance, xm_popup_menu)
(set_min_dialog_size, xm_pop_instance, do_call)
(xm_internal_update_other_instances, xm_generic_callback)
(xm_nosel_callback, xm_pull_down_callback, xm_pop_down_callback)
(xm_set_keyboard_focus, xm_set_main_areas, xm_manage_resizing): Change
from K&R to prototype.
* lwlib-int.h (widget_creation_function): Fix prototype.
* lwlib.c (allocate_widget_info, lw_register_widget): Change from K&R
to prototype.
(lw_internal_update_other_instances, merge_widget_value): Reformat.
* xlwmenu.c (size_menu_item): Change from K&R to prototype.
Change label_width and height to int.
(draw_arrow, draw_shadow_rectangle, draw_shadow_rhombus)
(draw_separator, display_menu, fit_to_screen, motion_event_is_in_menu)
(map_event_to_widget_value): Reformat.
(display_menu_item): Change from K&R to prototype.
2010-07-08 10:29:51 +00:00
|
|
|
|
xaw_update_one_widget (widget_instance *instance,
|
|
|
|
|
Widget widget,
|
|
|
|
|
widget_value *val,
|
|
|
|
|
Boolean deep_p)
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
1994-03-19 07:16:54 +00:00
|
|
|
|
if (XtIsSubclass (widget, dialogWidgetClass))
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
2010-04-11 18:25:09 +00:00
|
|
|
|
|
|
|
|
|
#ifdef HAVE_XFT
|
|
|
|
|
if (instance->xft_data && instance->xft_data[0].xft_font)
|
|
|
|
|
{
|
|
|
|
|
set_text (&instance->xft_data[0], instance->parent,
|
|
|
|
|
val->contents->value, 10);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
XtVaSetValues (widget, XtNlabel, val->contents->value, NULL);
|
1994-03-11 09:56:39 +00:00
|
|
|
|
}
|
|
|
|
|
else if (XtIsSubclass (widget, commandWidgetClass))
|
|
|
|
|
{
|
|
|
|
|
Dimension bw = 0;
|
2010-04-11 18:25:09 +00:00
|
|
|
|
Arg al[10];
|
|
|
|
|
int ac = 0;
|
1994-03-19 07:16:54 +00:00
|
|
|
|
|
2000-08-03 20:09:56 +00:00
|
|
|
|
XtVaGetValues (widget, XtNborderWidth, &bw, NULL);
|
1994-03-11 09:56:39 +00:00
|
|
|
|
if (bw == 0)
|
|
|
|
|
/* Don't let buttons end up with 0 borderwidth, that's ugly...
|
|
|
|
|
Yeah, all this should really be done through app-defaults files
|
|
|
|
|
or fallback resources, but that's a whole different can of worms
|
|
|
|
|
that I don't feel like opening right now. Making Athena widgets
|
|
|
|
|
not look like shit is just entirely too much work.
|
|
|
|
|
*/
|
1994-03-19 07:16:54 +00:00
|
|
|
|
{
|
|
|
|
|
XtSetArg (al[0], XtNborderWidth, 1);
|
|
|
|
|
XtSetValues (widget, al, 1);
|
|
|
|
|
}
|
1994-03-11 09:56:39 +00:00
|
|
|
|
|
2001-02-28 14:55:33 +00:00
|
|
|
|
XtSetSensitive (widget, val->enabled);
|
2010-04-11 18:25:09 +00:00
|
|
|
|
XtSetArg (al[ac], XtNlabel, val->value);ac++;
|
1994-03-19 07:16:54 +00:00
|
|
|
|
/* Force centered button text. Se above. */
|
2010-04-11 18:25:09 +00:00
|
|
|
|
XtSetArg (al[ac], XtNjustify, XtJustifyCenter);ac++;
|
|
|
|
|
#ifdef HAVE_XFT
|
|
|
|
|
if (instance->xft_data && instance->xft_data[0].xft_font)
|
|
|
|
|
{
|
|
|
|
|
int th;
|
|
|
|
|
int nr;
|
|
|
|
|
for (nr = 0; nr < instance->nr_xft_data; ++nr)
|
|
|
|
|
if (instance->xft_data[nr].widget == widget)
|
|
|
|
|
break;
|
|
|
|
|
if (nr < instance->nr_xft_data)
|
|
|
|
|
{
|
|
|
|
|
set_text (&instance->xft_data[nr], instance->parent,
|
|
|
|
|
val->value, 6);
|
|
|
|
|
|
|
|
|
|
/* Must set internalHeight to twice the highlight thickness,
|
|
|
|
|
or else it gets overwritten by our pixmap. Probably a bug. */
|
|
|
|
|
XtVaGetValues (widget, XtNhighlightThickness, &th, NULL);
|
|
|
|
|
XtSetArg (al[ac], XtNinternalHeight, 2*th);ac++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
XtSetValues (widget, al, ac);
|
1994-03-11 09:56:39 +00:00
|
|
|
|
XtRemoveAllCallbacks (widget, XtNcallback);
|
|
|
|
|
XtAddCallback (widget, XtNcallback, xaw_generic_callback, instance);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
Change function definition from K&R to prototype. Fix prototype warnings.
* lwlib-Xaw.c (xaw_generic_callback, command_reset)
(xaw_update_one_value): Reformat.
(xaw_update_one_widget): Reformat and remove dead code.
(xaw_scrollbar_scroll, xaw_scrollbar_jump, xaw_create_scrollbar)
(xaw_update_scrollbar): Remove (not used).
(make_dialog): Change from K&R to prototype. Remove dead code.
(xaw_creation_table): Remove scrollbar entry.
* lwlib-Xlw.c (x_print_complete_resource_name): Change from K&R to
prototype.
(xlw_update_one_value): Reformat.
* lwlib-Xm.c (x_print_complete_resource_name)
(make_destroyed_instance, free_destroyed_instance, first_child)
(lw_motif_widget_p, resource_motif_string, destroy_all_children)
(xm_arm_callback, xm_update_label, xm_update_list)
(xm_update_pushbutton, xm_update_cascadebutton)
(xm_update_toggle, xm_update_radiobox, make_menu_in_widget)
(update_one_menu_entry, xm_update_menu, xm_update_text)
(xm_update_text_field, xm_update_one_widget)
(xm_update_one_value, activate_button, dialog_key_cb)
(make_dialog, mark_dead_instance_destroyed)
(find_matching_instance, recenter_widget, recycle_instance)
(xm_create_dialog, make_menubar, remove_grabs, make_popup_menu)
(make_main, xm_destroy_instance, xm_popup_menu)
(set_min_dialog_size, xm_pop_instance, do_call)
(xm_internal_update_other_instances, xm_generic_callback)
(xm_nosel_callback, xm_pull_down_callback, xm_pop_down_callback)
(xm_set_keyboard_focus, xm_set_main_areas, xm_manage_resizing): Change
from K&R to prototype.
* lwlib-int.h (widget_creation_function): Fix prototype.
* lwlib.c (allocate_widget_info, lw_register_widget): Change from K&R
to prototype.
(lw_internal_update_other_instances, merge_widget_value): Reformat.
* xlwmenu.c (size_menu_item): Change from K&R to prototype.
Change label_width and height to int.
(draw_arrow, draw_shadow_rectangle, draw_shadow_rhombus)
(draw_separator, display_menu, fit_to_screen, motion_event_is_in_menu)
(map_event_to_widget_value): Reformat.
(display_menu_item): Change from K&R to prototype.
2010-07-08 10:29:51 +00:00
|
|
|
|
xaw_update_one_value (widget_instance *instance,
|
|
|
|
|
Widget widget,
|
|
|
|
|
widget_value *val)
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
|
|
|
|
/* This function is not used by the scrollbars and those are the only
|
|
|
|
|
Athena widget implemented at the moment so do nothing. */
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2010-07-04 05:47:55 +00:00
|
|
|
|
xaw_destroy_instance (widget_instance *instance)
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XFT
|
2012-06-26 01:05:39 +00:00
|
|
|
|
if (instance->xft_data)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
int i;
|
2012-06-26 01:05:39 +00:00
|
|
|
|
for (i = 0; i < instance->nr_xft_data; ++i)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
if (instance->xft_data[i].xft_draw)
|
|
|
|
|
XftDrawDestroy (instance->xft_data[i].xft_draw);
|
2012-06-26 01:05:39 +00:00
|
|
|
|
if (instance->xft_data[i].p != None)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
XtVaSetValues (instance->xft_data[i].widget, XtNbitmap, None,
|
|
|
|
|
NULL);
|
|
|
|
|
XFreePixmap (XtDisplay (instance->widget),
|
|
|
|
|
instance->xft_data[i].p);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (instance->xft_data[0].xft_font)
|
|
|
|
|
XftFontClose (XtDisplay (instance->widget),
|
|
|
|
|
instance->xft_data[0].xft_font);
|
2011-10-13 14:55:46 +00:00
|
|
|
|
xfree (instance->xft_data);
|
2010-04-11 18:25:09 +00:00
|
|
|
|
}
|
|
|
|
|
#endif
|
1994-03-11 09:56:39 +00:00
|
|
|
|
if (XtIsSubclass (instance->widget, dialogWidgetClass))
|
|
|
|
|
/* Need to destroy the Shell too. */
|
|
|
|
|
XtDestroyWidget (XtParent (instance->widget));
|
|
|
|
|
else
|
|
|
|
|
XtDestroyWidget (instance->widget);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2010-07-04 05:47:55 +00:00
|
|
|
|
xaw_popup_menu (Widget widget, XEvent *event)
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
|
|
|
|
/* An Athena menubar has not been implemented. */
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2002-11-21 10:58:13 +00:00
|
|
|
|
xaw_pop_instance (widget_instance *instance, Boolean up)
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
|
|
|
|
Widget widget = instance->widget;
|
|
|
|
|
|
|
|
|
|
if (up)
|
|
|
|
|
{
|
|
|
|
|
if (XtIsSubclass (widget, dialogWidgetClass))
|
|
|
|
|
{
|
|
|
|
|
/* For dialogs, we need to call XtPopup on the parent instead
|
|
|
|
|
of calling XtManageChild on the widget.
|
|
|
|
|
Also we need to hack the shell's WM_PROTOCOLS to get it to
|
|
|
|
|
understand what the close box is supposed to do!!
|
|
|
|
|
*/
|
|
|
|
|
Display *dpy = XtDisplay (widget);
|
|
|
|
|
Widget shell = XtParent (widget);
|
|
|
|
|
Atom props [2];
|
|
|
|
|
int i = 0;
|
|
|
|
|
props [i++] = XInternAtom (dpy, "WM_DELETE_WINDOW", False);
|
|
|
|
|
XChangeProperty (dpy, XtWindow (shell),
|
|
|
|
|
XInternAtom (dpy, "WM_PROTOCOLS", False),
|
|
|
|
|
XA_ATOM, 32, PropModeAppend,
|
|
|
|
|
(unsigned char *) props, i);
|
|
|
|
|
|
|
|
|
|
/* Center the widget in its parent. Why isn't this kind of crap
|
|
|
|
|
done automatically? I thought toolkits were supposed to make
|
|
|
|
|
life easier?
|
|
|
|
|
*/
|
|
|
|
|
{
|
1995-04-15 18:34:01 +00:00
|
|
|
|
unsigned int x, y, w, h;
|
1994-03-11 09:56:39 +00:00
|
|
|
|
Widget topmost = instance->parent;
|
1994-09-16 17:37:05 +00:00
|
|
|
|
Arg args[2];
|
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
w = shell->core.width;
|
|
|
|
|
h = shell->core.height;
|
|
|
|
|
while (topmost->core.parent && XtIsRealized (topmost->core.parent))
|
|
|
|
|
topmost = topmost->core.parent;
|
|
|
|
|
if (topmost->core.width < w) x = topmost->core.x;
|
|
|
|
|
else x = topmost->core.x + ((topmost->core.width - w) / 2);
|
|
|
|
|
if (topmost->core.height < h) y = topmost->core.y;
|
|
|
|
|
else y = topmost->core.y + ((topmost->core.height - h) / 2);
|
1994-09-16 17:37:05 +00:00
|
|
|
|
/* Using XtMoveWidget caused the widget to come
|
|
|
|
|
out in the wrong place with vtwm.
|
|
|
|
|
Question of virtual vs real coords, perhaps. */
|
|
|
|
|
XtSetArg (args[0], XtNx, x);
|
|
|
|
|
XtSetArg (args[1], XtNy, y);
|
|
|
|
|
XtSetValues (shell, args, 2);
|
1994-03-11 09:56:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Finally, pop it up. */
|
|
|
|
|
XtPopup (shell, XtGrabNonexclusive);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
XtManageChild (widget);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (XtIsSubclass (widget, dialogWidgetClass))
|
|
|
|
|
XtUnmanageChild (XtParent (widget));
|
|
|
|
|
else
|
|
|
|
|
XtUnmanageChild (widget);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Dialog boxes */
|
|
|
|
|
|
|
|
|
|
static char overrideTrans[] =
|
|
|
|
|
"<Message>WM_PROTOCOLS: lwlib_delete_dialog()";
|
2004-01-12 01:45:22 +00:00
|
|
|
|
/* Dialogs pop down on any key press */
|
|
|
|
|
static char dialogOverride[] =
|
2004-12-26 16:02:26 +00:00
|
|
|
|
"<KeyPress>Escape: lwlib_delete_dialog()";
|
Fix some bad prototypes and formatting after conversion from K&R declaration.
* 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 *)
2010-07-05 09:17:12 +00:00
|
|
|
|
static void wm_delete_window (Widget w,
|
|
|
|
|
XEvent *event,
|
|
|
|
|
String *params,
|
|
|
|
|
Cardinal *num_params);
|
1994-03-11 09:56:39 +00:00
|
|
|
|
static XtActionsRec xaw_actions [] = {
|
|
|
|
|
{"lwlib_delete_dialog", wm_delete_window}
|
|
|
|
|
};
|
|
|
|
|
static Boolean actions_initted = False;
|
|
|
|
|
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XFT
|
2012-06-26 01:05:39 +00:00
|
|
|
|
static XtActionsRec button_actions[] =
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
{ "my_reset", command_reset },
|
|
|
|
|
{ "my_press", command_press },
|
|
|
|
|
};
|
|
|
|
|
char buttonTrans[] =
|
|
|
|
|
"<Leave>: reset() my_reset()\n"
|
|
|
|
|
"<Btn1Down>: set() my_press()\n"
|
|
|
|
|
"<Btn1Up>: my_reset() notify() unset()\n";
|
|
|
|
|
#endif
|
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
static Widget
|
Change function definition from K&R to prototype. Fix prototype warnings.
* lwlib-Xaw.c (xaw_generic_callback, command_reset)
(xaw_update_one_value): Reformat.
(xaw_update_one_widget): Reformat and remove dead code.
(xaw_scrollbar_scroll, xaw_scrollbar_jump, xaw_create_scrollbar)
(xaw_update_scrollbar): Remove (not used).
(make_dialog): Change from K&R to prototype. Remove dead code.
(xaw_creation_table): Remove scrollbar entry.
* lwlib-Xlw.c (x_print_complete_resource_name): Change from K&R to
prototype.
(xlw_update_one_value): Reformat.
* lwlib-Xm.c (x_print_complete_resource_name)
(make_destroyed_instance, free_destroyed_instance, first_child)
(lw_motif_widget_p, resource_motif_string, destroy_all_children)
(xm_arm_callback, xm_update_label, xm_update_list)
(xm_update_pushbutton, xm_update_cascadebutton)
(xm_update_toggle, xm_update_radiobox, make_menu_in_widget)
(update_one_menu_entry, xm_update_menu, xm_update_text)
(xm_update_text_field, xm_update_one_widget)
(xm_update_one_value, activate_button, dialog_key_cb)
(make_dialog, mark_dead_instance_destroyed)
(find_matching_instance, recenter_widget, recycle_instance)
(xm_create_dialog, make_menubar, remove_grabs, make_popup_menu)
(make_main, xm_destroy_instance, xm_popup_menu)
(set_min_dialog_size, xm_pop_instance, do_call)
(xm_internal_update_other_instances, xm_generic_callback)
(xm_nosel_callback, xm_pull_down_callback, xm_pop_down_callback)
(xm_set_keyboard_focus, xm_set_main_areas, xm_manage_resizing): Change
from K&R to prototype.
* lwlib-int.h (widget_creation_function): Fix prototype.
* lwlib.c (allocate_widget_info, lw_register_widget): Change from K&R
to prototype.
(lw_internal_update_other_instances, merge_widget_value): Reformat.
* xlwmenu.c (size_menu_item): Change from K&R to prototype.
Change label_width and height to int.
(draw_arrow, draw_shadow_rectangle, draw_shadow_rhombus)
(draw_separator, display_menu, fit_to_screen, motion_event_is_in_menu)
(map_event_to_widget_value): Reformat.
(display_menu_item): Change from K&R to prototype.
2010-07-08 10:29:51 +00:00
|
|
|
|
make_dialog (char* name,
|
|
|
|
|
Widget parent,
|
|
|
|
|
Boolean pop_up_p,
|
|
|
|
|
char* shell_title,
|
|
|
|
|
char* icon_name,
|
|
|
|
|
Boolean text_input_slot,
|
|
|
|
|
Boolean radio_box,
|
|
|
|
|
Boolean list,
|
|
|
|
|
int left_buttons,
|
|
|
|
|
int right_buttons,
|
|
|
|
|
widget_instance *instance)
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
|
|
|
|
Arg av [20];
|
|
|
|
|
int ac = 0;
|
|
|
|
|
int i, bc;
|
|
|
|
|
char button_name [255];
|
|
|
|
|
Widget shell;
|
|
|
|
|
Widget dialog;
|
|
|
|
|
Widget button;
|
|
|
|
|
XtTranslations override;
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XFT
|
|
|
|
|
XftFont *xft_font = 0;
|
|
|
|
|
XtTranslations button_override;
|
|
|
|
|
#endif
|
1994-03-11 09:56:39 +00:00
|
|
|
|
|
Tweak X toolkit code to pacify modern GCC
* lwlib/lwlib-Xaw.c, lwlib/lwlib-Xm.c, lwlib/lwlib.c:
Don’t include <stdlib.h>, since this code now calls emacs_abort
rather than abort.
* lwlib/lwlib-Xaw.c (make_dialog, xaw_generic_callback)
(wm_delete_window):
* lwlib/lwlib-Xm.c (make_menu_in_widget, do_call):
* lwlib/lwlib.c (instantiate_widget_instance, lw_make_widget):
* lwlib/xlwmenu.c (abort_gracefully, draw_separator)
(separator_height, XlwMenuInitialize):
Use emacs_abort, not abort. Without this change, some calls
to ‘abort’ were invalid, as stdlib.h was not always included.
* src/widget.c (resources, emacsFrameClassRec):
* src/xfns.c (x_window) [USE_X_TOOLKIT]:
* src/xmenu.c (create_and_show_popup_menu) [USE_X_TOOLKIT]:
* src/xterm.c (emacs_options) [USE_X_TOOLKIT}:
(x_term_init) [USE_X_TOOLKIT]:
Cast string constants to char * to pacify --enable-gcc-warnings.
2017-03-10 17:30:30 +00:00
|
|
|
|
if (! pop_up_p) emacs_abort (); /* not implemented */
|
|
|
|
|
if (text_input_slot) emacs_abort (); /* not implemented */
|
|
|
|
|
if (radio_box) emacs_abort (); /* not implemented */
|
|
|
|
|
if (list) emacs_abort (); /* not implemented */
|
1994-03-11 09:56:39 +00:00
|
|
|
|
|
|
|
|
|
if (! actions_initted)
|
|
|
|
|
{
|
|
|
|
|
XtAppContext app = XtWidgetToApplicationContext (parent);
|
|
|
|
|
XtAppAddActions (app, xaw_actions,
|
|
|
|
|
sizeof (xaw_actions) / sizeof (xaw_actions[0]));
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XFT
|
|
|
|
|
XtAppAddActions (app, button_actions,
|
|
|
|
|
sizeof (button_actions) / sizeof (button_actions[0]));
|
|
|
|
|
#endif
|
1994-03-11 09:56:39 +00:00
|
|
|
|
actions_initted = True;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
override = XtParseTranslationTable (overrideTrans);
|
|
|
|
|
|
|
|
|
|
ac = 0;
|
|
|
|
|
XtSetArg (av[ac], XtNtitle, shell_title); ac++;
|
|
|
|
|
XtSetArg (av[ac], XtNallowShellResize, True); ac++;
|
1994-04-01 08:25:12 +00:00
|
|
|
|
|
|
|
|
|
/* Don't allow any geometry request from the user. */
|
|
|
|
|
XtSetArg (av[ac], XtNgeometry, 0); ac++;
|
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
shell = XtCreatePopupShell ("dialog", transientShellWidgetClass,
|
|
|
|
|
parent, av, ac);
|
|
|
|
|
XtOverrideTranslations (shell, override);
|
|
|
|
|
|
|
|
|
|
ac = 0;
|
|
|
|
|
dialog = XtCreateManagedWidget (name, dialogWidgetClass, shell, av, ac);
|
2004-01-12 01:45:22 +00:00
|
|
|
|
override = XtParseTranslationTable (dialogOverride);
|
|
|
|
|
XtOverrideTranslations (dialog, override);
|
1994-03-11 09:56:39 +00:00
|
|
|
|
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XFT
|
|
|
|
|
{
|
|
|
|
|
int num;
|
|
|
|
|
Widget *ch = NULL;
|
|
|
|
|
Widget w = 0;
|
|
|
|
|
XtVaGetValues (dialog,
|
|
|
|
|
XtNnumChildren, &num,
|
|
|
|
|
XtNchildren, &ch, NULL);
|
2012-06-26 01:05:39 +00:00
|
|
|
|
for (i = 0; i < num; ++i)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
if (!XtIsSubclass (ch[i], commandWidgetClass)
|
|
|
|
|
&& XtIsSubclass (ch[i], labelWidgetClass))
|
|
|
|
|
{
|
|
|
|
|
w = ch[i];
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
instance->xft_data = 0;
|
|
|
|
|
instance->nr_xft_data = 0;
|
2012-06-26 01:05:39 +00:00
|
|
|
|
if (w)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
2012-06-26 01:05:39 +00:00
|
|
|
|
XtResource rec[] =
|
2011-02-14 17:21:10 +00:00
|
|
|
|
{ { "font", "Font", XtRString, sizeof(String), 0, XtRString,
|
|
|
|
|
(XtPointer)"Sans-10" }};
|
|
|
|
|
char *fontName = NULL;
|
|
|
|
|
XtVaGetSubresources (dialog, &fontName, "Dialog", "dialog",
|
2010-05-13 17:48:56 +00:00
|
|
|
|
rec, 1, (String)NULL);
|
2011-02-14 17:21:10 +00:00
|
|
|
|
if (fontName)
|
|
|
|
|
{
|
|
|
|
|
XFontStruct *xfn = XLoadQueryFont (XtDisplay (dialog), fontName);
|
|
|
|
|
if (!xfn)
|
|
|
|
|
xft_font = openFont (dialog, fontName);
|
|
|
|
|
else
|
|
|
|
|
XFreeFont (XtDisplay (dialog), xfn);
|
|
|
|
|
}
|
2012-06-26 01:05:39 +00:00
|
|
|
|
|
|
|
|
|
if (xft_font)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
instance->nr_xft_data = left_buttons + right_buttons + 1;
|
|
|
|
|
instance->xft_data = calloc (instance->nr_xft_data,
|
|
|
|
|
sizeof(*instance->xft_data));
|
|
|
|
|
|
|
|
|
|
fill_xft_data (&instance->xft_data[0], w, xft_font);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
button_override = XtParseTranslationTable (buttonTrans);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
bc = 0;
|
|
|
|
|
button = 0;
|
|
|
|
|
for (i = 0; i < left_buttons; i++)
|
|
|
|
|
{
|
|
|
|
|
ac = 0;
|
|
|
|
|
XtSetArg (av [ac], XtNfromHoriz, button); ac++;
|
|
|
|
|
XtSetArg (av [ac], XtNleft, XtChainLeft); ac++;
|
|
|
|
|
XtSetArg (av [ac], XtNright, XtChainLeft); ac++;
|
|
|
|
|
XtSetArg (av [ac], XtNtop, XtChainBottom); ac++;
|
|
|
|
|
XtSetArg (av [ac], XtNbottom, XtChainBottom); ac++;
|
|
|
|
|
XtSetArg (av [ac], XtNresizable, True); ac++;
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XAW3D
|
|
|
|
|
if (DefaultDepthOfScreen (XtScreen (dialog)) >= 16)
|
|
|
|
|
{
|
|
|
|
|
/* Turn of dithered shadow if we can. Looks bad */
|
|
|
|
|
XtSetArg (av [ac], "beNiceToColormap", False); ac++;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
1994-03-11 09:56:39 +00:00
|
|
|
|
sprintf (button_name, "button%d", ++bc);
|
|
|
|
|
button = XtCreateManagedWidget (button_name, commandWidgetClass,
|
|
|
|
|
dialog, av, ac);
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XFT
|
|
|
|
|
if (xft_font)
|
|
|
|
|
{
|
|
|
|
|
fill_xft_data (&instance->xft_data[bc], button, xft_font);
|
|
|
|
|
XtOverrideTranslations (button, button_override);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
1994-03-11 09:56:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < right_buttons; i++)
|
|
|
|
|
{
|
|
|
|
|
ac = 0;
|
|
|
|
|
XtSetArg (av [ac], XtNfromHoriz, button); ac++;
|
2012-06-26 01:05:39 +00:00
|
|
|
|
if (i == 0)
|
2010-04-11 18:25:09 +00:00
|
|
|
|
{
|
|
|
|
|
/* Separator to the other buttons. */
|
|
|
|
|
XtSetArg (av [ac], XtNhorizDistance, 30); ac++;
|
|
|
|
|
}
|
1994-03-11 09:56:39 +00:00
|
|
|
|
XtSetArg (av [ac], XtNleft, XtChainRight); ac++;
|
|
|
|
|
XtSetArg (av [ac], XtNright, XtChainRight); ac++;
|
|
|
|
|
XtSetArg (av [ac], XtNtop, XtChainBottom); ac++;
|
|
|
|
|
XtSetArg (av [ac], XtNbottom, XtChainBottom); ac++;
|
|
|
|
|
XtSetArg (av [ac], XtNresizable, True); ac++;
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XAW3D
|
|
|
|
|
if (DefaultDepthOfScreen (XtScreen (dialog)) >= 16)
|
|
|
|
|
{
|
|
|
|
|
/* Turn of dithered shadow if we can. Looks bad */
|
|
|
|
|
XtSetArg (av [ac], "beNiceToColormap", False); ac++;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
1994-03-11 09:56:39 +00:00
|
|
|
|
sprintf (button_name, "button%d", ++bc);
|
|
|
|
|
button = XtCreateManagedWidget (button_name, commandWidgetClass,
|
|
|
|
|
dialog, av, ac);
|
2010-04-11 18:25:09 +00:00
|
|
|
|
#ifdef HAVE_XFT
|
|
|
|
|
if (xft_font)
|
|
|
|
|
{
|
|
|
|
|
fill_xft_data (&instance->xft_data[bc], button, xft_font);
|
|
|
|
|
XtOverrideTranslations (button, button_override);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
1994-03-11 09:56:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dialog;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Widget
|
2010-07-04 05:47:55 +00:00
|
|
|
|
xaw_create_dialog (widget_instance *instance)
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
|
|
|
|
char *name = instance->info->type;
|
|
|
|
|
Widget parent = instance->parent;
|
|
|
|
|
Widget widget;
|
|
|
|
|
Boolean pop_up_p = instance->pop_up_p;
|
|
|
|
|
char *shell_name = 0;
|
2002-01-09 11:01:58 +00:00
|
|
|
|
char *icon_name = 0;
|
1994-03-11 09:56:39 +00:00
|
|
|
|
Boolean text_input_slot = False;
|
|
|
|
|
Boolean radio_box = False;
|
|
|
|
|
Boolean list = False;
|
|
|
|
|
int total_buttons;
|
|
|
|
|
int left_buttons = 0;
|
|
|
|
|
int right_buttons = 1;
|
|
|
|
|
|
|
|
|
|
switch (name [0]) {
|
|
|
|
|
case 'E': case 'e':
|
|
|
|
|
icon_name = "dbox-error";
|
|
|
|
|
shell_name = "Error";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'I': case 'i':
|
|
|
|
|
icon_name = "dbox-info";
|
|
|
|
|
shell_name = "Information";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'L': case 'l':
|
|
|
|
|
list = True;
|
|
|
|
|
icon_name = "dbox-question";
|
|
|
|
|
shell_name = "Prompt";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'P': case 'p':
|
|
|
|
|
text_input_slot = True;
|
|
|
|
|
icon_name = "dbox-question";
|
|
|
|
|
shell_name = "Prompt";
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'Q': case 'q':
|
|
|
|
|
icon_name = "dbox-question";
|
|
|
|
|
shell_name = "Question";
|
|
|
|
|
break;
|
|
|
|
|
}
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
total_buttons = name [1] - '0';
|
|
|
|
|
|
|
|
|
|
if (name [3] == 'T' || name [3] == 't')
|
|
|
|
|
{
|
|
|
|
|
text_input_slot = False;
|
|
|
|
|
radio_box = True;
|
|
|
|
|
}
|
|
|
|
|
else if (name [3])
|
|
|
|
|
right_buttons = name [4] - '0';
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
left_buttons = total_buttons - right_buttons;
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
widget = make_dialog (name, parent, pop_up_p,
|
|
|
|
|
shell_name, icon_name, text_input_slot, radio_box,
|
2010-04-11 18:25:09 +00:00
|
|
|
|
list, left_buttons, right_buttons, instance);
|
1994-03-11 09:56:39 +00:00
|
|
|
|
return widget;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2010-07-04 05:47:55 +00:00
|
|
|
|
xaw_generic_callback (Widget widget, XtPointer closure, XtPointer call_data)
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
|
|
|
|
widget_instance *instance = (widget_instance *) closure;
|
|
|
|
|
Widget instance_widget;
|
|
|
|
|
LWLIB_ID id;
|
|
|
|
|
XtPointer user_data;
|
|
|
|
|
|
|
|
|
|
lw_internal_update_other_instances (widget, closure, call_data);
|
|
|
|
|
|
|
|
|
|
if (! instance)
|
|
|
|
|
return;
|
|
|
|
|
if (widget->core.being_destroyed)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
instance_widget = instance->widget;
|
|
|
|
|
if (!instance_widget)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
id = instance->info->id;
|
|
|
|
|
|
|
|
|
|
/* Damn! Athena doesn't give us a way to hang our own data on the
|
|
|
|
|
buttons, so we have to go find it... I guess this assumes that
|
|
|
|
|
all instances of a button have the same call data. */
|
|
|
|
|
{
|
|
|
|
|
widget_value *val = instance->info->val->contents;
|
|
|
|
|
char *name = XtName (widget);
|
|
|
|
|
while (val)
|
|
|
|
|
{
|
|
|
|
|
if (val->name && !strcmp (val->name, name))
|
|
|
|
|
break;
|
|
|
|
|
val = val->next;
|
|
|
|
|
}
|
Tweak X toolkit code to pacify modern GCC
* lwlib/lwlib-Xaw.c, lwlib/lwlib-Xm.c, lwlib/lwlib.c:
Don’t include <stdlib.h>, since this code now calls emacs_abort
rather than abort.
* lwlib/lwlib-Xaw.c (make_dialog, xaw_generic_callback)
(wm_delete_window):
* lwlib/lwlib-Xm.c (make_menu_in_widget, do_call):
* lwlib/lwlib.c (instantiate_widget_instance, lw_make_widget):
* lwlib/xlwmenu.c (abort_gracefully, draw_separator)
(separator_height, XlwMenuInitialize):
Use emacs_abort, not abort. Without this change, some calls
to ‘abort’ were invalid, as stdlib.h was not always included.
* src/widget.c (resources, emacsFrameClassRec):
* src/xfns.c (x_window) [USE_X_TOOLKIT]:
* src/xmenu.c (create_and_show_popup_menu) [USE_X_TOOLKIT]:
* src/xterm.c (emacs_options) [USE_X_TOOLKIT}:
(x_term_init) [USE_X_TOOLKIT]:
Cast string constants to char * to pacify --enable-gcc-warnings.
2017-03-10 17:30:30 +00:00
|
|
|
|
if (! val) emacs_abort ();
|
1994-03-11 09:56:39 +00:00
|
|
|
|
user_data = val->call_data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (instance->info->selection_cb)
|
|
|
|
|
instance->info->selection_cb (widget, id, user_data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
Fix some bad prototypes and formatting after conversion from K&R declaration.
* 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 *)
2010-07-05 09:17:12 +00:00
|
|
|
|
wm_delete_window (Widget w,
|
|
|
|
|
XEvent *event,
|
|
|
|
|
String *params,
|
|
|
|
|
Cardinal *num_params)
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{
|
|
|
|
|
LWLIB_ID id;
|
1999-09-18 03:02:03 +00:00
|
|
|
|
Cardinal nkids;
|
|
|
|
|
int i;
|
1994-03-11 09:56:39 +00:00
|
|
|
|
Widget *kids = 0;
|
Fix some bad prototypes and formatting after conversion from K&R declaration.
* 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 *)
2010-07-05 09:17:12 +00:00
|
|
|
|
Widget widget = 0, shell;
|
2004-01-12 01:45:22 +00:00
|
|
|
|
|
|
|
|
|
if (XtIsSubclass (w, dialogWidgetClass))
|
|
|
|
|
shell = XtParent (w);
|
|
|
|
|
else
|
|
|
|
|
shell = w;
|
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
if (! XtIsSubclass (shell, shellWidgetClass))
|
Tweak X toolkit code to pacify modern GCC
* lwlib/lwlib-Xaw.c, lwlib/lwlib-Xm.c, lwlib/lwlib.c:
Don’t include <stdlib.h>, since this code now calls emacs_abort
rather than abort.
* lwlib/lwlib-Xaw.c (make_dialog, xaw_generic_callback)
(wm_delete_window):
* lwlib/lwlib-Xm.c (make_menu_in_widget, do_call):
* lwlib/lwlib.c (instantiate_widget_instance, lw_make_widget):
* lwlib/xlwmenu.c (abort_gracefully, draw_separator)
(separator_height, XlwMenuInitialize):
Use emacs_abort, not abort. Without this change, some calls
to ‘abort’ were invalid, as stdlib.h was not always included.
* src/widget.c (resources, emacsFrameClassRec):
* src/xfns.c (x_window) [USE_X_TOOLKIT]:
* src/xmenu.c (create_and_show_popup_menu) [USE_X_TOOLKIT]:
* src/xterm.c (emacs_options) [USE_X_TOOLKIT}:
(x_term_init) [USE_X_TOOLKIT]:
Cast string constants to char * to pacify --enable-gcc-warnings.
2017-03-10 17:30:30 +00:00
|
|
|
|
emacs_abort ();
|
2000-08-03 20:09:56 +00:00
|
|
|
|
XtVaGetValues (shell, XtNnumChildren, &nkids, NULL);
|
|
|
|
|
XtVaGetValues (shell, XtNchildren, &kids, NULL);
|
1994-03-11 09:56:39 +00:00
|
|
|
|
if (!kids || !*kids)
|
Tweak X toolkit code to pacify modern GCC
* lwlib/lwlib-Xaw.c, lwlib/lwlib-Xm.c, lwlib/lwlib.c:
Don’t include <stdlib.h>, since this code now calls emacs_abort
rather than abort.
* lwlib/lwlib-Xaw.c (make_dialog, xaw_generic_callback)
(wm_delete_window):
* lwlib/lwlib-Xm.c (make_menu_in_widget, do_call):
* lwlib/lwlib.c (instantiate_widget_instance, lw_make_widget):
* lwlib/xlwmenu.c (abort_gracefully, draw_separator)
(separator_height, XlwMenuInitialize):
Use emacs_abort, not abort. Without this change, some calls
to ‘abort’ were invalid, as stdlib.h was not always included.
* src/widget.c (resources, emacsFrameClassRec):
* src/xfns.c (x_window) [USE_X_TOOLKIT]:
* src/xmenu.c (create_and_show_popup_menu) [USE_X_TOOLKIT]:
* src/xterm.c (emacs_options) [USE_X_TOOLKIT}:
(x_term_init) [USE_X_TOOLKIT]:
Cast string constants to char * to pacify --enable-gcc-warnings.
2017-03-10 17:30:30 +00:00
|
|
|
|
emacs_abort ();
|
1999-09-18 03:02:03 +00:00
|
|
|
|
for (i = 0; i < nkids; i++)
|
|
|
|
|
{
|
|
|
|
|
widget = kids[i];
|
|
|
|
|
if (XtIsSubclass (widget, dialogWidgetClass))
|
|
|
|
|
break;
|
|
|
|
|
}
|
Fix some bad prototypes and formatting after conversion from K&R declaration.
* 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 *)
2010-07-05 09:17:12 +00:00
|
|
|
|
if (! widget) return;
|
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
id = lw_get_widget_id (widget);
|
Tweak X toolkit code to pacify modern GCC
* lwlib/lwlib-Xaw.c, lwlib/lwlib-Xm.c, lwlib/lwlib.c:
Don’t include <stdlib.h>, since this code now calls emacs_abort
rather than abort.
* lwlib/lwlib-Xaw.c (make_dialog, xaw_generic_callback)
(wm_delete_window):
* lwlib/lwlib-Xm.c (make_menu_in_widget, do_call):
* lwlib/lwlib.c (instantiate_widget_instance, lw_make_widget):
* lwlib/xlwmenu.c (abort_gracefully, draw_separator)
(separator_height, XlwMenuInitialize):
Use emacs_abort, not abort. Without this change, some calls
to ‘abort’ were invalid, as stdlib.h was not always included.
* src/widget.c (resources, emacsFrameClassRec):
* src/xfns.c (x_window) [USE_X_TOOLKIT]:
* src/xmenu.c (create_and_show_popup_menu) [USE_X_TOOLKIT]:
* src/xterm.c (emacs_options) [USE_X_TOOLKIT}:
(x_term_init) [USE_X_TOOLKIT]:
Cast string constants to char * to pacify --enable-gcc-warnings.
2017-03-10 17:30:30 +00:00
|
|
|
|
if (! id) emacs_abort ();
|
1994-03-11 09:56:39 +00:00
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
widget_info *info = lw_get_widget_info (id);
|
Tweak X toolkit code to pacify modern GCC
* lwlib/lwlib-Xaw.c, lwlib/lwlib-Xm.c, lwlib/lwlib.c:
Don’t include <stdlib.h>, since this code now calls emacs_abort
rather than abort.
* lwlib/lwlib-Xaw.c (make_dialog, xaw_generic_callback)
(wm_delete_window):
* lwlib/lwlib-Xm.c (make_menu_in_widget, do_call):
* lwlib/lwlib.c (instantiate_widget_instance, lw_make_widget):
* lwlib/xlwmenu.c (abort_gracefully, draw_separator)
(separator_height, XlwMenuInitialize):
Use emacs_abort, not abort. Without this change, some calls
to ‘abort’ were invalid, as stdlib.h was not always included.
* src/widget.c (resources, emacsFrameClassRec):
* src/xfns.c (x_window) [USE_X_TOOLKIT]:
* src/xmenu.c (create_and_show_popup_menu) [USE_X_TOOLKIT]:
* src/xterm.c (emacs_options) [USE_X_TOOLKIT}:
(x_term_init) [USE_X_TOOLKIT]:
Cast string constants to char * to pacify --enable-gcc-warnings.
2017-03-10 17:30:30 +00:00
|
|
|
|
if (! info) emacs_abort ();
|
1994-03-11 09:56:39 +00:00
|
|
|
|
if (info->selection_cb)
|
|
|
|
|
info->selection_cb (widget, id, (XtPointer) -1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lw_destroy_all_widgets (id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1994-09-16 17:37:05 +00:00
|
|
|
|
static Widget
|
2010-07-04 05:47:55 +00:00
|
|
|
|
xaw_create_main (widget_instance *instance)
|
1994-09-16 17:37:05 +00:00
|
|
|
|
{
|
|
|
|
|
Arg al[1];
|
|
|
|
|
int ac;
|
|
|
|
|
|
|
|
|
|
/* Create a vertical Paned to hold menubar */
|
|
|
|
|
ac = 0;
|
|
|
|
|
XtSetArg (al[ac], XtNborderWidth, 0); ac++;
|
|
|
|
|
return XtCreateWidget (instance->info->name, panedWidgetClass,
|
|
|
|
|
instance->parent, al, ac);
|
|
|
|
|
}
|
|
|
|
|
|
1994-03-11 09:56:39 +00:00
|
|
|
|
widget_creation_entry
|
|
|
|
|
xaw_creation_table [] =
|
|
|
|
|
{
|
1994-09-16 17:37:05 +00:00
|
|
|
|
{"main", xaw_create_main},
|
1994-03-11 09:56:39 +00:00
|
|
|
|
{NULL, NULL}
|
|
|
|
|
};
|