Mercurial > emacs
comparison lisp/x-dnd.el @ 83541:694bbb62a75d
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-371
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-372
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-373
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-374
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-375
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-376
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-377
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-378
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-379
Merge from erc--emacs--21
* emacs@sv.gnu.org/emacs--devo--0--patch-380
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-381
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-382
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-383
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-384
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-385
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-386
Update from erc--emacs--22
* emacs@sv.gnu.org/emacs--devo--0--patch-387
Fix ERC bug introduced in last patch
* emacs@sv.gnu.org/emacs--devo--0--patch-388
Update from erc--emacs--22
* emacs@sv.gnu.org/emacs--devo--0--patch-389
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-390
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-391
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-392
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-393
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-394
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-395
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-396
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-397
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-398
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-399
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-400
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-401
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-402
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-403
Rcirc update from Ryan Yeske
* emacs@sv.gnu.org/emacs--devo--0--patch-404
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-405
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-406
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-407
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-408
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-409
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-410
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-411
Miscellaneous tq-related fixes.
* emacs@sv.gnu.org/emacs--devo--0--patch-412
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-121
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-122
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-123
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-124
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-125
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-126
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-127
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-581
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 14 Oct 2006 16:56:21 +0000 |
parents | c44562301a11 030d7ce12631 |
children | 32073cbc5eb6 |
comparison
equal
deleted
inserted
replaced
83540:0c89a85addc3 | 83541:694bbb62a75d |
---|---|
120 | 120 |
121 | 121 |
122 (defun x-dnd-init-frame (&optional frame) | 122 (defun x-dnd-init-frame (&optional frame) |
123 "Setup drag and drop for FRAME (i.e. create appropriate properties)." | 123 "Setup drag and drop for FRAME (i.e. create appropriate properties)." |
124 (when (eq 'x (window-system frame)) | 124 (when (eq 'x (window-system frame)) |
125 (x-register-dnd-atom "DndProtocol" frame) | |
126 (x-register-dnd-atom "_MOTIF_DRAG_AND_DROP_MESSAGE" frame) | |
127 (x-register-dnd-atom "XdndEnter" frame) | |
128 (x-register-dnd-atom "XdndPosition" frame) | |
129 (x-register-dnd-atom "XdndLeave" frame) | |
130 (x-register-dnd-atom "XdndDrop" frame) | |
125 (x-dnd-init-xdnd-for-frame frame) | 131 (x-dnd-init-xdnd-for-frame frame) |
126 (x-dnd-init-motif-for-frame frame))) | 132 (x-dnd-init-motif-for-frame frame))) |
127 | 133 |
128 (defun x-dnd-get-state-cons-for-frame (frame-or-window) | 134 (defun x-dnd-get-state-cons-for-frame (frame-or-window) |
129 "Return the entry in x-dnd-current-state for a frame or window." | 135 "Return the entry in x-dnd-current-state for a frame or window." |
318 (not (window-minibuffer-p w)) | 324 (not (window-minibuffer-p w)) |
319 (not (window-dedicated-p w))) | 325 (not (window-dedicated-p w))) |
320 ;; If dropping in an ordinary window which we could use, | 326 ;; If dropping in an ordinary window which we could use, |
321 ;; let dnd-open-file-other-window specify what to do. | 327 ;; let dnd-open-file-other-window specify what to do. |
322 (progn | 328 (progn |
323 (goto-char (posn-point (event-start event))) | 329 (when (not mouse-yank-at-point) |
330 (goto-char (posn-point (event-start event)))) | |
324 (funcall handler window action data)) | 331 (funcall handler window action data)) |
325 ;; If we can't display the file here, | 332 ;; If we can't display the file here, |
326 ;; make a new window for it. | 333 ;; make a new window for it. |
327 (let ((dnd-open-file-other-window t)) | 334 (let ((dnd-open-file-other-window t)) |
328 (select-frame frame) | 335 (select-frame frame) |