aboutsummaryrefslogtreecommitdiff
path: root/libXaw/src/SimpleMenu.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-10 14:58:33 +0200
committermarha <marha@users.sourceforge.net>2012-04-10 14:58:33 +0200
commit5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (patch)
treec10939819ba1167cdc905a0c105c7ae4091abbc3 /libXaw/src/SimpleMenu.c
parent67326634496ef21b4acbf4cef2f05040d34aef9b (diff)
downloadvcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.tar.gz
vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.tar.bz2
vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.zip
Updated following packages:
bigreqsproto-1.1.2 fontsproto-2.1.2 recordproto-1.14.2 scrnsaverproto-1.2.2 xcmiscproto-1.2.2 libXt-1.1.3 xhost-1.0.5 kbproto-1.0.6 libXrender-0.9.7 libxkbfile-1.0.8 freetype-2.4.9 libXaw-1.0.10 libXpm-3.5.10 xproto-7.0.23
Diffstat (limited to 'libXaw/src/SimpleMenu.c')
-rw-r--r--libXaw/src/SimpleMenu.c99
1 files changed, 49 insertions, 50 deletions
diff --git a/libXaw/src/SimpleMenu.c b/libXaw/src/SimpleMenu.c
index 0152a8560..8defdf7d3 100644
--- a/libXaw/src/SimpleMenu.c
+++ b/libXaw/src/SimpleMenu.c
@@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group.
* Date: April 3, 1989
*
* By: Chris D. Peterson
- * MIT X Consortium
+ * MIT X Consortium
* kit@expo.lcs.mit.edu
*/
@@ -39,7 +39,6 @@ in this Software without prior written authorization from The Open Group.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
#include <X11/Xmu/Initer.h>
-#include <X11/Xmu/SysUtil.h>
#include <X11/Xaw/Cardinals.h>
#include <X11/Xaw/SimpleMenP.h>
#include <X11/Xaw/SmeBSBP.h>
@@ -224,7 +223,7 @@ static XtResource resources[] = {
XtCBackingStore,
XtRBackingStore,
sizeof(int),
- offset(backing_store),
+ offset(backing_store),
XtRImmediate,
(XtPointer)(Always + WhenMapped + NotUseful)
},
@@ -234,12 +233,12 @@ static XtResource resources[] = {
XawCDisplayList,
XawRDisplayList,
sizeof(XawDisplayList*),
- offset(display_list),
+ offset(display_list),
XtRImmediate,
NULL
},
#endif
-};
+};
#undef offset
static char defaultTranslations[] =
@@ -266,7 +265,7 @@ static XtActionsRec actionsList[] =
{"call-proc", XawCallProcAction},
#endif
};
-
+
static CompositeClassExtensionRec extension_rec = {
NULL, /* next_extension */
NULLQUARK, /* record_type */
@@ -399,7 +398,7 @@ XawSimpleMenuInitialize(Widget request, Widget cnew,
XmuCallInitializers(XtWidgetToApplicationContext(cnew));
- if (smw->simple_menu.label_class == NULL)
+ if (smw->simple_menu.label_class == NULL)
smw->simple_menu.label_class = smeBSBObjectClass;
smw->simple_menu.label = NULL;
@@ -473,7 +472,7 @@ XawSimpleMenuRedisplay(Widget w, XEvent *event, Region region)
if (!XtIsManaged((Widget)*entry))
continue;
- if (region != NULL)
+ if (region != NULL)
switch(XRectInRegion(region, XtX(*entry),XtY(*entry),
XtWidth(*entry), XtHeight(*entry))) {
case RectangleIn:
@@ -600,7 +599,7 @@ XawSimpleMenuSetValues(Widget current, Widget request, Widget cnew,
CreateLabel(cnew);
else { /* Change */
Arg arglist[1];
-
+
XtSetArg(arglist[0], XtNlabel, smw_new->simple_menu.label_string);
XtSetValues((Widget)smw_new->simple_menu.label, arglist, ONE);
}
@@ -609,7 +608,7 @@ XawSimpleMenuSetValues(Widget current, Widget request, Widget cnew,
if (smw_old->simple_menu.label_class != smw_new->simple_menu.label_class)
XtAppWarning(XtWidgetToApplicationContext(cnew),
"No Dynamic class change of the SimpleMenu Label.");
-
+
if (smw_old->simple_menu.top_margin != smw_new->simple_menu.top_margin
|| smw_old->simple_menu.bottom_margin
!= smw_new->simple_menu.bottom_margin) {
@@ -638,7 +637,7 @@ XawSimpleMenuSetValues(Widget current, Widget request, Widget cnew,
return (ret_val);
}
-/*
+/*
* Function:
* XawSimpleMenuSetValuesHook
*
@@ -655,10 +654,10 @@ XawSimpleMenuSetValuesHook(Widget w, ArgList arglist, Cardinal *num_args)
{
Cardinal i;
Dimension width, height;
-
+
width = XtWidth(w);
height = XtHeight(w);
-
+
for (i = 0 ; i < *num_args ; i++) {
if (streq(arglist[i].name, XtNwidth))
width = (Dimension)arglist[i].value;
@@ -769,14 +768,14 @@ XawSimpleMenuChangeManaged(Widget w)
/*
* Global Action Routines
- *
+ *
* These actions routines will be added to the application's
* global action list
*/
/*
* Function:
* PositionMenuAction
- *
+ *
* Parameters:
* w - a widget (no the simple menu widget)
* event - the event that caused this action
@@ -791,7 +790,7 @@ XawSimpleMenuChangeManaged(Widget w)
static void
PositionMenuAction(Widget w, XEvent *event,
String *params, Cardinal *num_params)
-{
+{
Widget menu;
XPoint loc;
@@ -805,13 +804,13 @@ PositionMenuAction(Widget w, XEvent *event,
if ((menu = FindMenu(w, params[0])) == NULL) {
char error_buf[BUFSIZ];
- (void)XmuSnprintf(error_buf, sizeof(error_buf),
- "SimpleMenuWidget: could not find menu named %s.",
- params[0]);
+ snprintf(error_buf, sizeof(error_buf),
+ "SimpleMenuWidget: could not find menu named %s.",
+ params[0]);
XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
return;
}
-
+
switch (event->type) {
case ButtonPress:
case ButtonRelease:
@@ -834,7 +833,7 @@ PositionMenuAction(Widget w, XEvent *event,
PositionMenu(menu, NULL);
break;
}
-}
+}
/*
* Widget Action Routines
@@ -848,17 +847,17 @@ PositionMenuAction(Widget w, XEvent *event,
* event - event that caused this action
* params - not used
* num_params - ""
- *
+ *
* Description:
* Unhighlights current entry.
*/
/*ARGSUSED*/
static void
Unhighlight(Widget w, XEvent *event, String *params, Cardinal *num_params)
-{
+{
SimpleMenuWidget smw = (SimpleMenuWidget)w;
SmeObject entry = smw->simple_menu.entry_set;
-
+
if (entry == NULL)
return;
@@ -987,7 +986,7 @@ XawSimpleMenuAddGlobalActions(XtAppContext app_con)
{
XtInitializeWidgetClass(simpleMenuWidgetClass);
XmuCallInitializers(app_con);
-}
+}
/*
* Function:
@@ -1008,7 +1007,7 @@ XawSimpleMenuGetActiveEntry(Widget w)
SimpleMenuWidget smw = (SimpleMenuWidget)w;
return ((Widget)smw->simple_menu.entry_set);
-}
+}
/*
* Function:
@@ -1026,7 +1025,7 @@ XawSimpleMenuClearActiveEntry(Widget w)
SimpleMenuWidget smw = (SimpleMenuWidget)w;
smw->simple_menu.entry_set = NULL;
-}
+}
/*
* Private Functions
@@ -1037,7 +1036,7 @@ XawSimpleMenuClearActiveEntry(Widget w)
*
* Parameters:
* w - smw widget
- *
+ *
* Description:
* Creates the label object and makes sure it is the first child in
* in the list.
@@ -1060,8 +1059,8 @@ CreateLabel(Widget w)
XtSetArg(args[0], XtNlabel, smw->simple_menu.label_string);
XtSetArg(args[1], XtNjustify, XtJustifyCenter);
- smw->simple_menu.label = (SmeObject)
- XtCreateManagedWidget("menuLabel",
+ smw->simple_menu.label = (SmeObject)
+ XtCreateManagedWidget("menuLabel",
smw->simple_menu.label_class, w, args, TWO);
next_child = NULL;
@@ -1266,7 +1265,7 @@ Layout(Widget w, Dimension *width_ret, Dimension *height_ret)
*height_ret = XtHeight(current_entry);
}
}
-
+
/*
* Function:
* AddPositionAction
@@ -1304,11 +1303,11 @@ AddPositionAction(XtAppContext app_con, XPointer data)
* Returns:
* The menu widget or NULL.
*/
-static Widget
+static Widget
FindMenu(Widget widget, String name)
{
Widget w, menu;
-
+
for (w = widget; w != NULL; w = XtParent(w))
if ((menu = XtNameToWidget(w, name)) != NULL)
return (menu);
@@ -1333,12 +1332,12 @@ PositionMenu(Widget w, XPoint *location)
SimpleMenuWidget smw = (SimpleMenuWidget)w;
SmeObject entry;
XPoint t_point;
-
+
if (location == NULL) {
Window temp1, temp2;
int root_x, root_y, tempX, tempY;
unsigned int tempM;
-
+
location = &t_point;
if (XQueryPointer(XtDisplay(w), XtWindow(w), &temp1, &temp2,
&root_x, &root_y, &tempX, &tempY, &tempM) == False) {
@@ -1350,14 +1349,14 @@ PositionMenu(Widget w, XPoint *location)
location->x = (short) root_x;
location->y = (short) root_y;
}
-
+
/*
* The width will not be correct unless it is realized
*/
XtRealizeWidget(w);
-
+
location->x -= XtWidth(w) >> 1;
-
+
if (smw->simple_menu.popup_entry == NULL)
entry = smw->simple_menu.label;
else
@@ -1388,20 +1387,20 @@ MoveMenu(Widget w, int x, int y)
Arg arglist[2];
Cardinal num_args = 0;
SimpleMenuWidget smw = (SimpleMenuWidget)w;
-
+
if (smw->simple_menu.menu_on_screen) {
int width = XtWidth(w) + (XtBorderWidth(w) << 1);
int height = XtHeight(w) + (XtBorderWidth(w) << 1);
-
+
if (x >= 0) {
int scr_width = WidthOfScreen(XtScreen(w));
if (x + width > scr_width)
x = scr_width - width;
}
- if (x < 0)
+ if (x < 0)
x = 0;
-
+
if (y >= 0) {
int scr_height = HeightOfScreen(XtScreen(w));
@@ -1411,7 +1410,7 @@ MoveMenu(Widget w, int x, int y)
if (y < 0)
y = 0;
}
-
+
XtSetArg(arglist[num_args], XtNx, x); num_args++;
XtSetArg(arglist[num_args], XtNy, y); num_args++;
XtSetValues(w, arglist, num_args);
@@ -1435,14 +1434,14 @@ static void
ChangeCursorOnGrab(Widget w, XtPointer temp1, XtPointer temp2)
{
SimpleMenuWidget smw = (SimpleMenuWidget)w;
-
+
/*
* The event mask here is what is currently in the MIT implementation.
* There really needs to be a way to get the value of the mask out
* of the toolkit (CDP 5/26/89).
*/
XChangeActivePointerGrab(XtDisplay(w), ButtonPressMask | ButtonReleaseMask,
- smw->simple_menu.cursor,
+ smw->simple_menu.cursor,
XtLastTimestampProcessed(XtDisplay(w)));
}
@@ -1461,7 +1460,7 @@ MakeSetValuesRequest(Widget w, unsigned int width, unsigned int height)
SimpleMenuWidget smw = (SimpleMenuWidget)w;
Arg arglist[2];
Cardinal num_args = 0;
-
+
if (!smw->simple_menu.recursive_set_values) {
if (XtWidth(smw) != width || XtHeight(smw) != height) {
smw->simple_menu.recursive_set_values = True;
@@ -1495,7 +1494,7 @@ DoGetEventEntry(Widget w, int x_loc, int y_loc)
return (*entry);
}
}
-
+
return (NULL);
}
@@ -1544,7 +1543,7 @@ GetEventEntry(Widget w, XEvent *event)
"Unknown event type in GetEventEntry().");
return (NULL);
}
-
+
if (x_loc < 0 || x_loc >= XtWidth(smw) ||
y_loc < 0 || y_loc >= XtHeight(smw))
return (NULL);
@@ -1702,7 +1701,7 @@ MakeResizeRequest(Widget w)
{
int tries;
Dimension width, height;
-
+
width = XtWidth(w);
height = XtHeight(w);
@@ -1762,7 +1761,7 @@ PopupSubMenu(SimpleMenuWidget smw)
popleft = (smw->simple_menu.state & SMW_POPLEFT) != 0;
- if (popleft)
+ if (popleft)
XtTranslateCoords((Widget)smw, -(int)XtWidth(menu),
XtY(entry) - XtBorderWidth(menu), &menu_x, &menu_y);
else