mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-18 02:47:36 +00:00
Simplify Haiku drag-and-drop implementation
* lisp/term/haiku-win.el (x-begin-drag): Bind `mouse-highlight' to nil. * src/haikuselect.c (haiku_unwind_drag_message) (Fhaiku_drag_message): * src/haikuterm.h (HAVE_CHAR_CACHE_MAX): * src/xdisp.c (note_mouse_highlight): Delete `haiku_dnd_in_progress' variable.
This commit is contained in:
parent
52c31f9e13
commit
f8be5eb97f
4 changed files with 2 additions and 5 deletions
|
|
@ -279,6 +279,7 @@ take effect on menu items until the menu bar is updated again."
|
|||
(unless haiku-dnd-selection-value
|
||||
(error "No local value for XdndSelection"))
|
||||
(let ((message nil)
|
||||
(mouse-highlight nil)
|
||||
(haiku-signal-invalid-refs nil))
|
||||
(dolist (target targets)
|
||||
(let ((selection-converter (cdr (assoc (intern target)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
bool haiku_dnd_in_progress;
|
||||
static void haiku_lisp_to_message (Lisp_Object, void *);
|
||||
|
||||
DEFUN ("haiku-selection-data", Fhaiku_selection_data, Shaiku_selection_data,
|
||||
|
|
@ -728,7 +727,6 @@ static void
|
|||
haiku_unwind_drag_message (void *message)
|
||||
{
|
||||
BMessage_delete (message);
|
||||
haiku_dnd_in_progress = false;
|
||||
}
|
||||
|
||||
DEFUN ("haiku-drag-message", Fhaiku_drag_message, Shaiku_drag_message,
|
||||
|
|
@ -776,7 +774,6 @@ ignored if it is dropped on top of FRAME. */)
|
|||
if (!FRAME_VISIBLE_P (f))
|
||||
error ("Frame is invisible");
|
||||
|
||||
haiku_dnd_in_progress = true;
|
||||
be_message = be_create_simple_message ();
|
||||
|
||||
record_unwind_protect_ptr (haiku_unwind_drag_message, be_message);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
|
|||
#define HAVE_CHAR_CACHE_MAX 65535
|
||||
|
||||
extern int popup_activated_p;
|
||||
extern bool haiku_dnd_in_progress;
|
||||
|
||||
extern void be_app_quit (void);
|
||||
|
||||
|
|
|
|||
|
|
@ -34247,7 +34247,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
|
|||
#endif
|
||||
|
||||
#if defined (HAVE_HAIKU)
|
||||
if (popup_activated_p || haiku_dnd_in_progress)
|
||||
if (popup_activated_p)
|
||||
return;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue