Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
5ca2ef64
Commit
5ca2ef64
authored
Mar 18, 1994
by
Richard M. Stallman
Browse files
(Fx_popup_dialog, Fx_popup_menu): Handle case where
mouse_position_hook doesn't store anything.
parent
5e9e88fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
6 deletions
+19
-6
src/xmenu.c
src/xmenu.c
+19
-6
No files found.
src/xmenu.c
View file @
5ca2ef64
...
...
@@ -672,13 +672,19 @@ cached information about equivalent key sequences.")
if
(
EQ
(
position
,
Qt
))
{
/* Use the mouse's current position. */
FRAME_PTR
new_f
;
FRAME_PTR
new_f
=
0
;
Lisp_Object
bar_window
;
int
part
;
unsigned
long
time
;
(
*
mouse_position_hook
)
(
&
new_f
,
&
bar_window
,
&
part
,
&
x
,
&
y
,
&
time
);
XSET
(
window
,
Lisp_Frame
,
new_f
);
if
(
new_f
!=
0
)
XSET
(
window
,
Lisp_Frame
,
new_f
);
else
{
window
=
selected_window
;
XFASTINT
(
x
)
=
0
;
XFASTINT
(
y
)
=
0
;
}
}
else
{
...
...
@@ -884,13 +890,21 @@ cached information about equivalent key sequences.")
if
(
EQ
(
position
,
Qt
))
{
/* Use the mouse's current position. */
FRAME_PTR
new_f
;
FRAME_PTR
new_f
=
0
;
Lisp_Object
bar_window
;
int
part
;
unsigned
long
time
;
(
*
mouse_position_hook
)
(
&
new_f
,
&
bar_window
,
&
part
,
&
x
,
&
y
,
&
time
);
XSET
(
window
,
Lisp_Frame
,
new_f
);
if
(
new_f
!=
0
)
XSET
(
window
,
Lisp_Frame
,
new_f
);
else
{
window
=
selected_window
;
XFASTINT
(
x
)
=
0
;
XFASTINT
(
y
)
=
0
;
}
}
CHECK_NUMBER
(
x
,
0
);
...
...
@@ -1808,7 +1822,6 @@ xdialog_show (f, x, y, menubarp, keymaps, title, error)
/* No selection has been chosen yet. */
menu_item_selection
=
0
;
/* Display the menu. */
lw_pop_up_all_widgets
(
dialog_id
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment