aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.c.old
diff options
context:
space:
mode:
authorJim Blandy1992-05-18 08:14:41 +0000
committerJim Blandy1992-05-18 08:14:41 +0000
commitffd56f97cf56501f7a6981c184192e9043e4eafd (patch)
treed463f4585c85fa76b33d3663271bbb4126d7b116 /src/xselect.c.old
parent502ddf238f0ed280a301426804b2ed16ec1c49cc (diff)
downloademacs-ffd56f97cf56501f7a6981c184192e9043e4eafd.tar.gz
emacs-ffd56f97cf56501f7a6981c184192e9043e4eafd.zip
*** empty log message ***
Diffstat (limited to 'src/xselect.c.old')
-rw-r--r--src/xselect.c.old17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/xselect.c.old b/src/xselect.c.old
index a8c26f7e994..a88208bece9 100644
--- a/src/xselect.c.old
+++ b/src/xselect.c.old
@@ -1,11 +1,11 @@
1/* X Selection processing for emacs 1/* X Selection processing for emacs
2 Copyright (C) 1990 Free Software Foundation. 2 Copyright (C) 1990, 1992 Free Software Foundation.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 1, or (at your option) 8the Free Software Foundation; either version 2, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU Emacs is distributed in the hope that it will be useful,
@@ -32,6 +32,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
32/* The last 23 bits of the timestamp of the last mouse button event. */ 32/* The last 23 bits of the timestamp of the last mouse button event. */
33extern Time mouse_timestamp; 33extern Time mouse_timestamp;
34 34
35/* An expedient hack! Fix this! */
36#define last_event_timestamp CurrentTime
37
35/* t if a mouse button is depressed. */ 38/* t if a mouse button is depressed. */
36extern Lisp_Object Vmouse_grabbed; 39extern Lisp_Object Vmouse_grabbed;
37 40
@@ -130,7 +133,7 @@ own_selection (selection_type, time)
130 selecting_window, time); 133 selecting_window, time);
131 owner_window = XGetSelectionOwner (x_current_display, selection_type); 134 owner_window = XGetSelectionOwner (x_current_display, selection_type);
132 135
133 if (owner_window != selecting_window) 136 if (owner_window != selecting_window)
134 return 0; 137 return 0;
135 138
136 return 1; 139 return 1;
@@ -160,7 +163,7 @@ but optional second argument TYPE may specify secondary or clipboard.")
160 x_begin_selection_own = event_time; 163 x_begin_selection_own = event_time;
161 val = Vx_selection_value = string; 164 val = Vx_selection_value = string;
162 } 165 }
163 UNBLOCK_INPUT; 166 UNBLOCK_INPUT;
164 } 167 }
165 else if (EQ (type, Qsecondary)) 168 else if (EQ (type, Qsecondary))
166 { 169 {
@@ -177,10 +180,10 @@ but optional second argument TYPE may specify secondary or clipboard.")
177 BLOCK_INPUT; 180 BLOCK_INPUT;
178 if (own_selection (Xatom_clipboard, event_time)) 181 if (own_selection (Xatom_clipboard, event_time))
179 { 182 {
180 x_begin_clipboard_own = event_time; 183 x_begin_clipboard_own = event_time;
181 val = Vx_clipboard_value = string; 184 val = Vx_clipboard_value = string;
182 } 185 }
183 UNBLOCK_INPUT; 186 UNBLOCK_INPUT;
184 } 187 }
185 else 188 else
186 error ("Invalid X selection type"); 189 error ("Invalid X selection type");
@@ -545,7 +548,7 @@ selection, but optional argument TYPE may specify secondary or clipboard.")
545 if (NILP (type) || EQ (type, Qprimary)) 548 if (NILP (type) || EQ (type, Qprimary))
546 { 549 {
547 if (!NILP (Vx_selection_value)) 550 if (!NILP (Vx_selection_value))
548 return Vx_selection_value; 551 return Vx_selection_value;
549 552
550 return get_selection_value (XA_PRIMARY); 553 return get_selection_value (XA_PRIMARY);
551 } 554 }