HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
declare smobs in alloc.c
[bpt/emacs.git]
/
lwlib
/
lwlib-Xaw.c
diff --git
a/lwlib/lwlib-Xaw.c
b/lwlib/lwlib-Xaw.c
index
9c9a007
..
11eefd9
100644
(file)
--- a/
lwlib/lwlib-Xaw.c
+++ b/
lwlib/lwlib-Xaw.c
@@
-1,7
+1,7
@@
/* The lwlib interface to Athena widgets.
Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
/* The lwlib interface to Athena widgets.
Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
-Copyright (C) 1994, 2001-201
1
Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-201
4
Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
This file is part of the Lucid Widget Library.
@@
-16,17
+16,12
@@
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
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
#include <config.h>
-#endif
#include <stdio.h>
#include <setjmp.h>
#include <stdio.h>
#include <setjmp.h>
-#include <ctype.h>
#include <lisp.h>
#include <lisp.h>
@@
-127,7
+122,7
@@
openFont (Widget widget, char *name)
XftFont *fn;
/* Try to convert Gtk-syntax (Sans 9) to Xft syntax Sans-9. */
XftFont *fn;
/* Try to convert Gtk-syntax (Sans 9) to Xft syntax Sans-9. */
- while (i > 0 &&
isdigit (fname[i])
)
+ while (i > 0 &&
'0' <= fname[i] && fname[i] <= '9'
)
--i;
if (fname[i] == ' ')
{
--i;
if (fname[i] == ' ')
{
@@
-136,7
+131,7
@@
openFont (Widget widget, char *name)
}
fn = XftFontOpenName (XtDisplay (widget), screen, fname);
}
fn = XftFontOpenName (XtDisplay (widget), screen, fname);
- if (fname != name) free (fname);
+ if (fname != name)
x
free (fname);
return fn;
}
return fn;
}
@@
-148,7
+143,7
@@
get_text_width_and_height (Widget widget, char *text,
{
int w = 0, h = 0;
char *bp = text;
{
int w = 0, h = 0;
char *bp = text;
-
+
while (bp && *bp != '\0')
{
XGlyphInfo gi;
while (bp && *bp != '\0')
{
XGlyphInfo gi;
@@
-227,16
+222,16
@@
find_xft_data (Widget widget)
Widget parent = XtParent (widget);
struct widget_xft_data *data = NULL;
int nr;
Widget parent = XtParent (widget);
struct widget_xft_data *data = NULL;
int nr;
- while (parent && !inst)
+ while (parent && !inst)
{
inst = lw_get_widget_instance (parent);
parent = XtParent (parent);
}
if (!inst || !inst->xft_data || !inst->xft_data[0].xft_font) return 0;
{
inst = lw_get_widget_instance (parent);
parent = XtParent (parent);
}
if (!inst || !inst->xft_data || !inst->xft_data[0].xft_font) return 0;
- for (nr = 0; data == NULL && nr < inst->nr_xft_data; ++nr)
+ for (nr = 0; data == NULL && nr < inst->nr_xft_data; ++nr)
{
{
- if (inst->xft_data[nr].widget == widget)
+ if (inst->xft_data[nr].widget == widget)
data = &inst->xft_data[nr];
}
data = &inst->xft_data[nr];
}
@@
-250,7
+245,7
@@
command_press (Widget widget,
Cardinal *num_params)
{
struct widget_xft_data *data = find_xft_data (widget);
Cardinal *num_params)
{
struct widget_xft_data *data = find_xft_data (widget);
- if (data)
+ if (data)
{
char *lbl;
/* Since this isn't used for rectangle buttons, use it to for armed. */
{
char *lbl;
/* Since this isn't used for rectangle buttons, use it to for armed. */
@@
-268,11
+263,11
@@
command_reset (Widget widget,
Cardinal *num_params)
{
struct widget_xft_data *data = find_xft_data (widget);
Cardinal *num_params)
{
struct widget_xft_data *data = find_xft_data (widget);
- if (data)
+ if (data)
{
Dimension cr;
XtVaGetValues (widget, XtNcornerRoundPercent, &cr, NULL);
{
Dimension cr;
XtVaGetValues (widget, XtNcornerRoundPercent, &cr, NULL);
- if (cr == 1)
+ if (cr == 1)
{
char *lbl;
XtVaSetValues (widget, XtNcornerRoundPercent, 0, NULL);
{
char *lbl;
XtVaSetValues (widget, XtNcornerRoundPercent, 0, NULL);
@@
-366,14
+361,14
@@
void
xaw_destroy_instance (widget_instance *instance)
{
#ifdef HAVE_XFT
xaw_destroy_instance (widget_instance *instance)
{
#ifdef HAVE_XFT
- if (instance->xft_data)
+ if (instance->xft_data)
{
int i;
{
int i;
- for (i = 0; i < instance->nr_xft_data; ++i)
+ for (i = 0; i < instance->nr_xft_data; ++i)
{
if (instance->xft_data[i].xft_draw)
XftDrawDestroy (instance->xft_data[i].xft_draw);
{
if (instance->xft_data[i].xft_draw)
XftDrawDestroy (instance->xft_data[i].xft_draw);
- if (instance->xft_data[i].p != None)
+ if (instance->xft_data[i].p != None)
{
XtVaSetValues (instance->xft_data[i].widget, XtNbitmap, None,
NULL);
{
XtVaSetValues (instance->xft_data[i].widget, XtNbitmap, None,
NULL);
@@
-384,7
+379,7
@@
xaw_destroy_instance (widget_instance *instance)
if (instance->xft_data[0].xft_font)
XftFontClose (XtDisplay (instance->widget),
instance->xft_data[0].xft_font);
if (instance->xft_data[0].xft_font)
XftFontClose (XtDisplay (instance->widget),
instance->xft_data[0].xft_font);
- free (instance->xft_data);
+
x
free (instance->xft_data);
}
#endif
if (XtIsSubclass (instance->widget, dialogWidgetClass))
}
#endif
if (XtIsSubclass (instance->widget, dialogWidgetClass))
@@
-483,7
+478,7
@@
static XtActionsRec xaw_actions [] = {
static Boolean actions_initted = False;
#ifdef HAVE_XFT
static Boolean actions_initted = False;
#ifdef HAVE_XFT
-static XtActionsRec button_actions[] =
+static XtActionsRec button_actions[] =
{
{ "my_reset", command_reset },
{ "my_press", command_press },
{
{ "my_reset", command_reset },
{ "my_press", command_press },
@@
-563,7
+558,7
@@
make_dialog (char* name,
XtVaGetValues (dialog,
XtNnumChildren, &num,
XtNchildren, &ch, NULL);
XtVaGetValues (dialog,
XtNnumChildren, &num,
XtNchildren, &ch, NULL);
- for (i = 0; i < num; ++i)
+ for (i = 0; i < num; ++i)
{
if (!XtIsSubclass (ch[i], commandWidgetClass)
&& XtIsSubclass (ch[i], labelWidgetClass))
{
if (!XtIsSubclass (ch[i], commandWidgetClass)
&& XtIsSubclass (ch[i], labelWidgetClass))
@@
-574,9
+569,9
@@
make_dialog (char* name,
}
instance->xft_data = 0;
instance->nr_xft_data = 0;
}
instance->xft_data = 0;
instance->nr_xft_data = 0;
- if (w)
+ if (w)
{
{
- XtResource rec[] =
+ XtResource rec[] =
{ { "font", "Font", XtRString, sizeof(String), 0, XtRString,
(XtPointer)"Sans-10" }};
char *fontName = NULL;
{ { "font", "Font", XtRString, sizeof(String), 0, XtRString,
(XtPointer)"Sans-10" }};
char *fontName = NULL;
@@
-590,8
+585,8
@@
make_dialog (char* name,
else
XFreeFont (XtDisplay (dialog), xfn);
}
else
XFreeFont (XtDisplay (dialog), xfn);
}
-
- if (xft_font)
+
+ if (xft_font)
{
instance->nr_xft_data = left_buttons + right_buttons + 1;
instance->xft_data = calloc (instance->nr_xft_data,
{
instance->nr_xft_data = left_buttons + right_buttons + 1;
instance->xft_data = calloc (instance->nr_xft_data,
@@
-639,7
+634,7
@@
make_dialog (char* name,
{
ac = 0;
XtSetArg (av [ac], XtNfromHoriz, button); ac++;
{
ac = 0;
XtSetArg (av [ac], XtNfromHoriz, button); ac++;
- if (i == 0)
+ if (i == 0)
{
/* Separator to the other buttons. */
XtSetArg (av [ac], XtNhorizDistance, 30); ac++;
{
/* Separator to the other buttons. */
XtSetArg (av [ac], XtNhorizDistance, 30); ac++;