ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.541 by root, Thu Feb 20 18:59:13 2014 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h"
57#endif
58
53#include <wchar.h> 59#include <signal.h>
60
61#if LINUX_YIELD_HACK
62# include <time.h>
63#endif
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
56 66
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 68
59// exception thrown when the command parser runs out of input data 69#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input;
61 70
62/*{{{ Convert the keypress event into a string */ 71#define ISO_14755_STARTED 0x80000000UL
63void 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
74#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
75#define ISO_14755_MASK 0x0fffffffUL
76
77#if ISO_14755
78static unsigned short iso14755_symtab[] = {
79 // keysym, unicode
80 XK_Left, 0x2190,
81 XK_KP_Left, 0x2190,
82 XK_Up, 0x2191,
83 XK_KP_Up, 0x2191,
84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91
92 XK_Prior, 0x21de,
93 XK_Next, 0x21df,
94 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6,
96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7,
98
99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0,
106 XK_Home, 0x21f1,
107 XK_End, 0x21f2,
108
109 XK_Execute, 0x2318,
110 XK_Begin, 0x2320,
111 XK_Delete, 0x2326,
112 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380,
115 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389,
118 XK_Break, 0x238a,
119 XK_Escape, 0x238b,
120 XK_Undo, 0x238c,
121 XK_Print, 0x2399,
122
123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
131 XK_KP_Space, 0x2422,
132#endif
133 0,
134};
135
136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y)
138{
139 x = Pixel2Col (x);
140 y = Pixel2Row (y);
141
142 if (!IN_RANGE_EXC (x, 0, ncol)
143 || !IN_RANGE_EXC (y, 0, nrow))
144 return;
145
146 for (;;)
147 {
148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
151
152 if (t != NOCHAR || !x)
153 {
154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54;
156 break;
157 }
158
159 x--;
160 }
161}
162
163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname;
168 int len;
169
170# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch))
172 {
173 len = rxvt_composite.expand (ch, 0);
174 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr);
176 }
177 else
178# endif
179 {
180 ch2 = ch;
181
182 alloc = 0;
183 chr = &ch2;
184 len = 1;
185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
210
211 max_it (width, strlen (attr));
212
213 if (y >= 0)
214 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
216 x = 0;
217 }
218
219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
222
223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
224
225 for (int y = 0; y < len; y++)
226 {
227 char buf[9];
228
229 ch = *chr++;
230
231 sprintf (buf, "%8x", ch);
232 scr_overlay_set (0, y + 1, buf);
233 scr_overlay_set (9, y + 1, '=');
234# if !UNICODE_3
235 if (ch >= 0x10000)
236 ch = 0xfffd;
237# endif
238 scr_overlay_set (11, y + 1, ch, r);
239
240 if (WCWIDTH (ch) >= 2)
241 scr_overlay_set (12, y + 1, NOCHAR, r);
242 }
243
244// {
245// char buf[4+4+3+1];
246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
247// scr_overlay_set (0, 0, buf);
248// }
249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
252 scr_overlay_set (0, len + 2 + i, fname[i]);
253 free (fname[i]);
254 }
255
256# if ENABLE_COMBINING
257 if (alloc)
258 delete [] alloc;
259# endif
260}
261#endif
262
263void ecb_cold
264rxvt_term::commit_iso14755 ()
265{
266 wchar_t ch = iso14755buf & ISO_14755_MASK;
267
268 if (iso14755buf & ISO_14755_51)
269 {
270 char mb[MB_LEN_MAX];
271 int len;
272
273 // allow verbatim 0-bytes and control-bytes to be entered
274 if (ch >= 0x20)
275 len = wctomb (mb, ch);
276 else
277 {
278 mb[0] = ch;
279 len = 1;
280 }
281
282 if (len > 0)
283 tt_write (mb, len);
284 else
285 scr_bell ();
286 }
287
288 iso14755buf = 0;
289}
290
291static int ecb_cold
292hex_keyval (XKeyEvent &ev)
293{
294 // check whether this event corresponds to a hex digit
295 // if the modifiers had not been pressed.
296 for (int index = 0; index < 8; index++)
297 {
298 KeySym k = XLookupKeysym (&ev, index);
299
300 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
301 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
302 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
303 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
304 }
305
306 return -1;
307}
308#endif
309
310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405void ecb_cold
64rxvt_term::lookup_key (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
65{ 407{
66 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
67 unsigned int newlen;
68 KeySym keysym; 409 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 410 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 411 char kbuf[KBUFSZ];
412
413#if ISO_14755
414 if (iso14755buf & ISO_14755_52)
415 return;
416#endif
74 417
75 /* 418 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 419 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 420 * escape sequence to toggle the Keypad.
78 * 421 *
79 * Always permit `shift' to override the current setting 422 * Always permit `shift' to override the current setting
80 */ 423 */
81 shft = (ev.state & ShiftMask); 424 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 425 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 426 meta = ev.state & ModMetaMask;
84
85 if (numlock_state || (ev.state & ModNumLockMask))
86 {
87 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP);
89 }
90 427
91 kbuf[0] = 0; 428 kbuf[0] = 0;
92 429
93#ifdef USE_XIM 430#if USE_XIM
94 if (Input_Context) 431 if (Input_Context)
95 { 432 {
96 Status status_return; 433 Status status_return;
97 434
98#if 0 435#if 0
99#ifdef X_HAVE_UTF8_STRING 436#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 437 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 438 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 439 KBUFSZ, &keysym, &status_return);
103 else 440 else
104#endif 441#endif
105#endif 442#endif
106 { 443 {
… …
108 445
109 // the XOpenIM manpage lies about hardcoding the locale 446 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 447 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 448 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 449 SET_LOCALE (rs[Rs_imLocale]);
450
113 // assume wchar_t == unicode or better 451 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 452 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 453 KBUFSZ, &keysym, &status_return);
454
116 if (rs[Rs_imLocale]) 455 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 456 SET_LOCALE (locale);
118 457
119 if (status_return == XLookupChars 458 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 459 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 480 || status_return == XLookupBoth;
142 } 481 }
143 else 482 else
144#endif 483#endif
145 { 484 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 485 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 486 valid_keysym = keysym != NoSymbol;
148 } 487 }
149 488
150 if (valid_keysym) 489 if (valid_keysym)
151 { 490 {
491#ifdef KEYSYM_RESOURCE
492 if (keyboard->dispatch (this, keysym, ev.state))
493 return;
494#endif
495
152 if (TermWin.saveLines) 496 if (saveLines)
153 { 497 {
154#ifdef UNSHIFTED_SCROLLKEYS 498#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 499 if (!ctrl && !meta)
156 {
157#else 500#else
158 if (IS_SCROLL_MOD) 501 if (IS_SCROLL_MOD)
502#endif
159 { 503 {
160#endif
161 int lnsppg; 504 int lnsppg;
162 505
163#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 508#else
166 lnsppg = TermWin.nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
167#endif 510#endif
511 max_it (lnsppg, 1);
512
168 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
169 { 514 {
170 scr_page (UP, lnsppg); 515 scr_page (lnsppg);
171 return; 516 return;
172 } 517 }
173 else if (keysym == XK_Next) 518 else if (keysym == XK_Next)
174 { 519 {
175 scr_page (DN, lnsppg); 520 scr_page (-lnsppg);
176 return; 521 return;
177 } 522 }
178 } 523 }
179#ifdef SCROLL_ON_UPDOWN_KEYS 524#ifdef SCROLL_ON_UPDOWN_KEYS
180 if (IS_SCROLL_MOD) 525 if (IS_SCROLL_MOD)
181 { 526 {
182 if (keysym == XK_Up) 527 if (keysym == XK_Up)
183 { 528 {
184 scr_page (UP, 1); 529 scr_page (1);
185 return; 530 return;
186 } 531 }
187 else if (keysym == XK_Down) 532 else if (keysym == XK_Down)
188 { 533 {
189 scr_page (DN, 1); 534 scr_page (-1);
190 return; 535 return;
191 } 536 }
192 } 537 }
193#endif 538#endif
194#ifdef SCROLL_ON_HOMEEND_KEYS 539#ifdef SCROLL_ON_HOMEEND_KEYS
195 if (IS_SCROLL_MOD) 540 if (IS_SCROLL_MOD)
196 { 541 {
197 if (keysym == XK_Home) 542 if (keysym == XK_Home)
198 { 543 {
199 scr_move_to (0, 1); 544 scr_changeview (top_row);
200 return; 545 return;
201 } 546 }
202 else if (keysym == XK_End) 547 else if (keysym == XK_End)
203 { 548 {
204 scr_move_to (1, 0); 549 scr_changeview (0);
205 return; 550 return;
206 } 551 }
207 } 552 }
208#endif 553#endif
209 } 554 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 559 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 560 {
216 keysym += (XK_F11 - XK_F1); 561 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 562 shft = 0; /* turn off Shift */
218 } 563 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 564 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 565 {
221 switch (keysym) 566 switch (keysym)
222 { 567 {
223 /* normal XTerm key bindings */ 568 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 569 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 570 selection_request (ev.time);
226 return; 571 return;
572#if TODO
227 /* rxvt extras */ 573 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP);
230 return; 575 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN);
233 return; 577 return;
578#endif
234 } 579 }
235 } 580 }
236 } 581 }
237#ifdef PRINTPIPE 582
238 if (keysym == XK_Print) 583#if ENABLE_FRILLS || ISO_14755
239 { 584 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
241 return;
242 } 586 {
243#endif 587 int hv;
244 588
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 589 if (iso14755buf & ISO_14755_51
246 { 590 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 591 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 592 {
250 unsigned int l; 593 commit_iso14755 ();
251 const unsigned char *kbuf0; 594 iso14755buf = ISO_14755_51;
252 595# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 596 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 597# endif
261 ) 598 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 599 }
266 600 else if (keysym == XK_BackSpace)
267 tt_write (kbuf0, l); 601 {
602 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
603# if ISO_14755
604 iso14755_51 (iso14755buf & ISO_14755_MASK);
605# endif
606 return;
607 }
608 else if ((hv = hex_keyval (ev)) >= 0)
609 {
610 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
611 | hv | ISO_14755_51;
612# if ISO_14755
613 iso14755_51 (iso14755buf & ISO_14755_MASK);
614# endif
268 return; 615 return;
269 } 616 }
270 else 617 else
271#endif
272 { 618 {
273 newlen = 1; 619# if ISO_14755
620 scr_overlay_off ();
621# endif
622 iso14755buf = 0;
623 }
624 }
625 else if (option (Opt_iso14755) &&
626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
628 if (!(iso14755buf & ISO_14755_STARTED))
629 {
630 iso14755buf |= ISO_14755_STARTED;
631# if ISO_14755
632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
633 scr_overlay_set (0, 0, "ISO 14755 mode");
634# endif
635 }
636#endif
637
638#ifdef PRINTPIPE
639 if (keysym == XK_Print)
640 {
641 scr_printscreen (ctrl | shft);
642 return;
643 }
644#endif
645
646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
647 {
648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
649 unsigned int newlen = 1;
650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
654 keysym = translate_keypad (keysym, kp);
655
274 switch (keysym) 656 switch (keysym)
657 {
658#ifndef NO_BACKSPACE_KEY
659 case XK_BackSpace:
660 if (priv_modes & PrivMode_HaveBackSpace)
661 {
662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
663 ^ !!ctrl) ? '\b' : '\177';
664 kbuf[1] = '\0';
665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
691
692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
275 { 772 {
276#ifndef NO_BACKSPACE_KEY 773 int param = map_function_key (keysym);
277 case XK_BackSpace: 774 if (param > 0)
278 if (PrivateModes & PrivMode_HaveBackSpace) 775 sprintf (kbuf,"\033[%d~", param);
279 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0';
283 }
284 else 776 else
285 STRCPY (kbuf, key_backspace);
286 break;
287#endif
288#ifndef NO_DELETE_KEY
289 case XK_Delete:
290 STRCPY (kbuf, key_delete);
291 break;
292#endif
293 case XK_Tab:
294 if (shft)
295 STRCPY (kbuf, "\033[Z");
296 else
297 {
298#ifdef CTRL_TAB_MAKES_META
299 if (ctrl)
300 meta = 1;
301#endif
302#ifdef MOD4_TAB_MAKES_META
303 if (ev.state & Mod4Mask)
304 meta = 1;
305#endif
306 newlen = 0;
307 }
308 break;
309
310#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
316 {
317 STRCPY (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break;
320 }
321 else
322 /* translate to std. cursor key */
323 keysym = XK_Left + (keysym - XK_KP_Left);
324 /* FALLTHROUGH */
325#endif
326 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */
333 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl)
336 {
337 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left];
339 }
340 else if (PrivateModes & PrivMode_aplCUR)
341 kbuf[1] = 'O';
342 break;
343
344#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior
346 case XK_KP_Prior:
347 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
349 {
350 STRCPY (kbuf, "\033Oy");
351 break;
352 }
353 /* FALLTHROUGH */
354# endif
355 case XK_Prior:
356 STRCPY (kbuf, "\033[5~");
357 break;
358# ifdef XK_KP_Next
359 case XK_KP_Next:
360 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
362 {
363 STRCPY (kbuf, "\033Os");
364 break;
365 }
366 /* FALLTHROUGH */
367# endif
368 case XK_Next:
369 STRCPY (kbuf, "\033[6~");
370 break;
371#endif
372 case XK_KP_Enter:
373 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
375 {
376 STRCPY (kbuf, "\033OM");
377 }
378 else
379 {
380 kbuf[0] = '\r';
381 kbuf[1] = '\0';
382 }
383 break;
384
385#ifdef XK_KP_Begin
386 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou");
388 break;
389
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif
398 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1);
404 break;
405
406 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */
408 case XK_KP_Separator: /* "\033Ol" : "," */
409 case XK_KP_Subtract: /* "\033Om" : "-" */
410 case XK_KP_Decimal: /* "\033On" : "." */
411 case XK_KP_Divide: /* "\033Oo" : "/" */
412 case XK_KP_0: /* "\033Op" : "0" */
413 case XK_KP_1: /* "\033Oq" : "1" */
414 case XK_KP_2: /* "\033Or" : "2" */
415 case XK_KP_3: /* "\033Os" : "3" */
416 case XK_KP_4: /* "\033Ot" : "4" */
417 case XK_KP_5: /* "\033Ou" : "5" */
418 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
424 {
425 STRCPY (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply);
427 }
428 else
429 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0';
432 }
433 break;
434
435 case XK_Find:
436 STRCPY (kbuf, "\033[1~");
437 break;
438 case XK_Insert:
439 STRCPY (kbuf, "\033[2~");
440 break;
441#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove:
443 /* FALLTHROUGH */
444#endif
445 case XK_Execute:
446 STRCPY (kbuf, "\033[3~");
447 break;
448 case XK_Select:
449 STRCPY (kbuf, "\033[4~");
450 break;
451#ifdef XK_KP_End
452 case XK_KP_End:
453 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 {
456 STRCPY (kbuf, "\033Oq");
457 break;
458 }
459 /* FALLTHROUGH */
460#endif
461 case XK_End:
462 STRCPY (kbuf, KS_END);
463 break;
464#ifdef XK_KP_Home
465 case XK_KP_Home:
466 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
468 {
469 STRCPY (kbuf, "\033Ow");
470 break;
471 }
472 /* FALLTHROUGH */
473#endif
474 case XK_Home:
475 STRCPY (kbuf, KS_HOME);
476 break;
477
478#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480
481 case XK_F1: /* "\033[11~" */
482 case XK_F2: /* "\033[12~" */
483 case XK_F3: /* "\033[13~" */
484 case XK_F4: /* "\033[14~" */
485 case XK_F5: /* "\033[15~" */
486 FKEY (11, XK_F1);
487 break;
488 case XK_F6: /* "\033[17~" */
489 case XK_F7: /* "\033[18~" */
490 case XK_F8: /* "\033[19~" */
491 case XK_F9: /* "\033[20~" */
492 case XK_F10: /* "\033[21~" */
493 FKEY (17, XK_F6);
494 break;
495 case XK_F11: /* "\033[23~" */
496 case XK_F12: /* "\033[24~" */
497 case XK_F13: /* "\033[25~" */
498 case XK_F14: /* "\033[26~" */
499 FKEY (23, XK_F11);
500 break;
501 case XK_F15: /* "\033[28~" */
502 case XK_F16: /* "\033[29~" */
503 FKEY (28, XK_F15);
504 break;
505 case XK_Help: /* "\033[28~" */
506 FKEY (28, XK_Help);
507 break;
508 case XK_Menu: /* "\033[29~" */
509 FKEY (29, XK_Menu);
510 break;
511 case XK_F17: /* "\033[31~" */
512 case XK_F18: /* "\033[32~" */
513 case XK_F19: /* "\033[33~" */
514 case XK_F20: /* "\033[34~" */
515 case XK_F21: /* "\033[35~" */
516 case XK_F22: /* "\033[36~" */
517 case XK_F23: /* "\033[37~" */
518 case XK_F24: /* "\033[38~" */
519 case XK_F25: /* "\033[39~" */
520 case XK_F26: /* "\033[40~" */
521 case XK_F27: /* "\033[41~" */
522 case XK_F28: /* "\033[42~" */
523 case XK_F29: /* "\033[43~" */
524 case XK_F30: /* "\033[44~" */
525 case XK_F31: /* "\033[45~" */
526 case XK_F32: /* "\033[46~" */
527 case XK_F33: /* "\033[47~" */
528 case XK_F34: /* "\033[48~" */
529 case XK_F35: /* "\033[49~" */
530 FKEY (31, XK_F17);
531 break;
532#undef FKEY
533 default:
534 newlen = 0; 777 newlen = 0;
535 break;
536 } 778 }
537 if (newlen) 779 break;
538 len = STRLEN (kbuf);
539 } 780 }
540 781
782 if (newlen)
783 len = strlen (kbuf);
784
785 if (len > 0)
786 {
541 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
542 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
543 */ 801 */
544#ifdef META8_OPTION 802#ifdef META8_OPTION
545 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
546 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
547#endif 805#endif
806 }
548 807
549 } 808 }
550 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
551 { 810 {
552 len = 1; 811 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 812 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
813 }
814 else if (keysym == XK_ISO_Left_Tab)
815 {
816 strcpy (kbuf, "\033[Z");
817 len = 3;
554 } 818 }
555 else 819 else
556 { 820 {
557#ifdef META8_OPTION 821#ifdef META8_OPTION
558 /* set 8-bit on */ 822 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 823 if (meta && (meta_char == 0x80))
560 { 824 {
561 unsigned char *ch; 825 char *ch;
562 826
563 for (ch = kbuf; ch < kbuf + len; ch++) 827 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 828 *ch |= 0x80;
565 829
566 meta = 0; 830 meta = 0;
… …
568#endif 832#endif
569 /* nil */ ; 833 /* nil */ ;
570 } 834 }
571 } 835 }
572 836
837 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
838 return;
839
573 if (len <= 0) 840 if (len <= 0)
574 return; /* not mapped */ 841 return; /* not mapped */
575 842
576 if (Options & Opt_scrollTtyKeypress) 843 if (option (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 844 if (view_start)
578 { 845 {
579 TermWin.view_start = 0; 846 view_start = 0;
580 want_refresh = 1; 847 want_refresh = 1;
581 } 848 }
582
583 /*
584 * these modifications only affect the static keybuffer
585 * pass Shift/Control indicators for function keys ending with `~'
586 *
587 * eg,
588 * Prior = "ESC[5~"
589 * Shift+Prior = "ESC[5$"
590 * Ctrl+Prior = "ESC[5^"
591 * Ctrl+Shift+Prior = "ESC[5@"
592 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
593 */
594 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
595 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
596 849
597 /* escape prefix */ 850 /* escape prefix */
598 if (meta 851 if (meta
599#ifdef META8_OPTION 852#ifdef META8_OPTION
600 && meta_char == C0_ESC 853 && meta_char == C0_ESC
601#endif 854#endif
602 ) 855 )
603 { 856 {
604 const unsigned char ch = C0_ESC; 857 const char ch = C0_ESC;
605 tt_write (&ch, 1); 858 tt_write (&ch, 1);
606 } 859 }
607 860
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
619} 862}
620/*}}} */
621 863
622#if (MENUBAR_MAX) 864void ecb_cold
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 865rxvt_term::key_release (XKeyEvent &ev)
624/* attempt to `write' count to the input buffer */
625unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 866{
628 unsigned int n, s; 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym;
629 869
630 n = cmdbuf_ptr - cmdbuf_base; 870 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 871#endif
632 872
633 if (n > 0 && s < count) 873#if ENABLE_FRILLS || ISO_14755
874 // ISO 14755 support
875 if (iso14755buf)
876 if (iso14755buf & ISO_14755_52)
634 { 877 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 878# if ISO_14755
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 879 scr_overlay_off ();
637 cmdbuf_ptr = cmdbuf_base; 880# endif
638 cmdbuf_endp -= n; 881# if ISO_14755
639 s += n; 882 // iso14755 part 5.2 handling: release time
883 // first: controls
884 if ((ev.state & ControlMask)
885 && ((keysym >= 0x40 && keysym <= 0x5f)
886 || (keysym >= 0x61 && keysym <= 0x7f)))
887 {
888 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
889 commit_iso14755 ();
890
891 return;
892 }
893
894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym)
896 {
897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 ();
899
900 return;
901 }
902
903 scr_bell ();
904# endif
905 iso14755buf = 0;
906
907 return;
640 } 908 }
641 909 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
642 if (count > s)
643 { 910 {
644 rxvt_warn ("data loss: cmd_write too large, continuing.\n"); 911# if ISO_14755
645 count = s; 912 scr_overlay_off ();
913# endif
914 if (iso14755buf & ISO_14755_51)
915 commit_iso14755 ();
916#if ISO_14755
917 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
918 {
919 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
920
921 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
922 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
923 }
924# endif
925 else
926 iso14755buf = 0;
646 } 927 }
928#endif
647 929
648 for (; count--;) 930 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
653 return 0; 931 return;
932
933#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
934 if (!(ev.state & ControlMask))
935 slip_wheel_ev.stop ();
936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0;
938#endif
654} 939}
655#endif /* MENUBAR_MAX */
656 940
657void 941void
658rxvt_term::flush () 942rxvt_term::flush ()
659{ 943{
660#ifdef TRANSPARENT 944 flush_ev.stop ();
661 if (want_full_refresh) 945
946#ifdef HAVE_IMG
947 if (bg_flags & BG_NEEDS_REFRESH)
662 { 948 {
663 want_full_refresh = 0; 949 bg_flags &= ~BG_NEEDS_REFRESH;
664 scr_clear ();
665 scr_touch (false); 950 scr_touch (false);
666 want_refresh = 1;
667 } 951 }
668#endif 952#endif
669 953
670 if (want_refresh) 954 if (want_refresh)
671 { 955 {
956 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
957 {
958 int row = view_start;
959 int end_row = row + nrow;
960
961 while (row > top_row && ROW (row - 1).is_longer ())
962 --row;
963
964 do
965 {
966 int start_row = row;
967 line_t *l;
968
969 do
970 {
971 l = &ROW (row++);
972
973 if (!(l->f & LINE_FILTERED))
974 {
975 // line not filtered, mark it as filtered
976 l->f |= LINE_FILTERED;
977 while (l->is_longer ())
978 {
979 l = &ROW (row++);
980 l->f |= LINE_FILTERED;
981 }
982
983 // and filter it
984 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
985
986 break;
987 }
988 }
989 while (l->is_longer () && row < end_row);
990 }
991 while (row < end_row);
992 }
993
672 scr_refresh (refresh_type); 994 scr_refresh ();
673 scrollbar_show (1); 995 scrollBar.show (1);
674#ifdef USE_XIM 996#if USE_XIM
675 IMSendSpot (); 997 im_send_spot ();
676#endif 998#endif
677
678 } 999 }
679 1000
680 display->flush (); 1001 display->flush ();
681} 1002}
682 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
683void 1005void
684rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::refresh_check ()
685{ 1007{
686 SET_R (this); 1008 if (want_refresh && !flush_ev.is_active ())
687 SET_LOCALE (locale); 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
688 1010
1011 display->flush ();
1012}
1013
1014void
1015rxvt_term::flush_cb (ev::timer &w, int revents)
1016{
1017 make_current ();
1018
1019 refresh_count = 0;
689 flush (); 1020 flush ();
690} 1021}
691 1022
692#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
693void 1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1039void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
695{ 1041{
696 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1043 want_refresh = 1;
698 1044 refresh_check ();
699 w.start (w.at + BLINK_INTERVAL);
700} 1045}
701#endif 1046#endif
702 1047
703#ifdef TEXT_BLINK 1048#ifdef TEXT_BLINK
704void 1049void
705rxvt_term::text_blink_cb (time_watcher &w) 1050rxvt_term::text_blink_cb (ev::timer &w, int revents)
706{ 1051{
707 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1052 if (scr_refresh_rend (RS_Blink, RS_Blink))
708 { 1053 {
709 hidden_text = !hidden_text; 1054 hidden_text = !hidden_text;
710 want_refresh = 1; 1055 want_refresh = 1;
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1056 refresh_check ();
1057 }
1058 else
1059 w.stop ();
1060}
1061#endif
1062
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void
1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{
1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
712 } 1069 {
1070 want_refresh = 1;
1071 refresh_check ();
1072 }
1073 else
1074 w.stop ();
1075}
1076#endif
1077
1078#ifdef SELECTION_SCROLLING
1079void
1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1081{
1082 if (scr_page (scroll_selection_lines))
1083 {
1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1085 want_refresh = 1;
1086 refresh_check ();
1087 }
1088 else
1089 w.stop ();
1090}
1091#endif
1092
1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1094void
1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1096{
1097 if (scr_page (mouse_slip_wheel_speed))
1098 {
1099 want_refresh = 1;
1100 refresh_check ();
1101 }
1102
1103 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1104 {
1105 mouse_slip_wheel_speed = 0;
1106 w.stop ();
1107 }
1108}
1109#endif
1110
1111#if LINUX_YIELD_HACK
1112static struct event_handler
1113{
1114 ev::prepare yield_ev;
1115
1116 void yield_cb (ev::prepare &w, int revents)
1117 {
1118 // this should really be sched_yield(), but the linux guys thought
1119 // that giving a process calling sched_yield () less cpu time than
1120 // ones with high nice levels is a useful thing to do. It surely is is
1121 // allowed by the sus... as is returning ENOSYS.
1122 // since the linux guys additionally thought that breaking the only
1123 // known workaround against their unusable sched_yield hack is cool,
1124 // we just nanosleep a bit and hope for the best.
1125
1126 struct timespec ts = { 0, 1000 };
1127 nanosleep (&ts, 0);
1128
1129 w.stop ();
1130 }
1131
1132 event_handler ()
1133 : yield_ev (this, &event_handler::yield_cb)
1134 {
1135 }
1136} event_handler;
1137#endif
1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
713} 1169}
714#endif 1170#endif
715 1171
716bool 1172bool
717rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
718{ 1174{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
720 1176
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1178
1179 if (!avail)
1180 {
1181 // normally this indicates a "too long" command sequence - just drop the data we have
722 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
724 1186
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
726 1188
727 if (n > 0) 1189 if (r > 0)
728 { 1190 {
729 cmdbuf_endp += n; 1191 cmdbuf_endp += r;
730 return true; 1192 return true;
731 } 1193 }
732 else if (n < 0 && errno != EAGAIN) 1194 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1195 {
1196#if LINUX_YIELD_HACK
1197 if (display->is_local)
1198 event_handler.yield_ev.start ();
1199#endif
1200 }
1201 else
1202 {
1203 pty_ev.stop ();
1204
1205 if (!option (Opt_hold))
733 destroy (); 1206 destroy ();
734 1207 }
1208
735 return false; 1209 return false;
736} 1210}
737 1211
738void 1212void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1213rxvt_term::pty_cb (ev::io &w, int revents)
740{ 1214{
741 SET_R (this); 1215 make_current ();
742 SET_LOCALE (locale);
743 1216
744 if (revents & EVENT_WRITE) 1217 if (revents & ev::READ)
745 tt_write (0, 0);
746 else if (revents & EVENT_READ)
747 {
748 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759
760 if (cmd_parse ()) 1220 cmd_parse ();
761 break; 1221
762 } 1222 if (revents & ev::WRITE)
763 } 1223 pty_write ();
1224
1225 refresh_check ();
764} 1226}
1227
1228void ecb_cold
1229rxvt_term::pointer_unblank ()
1230{
1231 XDefineCursor (dpy, vt, TermWin_cursor);
1232 recolour_cursor ();
765 1233
766#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
767void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0; 1235 hidden_pointer = 0;
774 1236
775 if (Options & Opt_pointerBlank) 1237 if (option (Opt_pointerBlank))
776 pointer_ev.start (NOW + pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1239#endif
777} 1240}
778 1241
779void 1242#ifdef POINTER_BLANK
1243void ecb_cold
780rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
781{ 1245{
782 if (! (Options & Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
783 return; 1247 return;
784 1248
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1249 XDefineCursor (dpy, vt, display->blank_cursor);
786 XFlush (display->display); 1250 XFlush (dpy);
787 1251
788 hidden_pointer = 1; 1252 hidden_pointer = 1;
789} 1253}
790 1254
791void 1255void ecb_cold
792rxvt_term::pointer_cb (time_watcher &w) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
793{ 1257{
794 SET_R (this); 1258 make_current ();
795 SET_LOCALE (locale);
796 1259
797 pointer_blank (); 1260 pointer_blank ();
798} 1261}
799#endif 1262#endif
800 1263
801void 1264void
802rxvt_term::mouse_report (XButtonEvent &ev) 1265rxvt_term::mouse_report (XButtonEvent &ev)
803{ 1266{
804 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
805 int x, y; 1268 int x, y;
1269 int code = 32;
806 1270
807 x = ev.x; 1271 x = Pixel2Col (ev.x) + 1;
808 y = ev.y; 1272 y = Pixel2Row (ev.y) + 1;
809 pixel_position (&x, &y); 1273
1274 if (ev.type == MotionNotify)
1275 {
1276 if (x == mouse_row && y == mouse_col)
1277 return;
1278
1279 mouse_row = x;
1280 mouse_col = y;
1281 code += 32;
1282 }
810 1283
811 if (MEvent.button == AnyButton) 1284 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1285 button_number = 3;
814 }
815 else 1286 else
816 { 1287 {
817 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1290 if (button_number >= 3)
820 button_number += (64 - 3); 1291 button_number += 64 - 3;
821 } 1292 }
822 1293
823 if (PrivateModes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
824 { 1295 {
825 /* 1296 /*
826 * do not report ButtonRelease 1297 * do not report ButtonRelease
827 * no state info allowed 1298 * no state info allowed
828 */ 1299 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1314 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1315 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1316#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1317 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1318#endif
848
849 } 1319 }
850 1320
851#ifdef DEBUG_MOUSEREPORT 1321#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1322 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1323 if (key_state & 16)
854 fputc ('C', stderr); 1324 fputc ('C', stderr);
855 if (key_state & 4) 1325 if (key_state & 4)
856 fputc ('S', stderr); 1326 fputc ('S', stderr);
… …
858 fputc ('A', stderr); 1328 fputc ('A', stderr);
859 if (key_state & 32) 1329 if (key_state & 32)
860 fputc ('2', stderr); 1330 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1332 button_number,
863 x + 1, 1333 x,
864 y + 1); 1334 y);
865#else 1335#endif
1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
866 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1351 code + button_number + key_state,
868 (32 + x + 1), 1352 32 + x,
869 (32 + y + 1)); 1353 32 + y);
870#endif
871} 1354}
872
873#ifdef USING_W11LIB
874void
875rxvt_W11_process_x_event (XEvent *ev)
876{
877 rxvt_t *r = rxvt_get_r ();
878
879 x_cb (*ev);
880}
881#endif
882 1355
883/*{{{ process an X event */ 1356/*{{{ process an X event */
884void 1357void ecb_hot
885rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
886{ 1359{
887 SET_R (this); 1360 make_current ();
888 SET_LOCALE (locale);
889 1361
890#if defined(CURSOR_BLINK) 1362 dLocal (Display *, dpy);
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
892 {
893 if (hidden_cursor)
894 {
895 hidden_cursor = 0;
896 want_refresh = 1;
897 }
898 1363
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1364 if (ev.xany.window == vt
900 } 1365 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1366 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
902
903#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 {
906 if (ev.type == MotionNotify
907 || ev.type == ButtonPress
908 || ev.type == ButtonRelease)
909 if (hidden_pointer)
910 pointer_unblank ();
911
912 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank ();
914 }
915#endif
916
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return; 1367 return;
920#endif
921 1368
1369 // for XQueryPointer
922 Window unused_root, unused_child; 1370 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1371 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1372 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
973#endif
974 1373
975 switch (ev.type) 1374 switch (ev.type)
976 { 1375 {
977 case KeyPress: 1376 case KeyPress:
978 lookup_key (ev.xkey); 1377 key_press (ev.xkey);
979 break; 1378 break;
980 1379
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1380 case KeyRelease:
983 { 1381 key_release (ev.xkey);
984 if (! (ev.xkey.state & ControlMask))
985 mouse_slip_wheel_speed = 0;
986 else
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1382 break;
995 }
996#endif
997 1383
998 case ButtonPress: 1384 case ButtonPress:
999 button_press (ev.xbutton); 1385 button_press (ev.xbutton);
1000 break; 1386 break;
1001 1387
… …
1003 button_release (ev.xbutton); 1389 button_release (ev.xbutton);
1004 break; 1390 break;
1005 1391
1006 case ClientMessage: 1392 case ClientMessage:
1007 if (ev.xclient.format == 32 1393 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1394 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1009 destroy ();
1010#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink))
1016 { 1395 {
1017 /* Get Dnd data */ 1396 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1397 {
1019 int ActualFormat; 1398 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1399 {
1021 unsigned long Size, RemainingBytes; 1400 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1401 {
1023 XGetWindowProperty (display->display, display->root, 1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1403 destroy ();
1025 0L, 1000000L, 1404 }
1026 False, AnyPropertyType, 1405#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1407 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1409 &ev);
1030 XChangeProperty (display->display, display->root, 1410#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1411 }
1032 8, PropModeReplace, 1412 }
1033 data, STRLEN (data)); 1413#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1414 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1415 {
1416 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1417 focus_in ();
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out ();
1420 }
1421#endif
1036 } 1422 }
1037#endif /* OFFIX_DND */
1038 break;
1039
1040 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping));
1042 break; 1423 break;
1043 1424
1044 /* 1425 /*
1045 * XXX: this is not the _current_ arrangement 1426 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1427 * Here's my conclusion:
… …
1065 break; 1446 break;
1066 } 1447 }
1067 break; 1448 break;
1068 1449
1069 case FocusIn: 1450 case FocusIn:
1070 if (!TermWin.focus) 1451 if (ev.xfocus.detail != NotifyInferior
1452 && ev.xfocus.detail != NotifyPointer
1453 && ev.xfocus.mode != NotifyGrab)
1454 focus_in ();
1455 break;
1456
1457 case FocusOut:
1458 if (ev.xfocus.detail != NotifyInferior
1459 && ev.xfocus.detail != NotifyPointer
1460 && ev.xfocus.mode != NotifyGrab)
1461 focus_out ();
1462 break;
1463
1464 case ConfigureNotify:
1465 if (ev.xconfigure.window == parent)
1071 { 1466 {
1072 TermWin.focus = 1; 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082
1083 } 1468 ;
1084 break;
1085 1469
1086 case FocusOut: 1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1087 if (TermWin.focus) 1471
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ())
1088 { 1475 {
1089 TermWin.focus = 0; 1476 want_position_change = true;
1090 want_refresh = 1; 1477 if (bg_img == 0)
1091#ifdef USE_XIM 1478 moved = true;
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break;
1103
1104 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0])
1106 {
1107 int height, width;
1108
1109 do
1110 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1479 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1480#endif
1116 1481
1117 if (szHint.width != width || szHint.height != height) 1482 if (want_position_change)
1118 { 1483 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1484 int x, y;
1120 resize_all_windows (width, height, 1); 1485
1486 if (ev.xconfigure.send_event)
1487 {
1488 x = ev.xconfigure.x;
1489 y = ev.xconfigure.y;
1490 }
1491 else
1492 get_window_origin (x, y);
1493
1494 if (x != parent_x || y != parent_y)
1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 }
1121 } 1501 }
1122#ifdef DEBUG_SIZE 1502
1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1504 {
1505 seen_resize = 1;
1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1507 }
1123 else 1508 else
1124 { 1509 {
1125 D_SIZE ((stderr, "Size: Not resizing")); 1510#ifdef HAVE_BG_PIXMAP
1511 if (moved)
1512 update_background ();
1513#endif
1126 } 1514 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136 1515
1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1137 } 1517 }
1138 break; 1518 break;
1139 1519
1520 case PropertyNotify:
1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1140 case SelectionClear: 1524 case SelectionClear:
1141 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1142 break;
1143
1144 case SelectionNotify:
1145 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor,
1147 ev.xselection.property, True);
1148 break; 1526 break;
1149 1527
1150 case SelectionRequest: 1528 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1152 break; 1530 break;
1153 1531
1532 case MapNotify:
1533#ifdef HAVE_BG_PIXMAP
1534 // This is needed at startup for the case of no window manager
1535 // or a non-reparenting window manager and also because we
1536 // defer bg image updates if the window is not mapped. The
1537 // short delay is to optimize for multiple ConfigureNotify
1538 // events at startup when the window manager reparents the
1539 // window, so as to perform the computation after we have
1540 // received all of them.
1541 if (bg_img == 0)
1542 update_background_ev.start (0.025);
1543#endif
1544 mapped = 1;
1545#ifdef TEXT_BLINK
1546 text_blink_ev.start ();
1547#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break;
1550
1154 case UnmapNotify: 1551 case UnmapNotify:
1155 TermWin.mapped = 0; 1552 mapped = 0;
1156#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1158#endif 1555#endif
1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1159 break; 1557 break;
1160
1161 case MapNotify:
1162 TermWin.mapped = 1;
1163#ifdef TEXT_BLINK
1164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1165#endif
1166 break;
1167
1168#ifdef TRANSPARENT
1169 case ReparentNotify:
1170 rootwin_cb (ev);
1171 break;
1172#endif /* TRANSPARENT */
1173 1558
1174 case GraphicsExpose: 1559 case GraphicsExpose:
1175 case Expose: 1560 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1561 if (ev.xany.window == vt)
1177 { 1562 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1563 do
1564 {
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1181#else 1567 }
1182 // don't understand this, so commented it out 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571
1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 {
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1185 //scr_expose (ev.xexpose.x, 0, 1576 }
1186 // ev.xexpose.width, TermWin.height, False); 1577
1187#endif
1188 want_refresh = 1; 1578 want_refresh = 1;
1189 } 1579 }
1190 else 1580 else
1191 { 1581 {
1192 XEvent unused_event; 1582 XEvent unused_event;
1193 1583
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1195 Expose, 1585 ;
1196 &unused_event)) ; 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1587 ;
1198 GraphicsExpose, 1588
1199 &unused_event)) ; 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1200 if (isScrollbarWindow (ev.xany.window))
1201 { 1590 {
1202 scrollBar.setIdle (); 1591 scrollBar.state = SB_STATE_IDLE;
1203 scrollbar_show (0); 1592 scrollBar.show (0);
1204 } 1593 }
1205#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose ();
1208#endif
1209 } 1594 }
1210 break; 1595 break;
1211 1596
1212 case MotionNotify: 1597 case MotionNotify:
1213#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1214 if (hidden_pointer) 1599 if (hidden_pointer)
1215 pointer_unblank (); 1600 pointer_unblank ();
1216#endif 1601#endif
1217#if MENUBAR 1602 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1218 if (isMenuBarWindow (ev.xany.window)) 1603 || priv_modes & PrivMode_MouseAnyEvent)
1604 mouse_report (ev.xbutton);
1605 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1606 break;
1607
1608 if (ev.xany.window == vt)
1219 { 1609 {
1220 menubar_control (ev.xbutton); 1610 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1611 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1612 ; // nop
1223#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1225 break;
1226
1227 if (ev.xany.window == TermWin.vt)
1228 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1613 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1614 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1615 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1232 ; 1616 ;
1233 1617
1234 XQueryPointer (display->display, TermWin.vt, 1618 XQueryPointer (dpy, vt,
1235 &unused_root, &unused_child, 1619 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1620 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1621 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1622 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1623#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1624 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1625 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1626 {
1243#endif 1627#endif
1628#if ISO_14755
1629 // 5.4
1630 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1631 {
1632 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1633 break;
1634 }
1635#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1636 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1637 ev.xbutton.state & Button3Mask ? 2 : 0);
1638
1246#ifdef SELECTION_SCROLLING 1639#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1640 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1641 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1642 {
1643 page_dirn scroll_selection_dir;
1250 int dist; 1644 int dist;
1251
1252 pending_scroll_selection=1;
1253 1645
1254 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1256 */ 1648 */
1257 if (scroll_selection_delay<=0) 1649 if (!sel_scroll_ev.is_active ())
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1650 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1259 1651
1260 /* save the event params so we can highlight 1652 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1653 * the selection in the pending-scroll loop
1262 */ 1654 */
1263 selection_save_x=ev.xbutton.x; 1655 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1656 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1657 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1658
1268 /* calc number of lines to scroll */ 1659 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1660 if (ev.xbutton.y < int_bwidth)
1270 { 1661 {
1271 scroll_selection_dir = UP; 1662 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1273 } 1664 }
1274 else 1665 else
1275 { 1666 {
1276 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1669 }
1670
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1671 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1673 + 1;
1282 MIN_IT (scroll_selection_lines, 1674 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1675 SELECTION_SCROLL_MAX_LINES);
1676 scroll_selection_lines *= scroll_selection_dir;
1284 } 1677 }
1285 else 1678 else
1286 { 1679 {
1287 /* we are within the text window, so we 1680 /* we are within the text window, so we
1288 * shouldn't be scrolling 1681 * shouldn't be scrolling
1289 */ 1682 */
1290 pending_scroll_selection = 0; 1683 sel_scroll_ev.stop();
1291 } 1684 }
1292#endif 1685#endif
1293#ifdef MOUSE_THRESHOLD 1686#ifdef MOUSE_THRESHOLD
1294
1295 } 1687 }
1296#endif 1688#endif
1297
1298 } 1689 }
1299 } 1690 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1691 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1301 { 1692 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1693 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1303 MotionNotify, &ev)) ; 1694 MotionNotify, &ev))
1695 ;
1696
1304 XQueryPointer (display->display, scrollBar.win, 1697 XQueryPointer (dpy, scrollBar.win,
1305 &unused_root, &unused_child, 1698 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1699 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1700 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1701 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1702 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1703 scrollBar.size ());
1311 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1704 want_refresh = 1;
1313 scrollbar_show (1); 1705 scrollBar.show (1);
1314 } 1706 }
1315 break; 1707 break;
1316 } 1708 }
1317}
1318 1709
1319void 1710#if defined(CURSOR_BLINK)
1711 if (ev.type == KeyPress)
1712 cursor_blink_reset ();
1713#endif
1714
1715#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1717 {
1718 if (ev.type == MotionNotify
1719 || ev.type == ButtonPress
1720 || ev.type == ButtonRelease)
1721 if (hidden_pointer)
1722 pointer_unblank ();
1723
1724 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank ();
1726 }
1727#endif
1728
1729 refresh_check ();
1730}
1731
1732#if ENABLE_FRILLS
1733void ecb_cold
1734rxvt_term::set_urgency (bool enable)
1735{
1736 if (enable == urgency_hint)
1737 return;
1738
1739 if (XWMHints *h = XGetWMHints (dpy, parent))
1740 {
1741 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1742 XSetWMHints (dpy, parent, h);
1743 urgency_hint = enable;
1744 XFree (h);
1745 }
1746}
1747#endif
1748
1749void ecb_cold
1750rxvt_term::focus_in ()
1751{
1752 if (!focus)
1753 {
1754 focus = 1;
1755 want_refresh = 1;
1756
1757#if USE_XIM
1758 if (Input_Context != NULL)
1759 {
1760 im_set_position ();
1761 XSetICFocus (Input_Context);
1762 }
1763#endif
1764#if CURSOR_BLINK
1765 if (option (Opt_cursorBlink))
1766 cursor_blink_ev.again ();
1767#endif
1768#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade])
1770 {
1771 pix_colors = pix_colors_focused;
1772 scr_recolour ();
1773 }
1774#endif
1775#if ENABLE_FRILLS
1776 if (option (Opt_urgentOnBell))
1777 set_urgency (0);
1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1781 }
1782}
1783
1784void ecb_cold
1785rxvt_term::focus_out ()
1786{
1787 if (focus)
1788 {
1789 focus = 0;
1790 want_refresh = 1;
1791
1792#if ENABLE_FRILLS
1793 if (option (Opt_urgentOnBell))
1794 set_urgency (0);
1795#endif
1796#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf)
1798 {
1799 iso14755buf = 0;
1800# if ISO_14755
1801 scr_overlay_off ();
1802# endif
1803 }
1804#endif
1805#if USE_XIM
1806 if (Input_Context != NULL)
1807 XUnsetICFocus (Input_Context);
1808#endif
1809#if CURSOR_BLINK
1810 if (option (Opt_cursorBlink))
1811 cursor_blink_ev.stop ();
1812
1813 hidden_cursor = 0;
1814#endif
1815#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade])
1817 {
1818 pix_colors = pix_colors_unfocused;
1819 scr_recolour ();
1820 }
1821#endif
1822
1823 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1824 }
1825}
1826
1827void ecb_cold
1828rxvt_term::update_fade_color (unsigned int idx)
1829{
1830#if OFF_FOCUS_FADING
1831 if (rs[Rs_fade])
1832 {
1833 rgba c;
1834 pix_colors [Color_fade].get (c);
1835 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1836 }
1837#endif
1838}
1839
1840#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1841void ecb_hot
1320rxvt_term::rootwin_cb (XEvent &ev) 1842rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1843{
1322 SET_R (this); 1844 make_current ();
1323 SET_LOCALE (locale); 1845
1846 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1847 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1848 return;
1324 1849
1325 switch (ev.type) 1850 switch (ev.type)
1326 { 1851 {
1327 case PropertyNotify: 1852 case PropertyNotify:
1853 /*
1854 * if user used some Esetroot compatible prog to set the root bg,
1855 * use the property to determine the pixmap. We use it later on.
1856 */
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1329 { 1859 {
1330 if (ev.xproperty.state == PropertyNewValue) 1860#if BG_IMAGE_FROM_ROOT
1331 selection_property (ev.xproperty.window, ev.xproperty.atom); 1861 if (option (Opt_transparent))
1332 break; 1862 {
1863 rxvt_img::new_from_root (this)->replace (root_img);
1864 update_background ();
1865 }
1866#endif
1867 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1333 } 1868 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /*
1338 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on.
1340 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343 1869
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1345 return;
1346 }
1347
1348 /* FALLTHROUGH */
1349 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ())
1351 if (am_transparent)
1352 want_full_refresh = 1;
1353 break; 1870 break;
1354#endif
1355 } 1871 }
1872
1873 refresh_check ();
1356} 1874}
1875#endif
1357 1876
1358void 1877void
1359rxvt_term::button_press (XButtonEvent &ev) 1878rxvt_term::button_press (XButtonEvent &ev)
1360{ 1879{
1361 int reportmode = 0, clickintime; 1880 int reportmode = 0, clickintime;
1362 1881
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1882 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1883
1364 if (!bypass_keystate) 1884 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1885 reportmode = !! (priv_modes & PrivMode_mouse_report);
1886
1366 /* 1887 /*
1367 * VT window processing of button press 1888 * VT window processing of button press
1368 */ 1889 */
1369 if (ev.window == TermWin.vt) 1890 if (ev.window == vt)
1370 { 1891 {
1892 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1893 return;
1894
1895#if ISO_14755
1896 // 5.4
1897 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1898 {
1899 iso14755_54 (ev.x, ev.y);
1900 return;
1901 }
1902#endif
1903
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1904 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1905
1372 if (reportmode) 1906 if (reportmode)
1373 { 1907 {
1374 /* mouse report from vt window */ 1908 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1909 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1910 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1911#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1912 if (ev.button == MEvent.button && clickintime)
1379 { 1913 {
1380 /* same button, within alloted time */ 1914 /* same button, within allowed time */
1381 MEvent.clicks++; 1915 MEvent.clicks++;
1916
1382 if (MEvent.clicks > 1) 1917 if (MEvent.clicks > 1)
1383 { 1918 {
1384 /* only report double clicks */ 1919 /* only report double clicks */
1385 MEvent.clicks = 2; 1920 MEvent.clicks = 2;
1386 mouse_report (ev); 1921 mouse_report (ev);
… …
1398 mouse_report (ev); 1933 mouse_report (ev);
1399 } 1934 }
1400#else 1935#else
1401 MEvent.button = ev.button; 1936 MEvent.button = ev.button;
1402 mouse_report (ev); 1937 mouse_report (ev);
1403#endif /* MOUSE_REPORT_DOUBLECLICK */ 1938#endif /* MOUSE_REPORT_DOUBLECLICK */
1404 1939
1405 } 1940 }
1406 else 1941 else
1407 { 1942 {
1408 if (ev.button != MEvent.button) 1943 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1944 MEvent.clicks = 0;
1945
1410 switch (ev.button) 1946 switch (ev.button)
1411 { 1947 {
1412 case Button1: 1948 case Button1:
1949 /* allow meta + click to select rectangular areas */
1950 /* should be done in screen.C */
1951#if ENABLE_FRILLS
1952 selection.rect = !!(ev.state & ModMetaMask);
1953#else
1954 selection.rect = false;
1955#endif
1956
1413 /* allow shift+left click to extend selection */ 1957 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1958 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1959 {
1416 if (MEvent.button == Button1 && clickintime) 1960 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1961 selection_rotate (ev.x, ev.y);
1418 else 1962 else
1419 selection_extend (ev.x, ev.y, 1); 1963 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1978 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1979 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1980 selection_rotate (ev.x, ev.y);
1437 else 1981 else
1438 selection_extend (ev.x, ev.y, 1); 1982 selection_extend (ev.x, ev.y, 1);
1983
1439 MEvent.button = Button3; 1984 MEvent.button = Button3;
1440 break; 1985 break;
1441 } 1986 }
1442 } 1987 }
1988
1443 MEvent.time = ev.time; 1989 MEvent.time = ev.time;
1444 return; 1990 return;
1445 } 1991 }
1446 1992
1447 /* 1993 /*
1448 * Scrollbar window processing of button press 1994 * Scrollbar window processing of button press
1449 */ 1995 */
1450 if (isScrollbarWindow (ev.window)) 1996 if (scrollBar.state && ev.window == scrollBar.win)
1451 { 1997 {
1452 scrollBar.setIdle (); 1998 page_dirn direction = NO_DIR;
1999
2000 if (scrollBar.upButton (ev.y))
2001 direction = UP; /* up */
2002 else if (scrollBar.dnButton (ev.y))
2003 direction = DN; /* down */
2004
2005 scrollBar.state = SB_STATE_IDLE;
1453 /* 2006 /*
1454 * Rxvt-style scrollbar: 2007 * Rxvt-style scrollbar:
1455 * move up if mouse is above slider 2008 * move up if mouse is above slider
1456 * move dn if mouse is below slider 2009 * move dn if mouse is below slider
1457 * 2010 *
… …
1466 /* 2019 /*
1467 * Mouse report disabled scrollbar: 2020 * Mouse report disabled scrollbar:
1468 * arrow buttons - send up/down 2021 * arrow buttons - send up/down
1469 * click on scrollbar - send pageup/down 2022 * click on scrollbar - send pageup/down
1470 */ 2023 */
1471 if ((scrollBar.style == R_SB_NEXT 2024 if (direction == UP)
1472 && scrollbarnext_upButton (ev.y))
1473 || (scrollBar.style == R_SB_RXVT
1474 && scrollbarrxvt_upButton (ev.y)))
1475 tt_printf ("\033[A"); 2025 tt_printf ("\033[A");
1476 else if ((scrollBar.style == R_SB_NEXT 2026 else if (direction == DN)
1477 && scrollbarnext_dnButton (ev.y))
1478 || (scrollBar.style == R_SB_RXVT
1479 && scrollbarrxvt_dnButton (ev.y)))
1480 tt_printf ("\033[B"); 2027 tt_printf ("\033[B");
1481 else 2028 else
1482 switch (ev.button) 2029 switch (ev.button)
1483 { 2030 {
1484 case Button2: 2031 case Button2:
… …
1491 tt_printf ("\033[5~"); 2038 tt_printf ("\033[5~");
1492 break; 2039 break;
1493 } 2040 }
1494 } 2041 }
1495 else 2042 else
1496#endif /* NO_SCROLLBAR_REPORT */ 2043#endif /* NO_SCROLLBAR_REPORT */
1497
1498 {
1499 char upordown = 0;
1500
1501 if (scrollBar.style == R_SB_NEXT)
1502 { 2044 {
1503 if (scrollbarnext_upButton (ev.y)) 2045 if (direction != NO_DIR)
1504 upordown = -1; /* up */
1505 else if (scrollbarnext_dnButton (ev.y))
1506 upordown = 1; /* down */
1507 }
1508 else if (scrollBar.style == R_SB_RXVT)
1509 {
1510 if (scrollbarrxvt_upButton (ev.y))
1511 upordown = -1; /* up */
1512 else if (scrollbarrxvt_dnButton (ev.y))
1513 upordown = 1; /* down */
1514 }
1515 if (upordown)
1516 { 2046 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2047#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2048 if (!cont_scroll_ev.is_active ())
2049 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1519#endif 2050#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 2051 if (scr_page (direction, 1))
1521 { 2052 {
1522 if (upordown < 0) 2053 if (direction == UP)
1523 scrollBar.setUp (); 2054 scrollBar.state = SB_STATE_UP;
1524 else 2055 else
1525 scrollBar.setDn (); 2056 scrollBar.state = SB_STATE_DOWN;
1526 } 2057 }
1527 } 2058 }
1528 else 2059 else
1529 switch (ev.button) 2060 switch (ev.button)
1530 { 2061 {
1531 case Button2: 2062 case Button2:
1532 switch (scrollbar_align) 2063 switch (scrollBar.align)
1533 { 2064 {
1534 case R_SB_ALIGN_TOP: 2065 case SB_ALIGN_TOP:
1535 csrO = 0; 2066 csrO = 0;
1536 break; 2067 break;
1537 case R_SB_ALIGN_CENTRE: 2068 case SB_ALIGN_CENTRE:
1538 csrO = (scrollBar.bot - scrollBar.top) / 2; 2069 csrO = (scrollBar.bot - scrollBar.top) / 2;
1539 break; 2070 break;
1540 case R_SB_ALIGN_BOTTOM: 2071 case SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2072 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2073 break;
1543 } 2074 }
2075
1544 if (scrollBar.style == R_SB_XTERM 2076 if (scrollBar.style == SB_STYLE_XTERM
1545 || scrollbar_above_slider (ev.y) 2077 || scrollBar.above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2078 || scrollBar.below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2079 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1548 scrollbar_size ()); 2080
1549 scrollBar.setMotion (); 2081 scrollBar.state = SB_STATE_MOTION;
1550 break; 2082 break;
1551 2083
1552 case Button1: 2084 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2085 if (scrollBar.align == SB_ALIGN_CENTRE)
1554 csrO = ev.y - scrollBar.top; 2086 csrO = ev.y - scrollBar.top;
1555 /* FALLTHROUGH */ 2087 /* FALLTHROUGH */
1556 2088
1557 case Button3: 2089 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2090 if (scrollBar.style != SB_STYLE_XTERM)
1559 { 2091 {
1560 if (scrollbar_above_slider (ev.y)) 2092 if (scrollBar.above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2093# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2094 scr_page (UP, nrow - 1);
1563# else 2095# else
1564 scr_page (UP, TermWin.nrow / 4); 2096 scr_page (UP, nrow / 4);
1565# endif 2097# endif
1566 else if (scrollbar_below_slider (ev.y)) 2098 else if (scrollBar.below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2100 scr_page (DN, nrow - 1);
1569# else 2101# else
1570 scr_page (DN, TermWin.nrow / 4); 2102 scr_page (DN, nrow / 4);
1571# endif 2103# endif
1572 else 2104 else
1573 scrollBar.setMotion (); 2105 scrollBar.state = SB_STATE_MOTION;
1574 } 2106 }
1575 else 2107 else
1576 { 2108 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2109 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2110 (nrow
1579 * scrollbar_position (ev.y) 2111 * scrollBar.position (ev.y)
1580 / scrollbar_size ())); 2112 / scrollBar.size ()));
1581 } 2113 }
2114
1582 break; 2115 break;
1583 } 2116 }
1584 } 2117 }
2118
1585 return; 2119 return;
1586 } 2120 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2121}
1595 2122
1596void 2123void
1597rxvt_term::button_release (XButtonEvent &ev) 2124rxvt_term::button_release (XButtonEvent &ev)
1598{ 2125{
1599 int reportmode = 0; 2126 int reportmode = 0;
1600 2127
1601 csrO = 0; /* reset csr Offset */ 2128 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2129 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2130 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2131
1605 if (scrollbar_isUpDn ()) 2132 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1606 { 2133 {
1607 scrollBar.setIdle (); 2134 scrollBar.state = SB_STATE_IDLE;
1608 scrollbar_show (0); 2135 scrollBar.show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2136 }
2137
1614#ifdef SELECTION_SCROLLING 2138#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2139 sel_scroll_ev.stop();
1616#endif 2140#endif
2141
1617 if (ev.window == TermWin.vt) 2142 if (ev.window == vt)
1618 { 2143 {
2144 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2145 return;
2146
2147#if ISO_14755
2148 // 5.4
2149 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2150 return;
2151#endif
2152
1619 if (reportmode) 2153 if (reportmode)
1620 { 2154 {
1621 /* mouse report from vt window */ 2155 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2156 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2157 if (ev.button >= 4)
… …
1634 mouse_report (ev); 2168 mouse_report (ev);
1635 } 2169 }
1636#else /* MOUSE_REPORT_DOUBLECLICK */ 2170#else /* MOUSE_REPORT_DOUBLECLICK */
1637 MEvent.button = AnyButton; 2171 MEvent.button = AnyButton;
1638 mouse_report (ev); 2172 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2173#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2174 return;
1641 } 2175 }
2176
1642 /* 2177 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2178 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2179 * when overriding mouse reporting
1645 */ 2180 */
1646 if (PrivateModes & PrivMode_mouse_report 2181 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2182 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2183 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2184 selection_extend (ev.x, ev.y, 0);
1650 2185
1651 switch (ev.button) 2186 switch (ev.button)
1652 { 2187 {
1653 case Button1: 2188 case Button1:
1654 case Button3: 2189 case Button3:
1655 selection_make (ev.time); 2190 selection_make (ev.time);
1656 break; 2191 break;
2192
1657 case Button2: 2193 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2194 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2195 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2196 break;
2197
1660#ifdef MOUSE_WHEEL 2198#ifdef MOUSE_WHEEL
1661 case Button4: 2199 case Button4:
1662 case Button5: 2200 case Button5:
1663 { 2201 {
1664 int i; 2202 int lines;
1665 page_dirn v; 2203 page_dirn dirn;
1666 2204
1667 v = (ev.button == Button4) ? UP : DN; 2205 dirn = ev.button == Button4 ? UP : DN;
2206
1668 if (ev.state & ShiftMask) 2207 if (ev.state & ShiftMask)
1669 i = 1; 2208 lines = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2209 else if (option (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2210 lines = nrow - 1;
1672 else 2211 else
1673 i = 5; 2212 lines = 5;
2213
1674# ifdef MOUSE_SLIP_WHEELING 2214# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2215 if (ev.state & ControlMask)
1676 { 2216 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2217 mouse_slip_wheel_speed += dirn;
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2218 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2219
2220 if (!slip_wheel_ev.is_active ())
2221 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1679 } 2222 }
2223 else
1680# endif 2224# endif
1681# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 { 2225 {
1688 scr_page (v, 1); 2226 scr_page (dirn, lines);
1689 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2227 scrollBar.show (1);
1691 } 2228 }
1692# endif
1693
1694 } 2229 }
1695 break; 2230 break;
1696#endif 2231#endif
1697
1698 }
1699 }
1700#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev);
1703#endif
1704}
1705
1706
1707#ifdef TRANSPARENT
1708/*
1709 * Check our parents are still who we think they are.
1710 * Do transparency updates if required
1711 */
1712int
1713rxvt_term::check_our_parents ()
1714{
1715 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after;
1717 Atom atype;
1718 unsigned char *prop = NULL;
1719 Window root, oldp, *list;
1720 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr;
1722
1723 pchanged = 0;
1724
1725 if (! (Options & Opt_transparent))
1726 return pchanged; /* Don't try any more */
1727
1728 XGetWindowAttributes (display->display, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth;
1730
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1732 if (rootdepth != wattr.depth)
1733 {
1734 if (am_transparent)
1735 { 2232 }
1736 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt,
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0;
1740 }
1741 return pchanged; /* Don't try any more */
1742 }
1743
1744 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False);
1746
1747 /*
1748 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that.
1751 */
1752 i = (xa[XA_XROOTPMAPID] != 0
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success));
1756 if (!i || prop == NULL)
1757 have_pixmap = 0;
1758 else
1759 { 2233 }
1760 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop);
1762 XFree (prop);
1763 }
1764 if (have_pixmap)
1765 {
1766 /*
1767 * Copy display->root pixmap transparency
1768 */
1769 int sx, sy, nx, ny;
1770 unsigned int nw, nh;
1771 Window cr;
1772 XImage *image;
1773 GC gc;
1774 XGCValues gcvalue;
1775
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height;
1780 nx = ny = 0;
1781
1782 if (sx < 0)
1783 {
1784 nw += sx;
1785 nx = -sx;
1786 sx = 0;
1787 }
1788
1789 if (sy < 0)
1790 {
1791 nh += sy;
1792 ny = -sy;
1793 sy = 0;
1794 }
1795
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1798 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1800 ZPixmap);
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */
1803 allowedxerror = 0;
1804 if (image == NULL)
1805 {
1806 if (am_transparent && am_pixmap_trans)
1807 {
1808 pchanged = 1;
1809 if (TermWin.pixmap != None)
1810 {
1811 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None;
1813 }
1814 }
1815 am_pixmap_trans = 0;
1816 }
1817 else
1818 {
1819 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap);
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height,
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height);
1829 XFreeGC (display->display, gc);
1830 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1832 TermWin.pixmap);
1833 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1;
1835 am_transparent = am_pixmap_trans = 1;
1836 }
1837 }
1838
1839 if (!am_pixmap_trans)
1840 {
1841 unsigned int n;
1842 /*
1843 * InheritPixmap transparency
1844 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1847 i++)
1848 {
1849 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n);
1852 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
1854 if (TermWin.parent[i] == display->root)
1855 {
1856 if (oldp != None)
1857 pchanged = 1;
1858 break;
1859 }
1860 if (oldp != TermWin.parent[i])
1861 pchanged = 1;
1862 }
1863
1864 n = 0;
1865
1866 if (pchanged)
1867 {
1868 for (; n < (unsigned int)i; n++)
1869 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break;
1876 }
1877 }
1878 }
1879
1880 if (n > (int) (sizeof (TermWin.parent)
1881 / sizeof (TermWin.parent[0])))
1882 {
1883 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0],
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */
1890 }
1891 else
1892 {
1893 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1);
1903# endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
1907 ParentRelative);
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1909 ParentRelative);
1910 am_transparent = 1;
1911 }
1912
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None;
1915 }
1916 return pchanged;
1917} 2234}
1918#endif
1919 2235
1920/*}}} */ 2236/*}}} */
1921 2237
1922bool 2238void ecb_hot
1923rxvt_term::cmd_parse () 2239rxvt_term::cmd_parse ()
1924{ 2240{
1925 bool flag = false;
1926 unicode_t ch = NOCHAR; 2241 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2242 char *seq_begin; // remember start of esc-sequence here
1928 2243
1929 for (;;) 2244 for (;;)
1930 { 2245 {
1931 if (ch == NOCHAR) 2246 if (ecb_unlikely (ch == NOCHAR))
1932 { 2247 {
1933 seq_begin = cmdbuf_ptr; 2248 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2249 ch = next_char ();
1935 }
1936 2250
1937 if (ch == NOCHAR) // TODO: improve 2251 if (ch == NOCHAR)
1938 break; 2252 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2253 }
2254
2255 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2256 {
2257 if (ecb_unlikely (!seen_input))
2258 {
2259 seen_input = 1;
2260 // many badly-written programs (e.g. jed) contain a race condition:
2261 // they first read the screensize and then install a SIGWINCH handler.
2262 // some window managers resize the window early, and these programs
2263 // then sometimes get the size wrong.
2264 // unfortunately other programs are even more buggy and dislike
2265 // being sent SIGWINCH, so only do it when we were in fact being
2266 // resized.
2267 if (seen_resize && cmd_pid)
2268 kill (-cmd_pid, SIGWINCH);
2269 }
2270
1942 /* Read a text string from the input buffer */ 2271 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2272 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2273 bool refreshnow = false;
1945 int nlines = 0; 2274 int nlines = 0;
1946 unicode_t *str = buf; 2275 wchar_t *str = buf;
1947 2276 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2277
1950 for (;;) 2278 for (;;)
1951 { 2279 {
2280 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2281 break;
2282
2283 *str++ = ch;
2284
2285 if (ecb_unlikely (ch == C0_LF || str >= eol))
2286 {
2287 if (ch == C0_LF)
2288 nlines++;
2289
2290 refresh_count++;
2291
2292 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2293 {
2294 refresh_count = 0;
2295
2296 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2297 {
2298 refreshnow = true;
2299 ch = NOCHAR;
2300 break;
2301 }
2302 }
2303
2304 // scr_add_lines only works for nlines <= nrow - 1.
2305 if (nlines >= nrow - 1)
2306 {
2307 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2308 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2309 scr_add_lines (buf, str - buf, nlines);
2310
2311 nlines = 0;
2312 str = buf;
2313 eol = str + min (ncol, UBUFSIZ);
2314 }
2315
2316 if (str >= eol)
2317 {
2318 if (eol >= buf + UBUFSIZ)
2319 {
2320 ch = NOCHAR;
2321 break;
2322 }
2323 else
2324 eol = min (eol + ncol, buf + UBUFSIZ);
2325 }
2326
2327 }
2328
1952 seq_begin = cmdbuf_ptr; 2329 seq_begin = cmdbuf_ptr;
1953 ch = next_char (); 2330 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r'))
1956 break;
1957
1958 *str++ = ch;
1959
1960 if (ch == '\n')
1961 {
1962 nlines++;
1963 refresh_count++;
1964
1965 if (! (Options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
1967 {
1968 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR;
1971 break;
1972 }
1973
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1)
1976 {
1977 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0;
1979 str = buf;
1980 }
1981 }
1982
1983 if (str >= buf + UBUFSIZ)
1984 {
1985 ch = NOCHAR;
1986 break;
1987 }
1988 } 2331 }
1989 2332
2333 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2334 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2335 scr_add_lines (buf, str - buf, nlines);
1991 2336
1992 /* 2337 /*
1993 * If there have been a lot of new lines, then update the screen 2338 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2339 * What the heck we'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2340 * if skipScroll is enabled.
1996 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2341 */
2001 if (refreshnow) 2342 if (refreshnow)
2002 { 2343 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++;
2005
2006 scr_refresh (refresh_type); 2344 scr_refresh ();
2345 want_refresh = 1;
2007 } 2346 }
2008
2009 } 2347 }
2010 else 2348 else
2011 { 2349 {
2012 try 2350 try
2013 { 2351 {
… …
2021 } 2359 }
2022 2360
2023 ch = NOCHAR; 2361 ch = NOCHAR;
2024 } 2362 }
2025 } 2363 }
2026
2027 return flag;
2028} 2364}
2029 2365
2030// read the next character 2366// read the next character
2031unicode_t 2367wchar_t ecb_hot
2032rxvt_term::next_char () 2368rxvt_term::next_char () NOTHROW
2033{ 2369{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2370 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2371 {
2036 // assume 7-bit to be ascii ALWAYS 2372 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2373 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2038 return *cmdbuf_ptr++; 2374 return *cmdbuf_ptr++;
2039 2375
2040 wchar_t wc; 2376 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2377 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2378
2043 if (len == (size_t)-2) 2379 if (len == (size_t)-2)
2044 { 2380 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2381 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2382 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2383 break;
2048 } 2384 }
2049 2385
2050 if (len == (size_t)-1) 2386 if (len == (size_t)-1)
2387 {
2388 mbstate.reset (); // reset now undefined conversion state
2389 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2390 // in which case we "erroneously" return the next byte which might be valid.
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2391 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2392 }
2052 2393
2053 // assume wchar == unicode 2394 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2395 cmdbuf_ptr += len;
2055 return wc; 2396 return wc & UNICODE_MASK;
2056 } 2397 }
2057 2398
2058 return NOCHAR; 2399 return NOCHAR;
2059} 2400}
2060 2401
2061/* rxvt_cmd_getc () - Return next input character */ 2402// read the next octet
2062/* 2403uint32_t ecb_hot
2063 * Return the next input character after first passing any keyboard input 2404rxvt_term::next_octet () NOTHROW
2064 * to the command.
2065 */
2066unicode_t
2067rxvt_term::cmd_getc ()
2068{ 2405{
2406 return cmdbuf_ptr < cmdbuf_endp
2407 ? (unsigned char)*cmdbuf_ptr++
2408 : NOCHAR;
2409}
2410
2411static class out_of_input out_of_input;
2412
2413wchar_t ecb_hot
2414rxvt_term::cmd_getc () THROW ((class out_of_input))
2415{
2069 unicode_t c = next_char (); 2416 wchar_t c = next_char ();
2417
2418 if (c == NOCHAR)
2419 throw out_of_input;
2420
2421 return c;
2422}
2423
2424uint32_t ecb_hot
2425rxvt_term::cmd_get8 () THROW ((class out_of_input))
2426{
2427 uint32_t c = next_octet ();
2070 2428
2071 if (c == NOCHAR) 2429 if (c == NOCHAR)
2072 throw out_of_input; 2430 throw out_of_input;
2073 2431
2074 return c; 2432 return c;
2075} 2433}
2076 2434
2077/*{{{ print pipe */ 2435/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2080FILE * 2438FILE * ecb_cold
2081rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2082{ 2440{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2441 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2084 2442
2085 if (stream == NULL) 2443 if (stream == NULL)
2086 rxvt_warn ("can't open printer pipe, not printing.\n"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2087 2445
2088 return stream; 2446 return stream;
2089} 2447}
2090 2448
2091int 2449int ecb_cold
2092rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2093{ 2451{
2094 fflush (stream); 2452 fflush (stream);
2095 return pclose (stream); 2453 return pclose (stream);
2096} 2454}
2097 2455
2098/* 2456/*
2099 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2100 */ 2458 */
2101void 2459void ecb_cold
2102rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2103{ 2461{
2104 int done; 2462 FILE *fd = popen_printer ();
2105 FILE *fd;
2106 2463
2107 if ((fd = popen_printer ()) == NULL) 2464 if (!fd)
2108 return; 2465 return;
2109 2466
2110 /* 2467 /*
2111 * Send all input to the printer until either ESC[4i or ESC[?4i 2468 * Send all input to the printer until either ESC[4i or ESC[?4i
2112 * is received. 2469 * is received.
2113 */ 2470 */
2114 for (done = 0; !done;) 2471 for (int done = 0; !done; )
2115 { 2472 {
2116 unsigned char buf[8]; 2473 unsigned char buf[8];
2117 unicode_t ch; 2474 unicode_t ch;
2118 unsigned int i, len; 2475 unsigned int i, len;
2119 2476
… …
2138 { 2495 {
2139 if ((buf[len++] = cmd_getc ()) == 'i') 2496 if ((buf[len++] = cmd_getc ()) == 'i')
2140 break; /* done = 1 */ 2497 break; /* done = 1 */
2141 } 2498 }
2142 } 2499 }
2143 2500
2144 for (i = 0; i < len; i++) 2501 for (i = 0; i < len; i++)
2145 if (putc (buf[i], fd) == EOF) 2502 if (putc (buf[i], fd) == EOF)
2146 { 2503 {
2147 done = 1; 2504 done = 1;
2148 break; 2505 break;
… …
2150 } 2507 }
2151 } 2508 }
2152 2509
2153 pclose_printer (fd); 2510 pclose_printer (fd);
2154} 2511}
2155#endif /* PRINTPIPE */ 2512#endif /* PRINTPIPE */
2156/*}}} */ 2513/*}}} */
2157 2514
2158/* *INDENT-OFF* */
2159enum { 2515enum {
2160 C1_40 = 0x40, 2516 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2517 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2518 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2519 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2520 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2521};
2166/* *INDENT-ON* */
2167 2522
2168/*{{{ process non-printing single characters */ 2523/*{{{ process non-printing single characters */
2169void 2524void ecb_hot
2170rxvt_term::process_nonprinting (unicode_t ch) 2525rxvt_term::process_nonprinting (unicode_t ch)
2171{ 2526{
2172 switch (ch) 2527 switch (ch)
2173 { 2528 {
2174 case C0_ESC: 2529 case C0_ESC:
2175 process_escape_seq (); 2530 process_escape_seq ();
2176 break; 2531 break;
2177 case C0_ENQ: /* terminal Status */ 2532 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2533 if (rs[Rs_answerbackstring])
2179 tt_write ( 2534 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2180 (const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2535 else
2183 tt_write ((unsigned char *)VT100_ANS, 2536 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2537 break;
2186 case C0_BEL: /* bell */ 2538 case C0_BEL: /* bell */
2187 scr_bell (); 2539 scr_bell ();
2188 break; 2540 break;
2189 case C0_BS: /* backspace */ 2541 case C0_BS: /* backspace */
… …
2205 break; 2557 break;
2206 case C0_SI: /* shift in - acs */ 2558 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2559 scr_charset_choose (0);
2208 break; 2560 break;
2209 2561
2562#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2563 // 8-bit controls
2211 case 0x90: /* DCS */ 2564 case 0x90: /* DCS */
2212 process_dcs_seq (); 2565 process_dcs_seq ();
2213 break; 2566 break;
2214 case 0x9b: /* CSI */ 2567 case 0x9b: /* CSI */
2215 process_csi_seq (); 2568 process_csi_seq ();
2216 break; 2569 break;
2217 case 0x9d: /* CSI */ 2570 case 0x9d: /* OSC */
2218 process_osc_seq (); 2571 process_osc_seq ();
2219 break; 2572 break;
2573#endif
2220 } 2574 }
2221} 2575}
2222/*}}} */ 2576/*}}} */
2223 2577
2224 2578
2225/*{{{ process VT52 escape sequences */ 2579/*{{{ process VT52 escape sequences */
2226void 2580void ecb_cold
2227rxvt_term::process_escape_vt52 (unicode_t ch) 2581rxvt_term::process_escape_vt52 (unicode_t ch)
2228{ 2582{
2229 int row, col; 2583 int row, col;
2230 2584
2231 switch (ch) 2585 switch (ch)
… …
2265 break; 2619 break;
2266 case 'Z': /* identify the terminal type */ 2620 case 'Z': /* identify the terminal type */
2267 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2621 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2268 break; 2622 break;
2269 case '<': /* turn off VT52 mode */ 2623 case '<': /* turn off VT52 mode */
2270 PrivMode (0, PrivMode_vt52); 2624 priv_modes &= ~PrivMode_vt52;
2271 break; 2625 break;
2272 case 'F': /* use special graphics character set */ 2626 case 'F': /* use special graphics character set */
2273 case 'G': /* use regular character set */ 2627 case 'G': /* use regular character set */
2274 /* unimplemented */ 2628 /* unimplemented */
2275 break; 2629 break;
… …
2281} 2635}
2282/*}}} */ 2636/*}}} */
2283 2637
2284 2638
2285/*{{{ process escape sequences */ 2639/*{{{ process escape sequences */
2286void 2640void ecb_hot
2287rxvt_term::process_escape_seq () 2641rxvt_term::process_escape_seq ()
2288{ 2642{
2289 unicode_t ch = cmd_getc (); 2643 unicode_t ch = cmd_getc ();
2290 2644
2291 if (PrivateModes & PrivMode_vt52) 2645 if (priv_modes & PrivMode_vt52)
2292 { 2646 {
2293 process_escape_vt52 (ch); 2647 process_escape_vt52 (ch);
2294 return; 2648 return;
2295 } 2649 }
2296 2650
2297 switch (ch) 2651 switch (ch)
2298 { 2652 {
2299 /* case 1: do_tek_mode (); break; */
2300 case '#': 2653 case '#':
2301 if (cmd_getc () == '8') 2654 if (cmd_getc () == '8')
2302 scr_E (); 2655 scr_E ();
2303 break; 2656 break;
2304 case '(': 2657 case '(':
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2664 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2665 break;
2313 case '+': 2666 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2667 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2668 break;
2316#ifndef NO_FRILLS 2669#if !ENABLE_MINIMAL
2317 case '6': 2670 case '6':
2318 scr_backindex (); 2671 scr_backindex ();
2319 break; 2672 break;
2320#endif 2673#endif
2321 case '7': 2674 case '7':
2322 scr_cursor (SAVE); 2675 scr_cursor (SAVE);
2323 break; 2676 break;
2324 case '8': 2677 case '8':
2325 scr_cursor (RESTORE); 2678 scr_cursor (RESTORE);
2326 break; 2679 break;
2327#ifndef NO_FRILLS 2680#if !ENABLE_MINIMAL
2328 case '9': 2681 case '9':
2329 scr_forwardindex (); 2682 scr_forwardindex ();
2330 break; 2683 break;
2331#endif 2684#endif
2685 // DECPAM/DECPNM
2332 case '=': 2686 case '=':
2687 priv_modes |= PrivMode_aplKP;
2688 break;
2333 case '>': 2689 case '>':
2334 PrivMode ((ch == '='), PrivMode_aplKP); 2690 priv_modes &= ~PrivMode_aplKP;
2335 break; 2691 break;
2336 2692
2337 case C1_40: 2693 case C1_40:
2338 cmd_getc (); 2694 cmd_getc ();
2339 break; 2695 break;
… …
2342 break; 2698 break;
2343 2699
2344 /* 8.3.87: NEXT LINE */ 2700 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2701 case C1_NEL: /* ESC E */
2346 { 2702 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2703 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2704 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2349 } 2705 }
2350 break; 2706 break;
2351 2707
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2354 process_graphics (); 2710 // used by original rxvt for rob nations own graphics mode
2711 if (cmd_getc () == 'Q')
2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2355 break; 2713 break;
2356 2714
2357 /* 8.3.63: CHARACTER TABULATION SET */ 2715 /* 8.3.63: CHARACTER TABULATION SET */
2358 case C1_HTS: /* ESC H */ 2716 case C1_HTS: /* ESC H */
2359 scr_set_tab (1); 2717 scr_set_tab (1);
… …
2363 case C1_RI: /* ESC M */ 2721 case C1_RI: /* ESC M */
2364 scr_index (DN); 2722 scr_index (DN);
2365 break; 2723 break;
2366 2724
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2725 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2726 /* case C1_SS2: break; */
2369 2727
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2728 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2729 /* case C1_SS3: break; */
2372 2730
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2731 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2732 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2733 process_dcs_seq ();
2376 break; 2734 break;
2377 2735
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2736 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 2737 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 2738 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 2739 break; /* steal obsolete ESC [ c */
2383 2740
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2741 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2385 case C1_CSI: /* ESC [ */ 2742 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 2743 process_csi_seq ();
2387 break; 2744 break;
2388 2745
2389 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2746 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2390 case C1_OSC: /* ESC ] */ 2747 case C1_OSC: /* ESC ] */
2391 process_osc_seq (); 2748 process_osc_seq ();
2392 break; 2749 break;
2393 2750
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2751 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2395 case 'c': 2752 case 'c':
2753 mbstate.reset ();
2396 scr_poweron (); 2754 scr_poweron ();
2397 scrollbar_show (1); 2755 scrollBar.show (1);
2398 break; 2756 break;
2399 2757
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2758 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2401 case 'n': 2759 case 'n':
2402 scr_charset_choose (2); 2760 scr_charset_choose (2);
… …
2409 } 2767 }
2410} 2768}
2411/*}}} */ 2769/*}}} */
2412 2770
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2771/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */
2415enum { 2772enum {
2416 CSI_ICH = 0x40, 2773 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2774 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2775 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2776 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2777 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2778 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2779 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2423 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2780 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2424 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2781 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2425}; 2782};
2426 2783
2427#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2784#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2428 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2785 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2429 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2786 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2430#define get_byte_array_bit(array, bit) \ 2787#define get_byte_array_bit(array, bit) \
2431 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2788 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2432 2789
2433const unsigned char csi_defaults[] = 2790static const unsigned char csi_defaults[] =
2434 { 2791 {
2435 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2792 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2436 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2793 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2794 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2795 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2796 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2797 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2800 };
2444/* *INDENT-ON* */
2445 2801
2446void 2802void ecb_hot
2447rxvt_term::process_csi_seq () 2803rxvt_term::process_csi_seq ()
2448{ 2804{
2449 unicode_t ch, priv, i; 2805 unicode_t ch, priv, prev_ch, i;
2450 unsigned int nargs, p; 2806 unsigned int nargs, p;
2451 int n, ndef; 2807 int n, ndef;
2452 int arg[ESC_ARGS]; 2808 int arg[ESC_ARGS] = { };
2453 2809
2454 for (nargs = ESC_ARGS; nargs > 0;) 2810 nargs = 0;
2455 arg[--nargs] = 0;
2456 2811
2457 priv = 0; 2812 priv = 0;
2458 ch = cmd_getc (); 2813 ch = cmd_getc ();
2459 if (ch >= '<' && ch <= '?') 2814 if ((ch >= '<' && ch <= '?') || ch == '!')
2815 {
2460 { /* '<' '=' '>' '?' */ 2816 /* '<' '=' '>' '?' '!' */
2461 priv = ch; 2817 priv = ch;
2462 ch = cmd_getc (); 2818 ch = cmd_getc ();
2463 } 2819 }
2464 2820
2821 prev_ch = 0;
2465 /* read any numerical arguments */ 2822 /* read any numerical arguments */
2466 for (n = -1; ch < CSI_ICH; ) 2823 for (n = -1; ch < CSI_ICH; )
2467 { 2824 {
2468 if (isdigit (ch)) 2825 if (isdigit (ch))
2469 { 2826 {
… …
2479 n = -1; 2836 n = -1;
2480 } 2837 }
2481 else if (IS_CONTROL (ch)) 2838 else if (IS_CONTROL (ch))
2482 process_nonprinting (ch); 2839 process_nonprinting (ch);
2483 2840
2841 prev_ch = ch;
2484 ch = cmd_getc (); 2842 ch = cmd_getc ();
2485 } 2843 }
2486 2844
2487 if (ch > CSI_7F) 2845 if (ch > CSI_7F)
2488 return; 2846 return;
… …
2494 ndef = get_byte_array_bit (csi_defaults, i); 2852 ndef = get_byte_array_bit (csi_defaults, i);
2495 for (p = 0; p < nargs; p++) 2853 for (p = 0; p < nargs; p++)
2496 if (arg[p] == -1) 2854 if (arg[p] == -1)
2497 arg[p] = ndef; 2855 arg[p] = ndef;
2498 2856
2499#ifdef DEBUG_CMD
2500 fprintf (stderr, "CSI ");
2501 for (p = 0; p < nargs; p++)
2502 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2503 fprintf (stderr, "%c\n", ch);
2504#endif
2505
2506 /* 2857 /*
2507 * private mode handling 2858 * private mode handling
2508 */ 2859 */
2509 if (priv) 2860 if (priv)
2510 { 2861 {
2511 switch (priv) 2862 switch (priv)
2512 { 2863 {
2513 case '>': 2864 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 2865 if (ch == CSI_DA) /* secondary device attributes */
2866 {
2867 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2868 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2869 //
2870 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2871 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2872 // versions.
2873 //
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2874 tt_printf ("\033[>%d;95;0c", 'U');
2875 }
2516 break; 2876 break;
2877
2517 case '?': 2878 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 2881 break;
2882
2883 case '!':
2884 if (ch == CSI_70)
2885 {
2886 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2887 scr_soft_reset ();
2888
2889 static const int pm_h[] = { 7, 25 };
2890 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2891
2892 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2893 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2521 } 2894 }
2895 break;
2896 }
2897
2522 return; 2898 return;
2523 } 2899 }
2524 2900
2525 switch (ch) 2901 switch (ch)
2526 { 2902 {
… …
2540 } 2916 }
2541 break; 2917 break;
2542#endif 2918#endif
2543 2919
2544 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2920 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2545 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2921 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2546 arg[0] = -arg[0]; 2922 arg[0] = -arg[0];
2547 /* FALLTHROUGH */ 2923 /* FALLTHROUGH */
2548 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2924 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2549 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2925 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2550 scr_gotorc (arg[0], 0, RELATIVE); 2926 scr_gotorc (arg[0], 0, RELATIVE);
2551 break; 2927 break;
2552 2928
2553 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2929 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2554 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2930 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
2625 3001
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3002 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 3003 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 3004 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3005 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3006 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 3007 break;
2632 3008
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3009 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3010 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3011 break;
2637 3012
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3013 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3014 process_sgr_mode (nargs, arg);
2640 break; 3015 break;
… …
2646 tt_printf ("\033[0n"); 3021 tt_printf ("\033[0n");
2647 break; 3022 break;
2648 case 6: /* CPR requested */ 3023 case 6: /* CPR requested */
2649 scr_report_position (); 3024 scr_report_position ();
2650 break; 3025 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3026 case 7: /* unofficial extension */
3027 if (option (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3028 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3029 break;
2655#endif
2656 case 8: /* unofficial extension */ 3030 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3031 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3032 break;
2659 } 3033 }
2660 break; 3034 break;
2661 3035
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3036 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3069 break;
2696 3070
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3071 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3072 if (arg[0] == 4)
2699 scr_insert_mode (0); 3073 scr_insert_mode (0);
3074 else if (arg[0] == 20)
3075 priv_modes &= ~PrivMode_LFNL;
2700 break; 3076 break;
2701 3077
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3078 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3079 if (arg[0] == 4)
2704 scr_insert_mode (1); 3080 scr_insert_mode (1);
3081 else if (arg[0] == 20)
3082 priv_modes |= PrivMode_LFNL;
3083 break;
3084
3085 case CSI_71: // DESCUSR: set cursor style
3086 if (prev_ch == ' ')
3087 set_cursor_style (arg[0]);
2705 break; 3088 break;
2706 3089
2707 /* 3090 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3091 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3092 */
… …
2721 break; 3104 break;
2722 case CSI_75: 3105 case CSI_75:
2723 scr_cursor (RESTORE); 3106 scr_cursor (RESTORE);
2724 break; 3107 break;
2725 3108
2726#ifndef NO_FRILLS 3109#if !ENABLE_MINIMAL
2727 case CSI_74: 3110 case CSI_74:
2728 process_window_ops (arg, nargs); 3111 process_window_ops (arg, nargs);
2729 break; 3112 break;
2730#endif 3113#endif
2731 3114
… …
2738 break; 3121 break;
2739 } 3122 }
2740} 3123}
2741/*}}} */ 3124/*}}} */
2742 3125
2743#ifndef NO_FRILLS 3126#if !ENABLE_MINIMAL
2744/* ARGSUSED */
2745void 3127void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3128rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3129{
2748 int x, y; 3130 int x, y;
2749 XWindowAttributes wattr; 3131 XWindowAttributes wattr;
2750 Window wdummy; 3132 Window wdummy;
3133
3134 dLocal (Display *, dpy);
2751 3135
2752 if (nargs == 0) 3136 if (nargs == 0)
2753 return; 3137 return;
2754 3138
2755 switch (args[0]) 3139 switch (args[0])
2756 { 3140 {
2757 /* 3141 /*
2758 * commands 3142 * commands
2759 */ 3143 */
2760 case 1: /* deiconify window */ 3144 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3145 XMapWindow (dpy, parent);
2762 break; 3146 break;
2763 case 2: /* iconify window */ 3147 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3148 XIconifyWindow (dpy, parent, display->screen);
2765 DefaultScreen (display->display));
2766 break; 3149 break;
2767 case 3: /* set position (pixels) */ 3150 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3151 XMoveWindow (dpy, parent, args[1], args[2]);
2769 break; 3152 break;
2770 case 4: /* set size (pixels) */ 3153 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3154 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3155 break;
2773 case 5: /* raise window */ 3156 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3157 XRaiseWindow (dpy, parent);
2775 break; 3158 break;
2776 case 6: /* lower window */ 3159 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3160 XLowerWindow (dpy, parent);
2778 break; 3161 break;
2779 case 7: /* refresh window */ 3162 case 7: /* refresh window */
2780 scr_touch (true); 3163 scr_touch (true);
2781 break; 3164 break;
2782 case 8: /* set size (chars) */ 3165 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3166 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3167 (unsigned int) (args[1] * fheight));
2785 break; 3168 break;
2786 3169
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3170 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3171 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3172 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3173 set_widthheight ((unsigned int)vt_width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3174 (unsigned int) (args[1] * fheight));
2792 break; 3175 break;
2793
2794 3176
2795 /* 3177 /*
2796 * reports - some output format copied from XTerm 3178 * reports - some output format copied from XTerm
2797 */ 3179 */
2798 case 11: /* report window state */ 3180 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3182 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3183 break;
2802 case 13: /* report window position */ 3184 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3185 XGetWindowAttributes (dpy, parent, &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3186 XTranslateCoordinates (dpy, parent, wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3187 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3188 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3189 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3190 break;
2809 case 14: /* report window size (pixels) */ 3191 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3192 XGetWindowAttributes (dpy, parent, &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3193 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3194 break;
2813 case 18: /* report text area size (chars) */ 3195 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3196 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3197 break;
2816 case 19: /* report window size (chars) */ 3198 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3199 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3200 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3201 case 20: /* report icon label */
3202 {
3203 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3204 XGetIconName (dpy, parent, &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3205 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3206 XFree (s);
3207 }
2823 break; 3208 break;
2824 case 21: /* report window title */ 3209 case 21: /* report window title */
2825 XFetchName (display->display, TermWin.parent[0], &s); 3210 {
3211 char *s;
3212 XFetchName (dpy, parent, &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3213 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3214 XFree (s);
3215 }
2827 break; 3216 break;
2828#endif
2829 } 3217 }
2830} 3218}
2831#endif 3219#endif
2832 3220
2833/*----------------------------------------------------------------------*/ 3221/*----------------------------------------------------------------------*/
2834/* 3222/*
2835 * get input up until STRING TERMINATOR (or BEL) 3223 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3224 * ends_how is terminator used. returned input must be free()'d
2837 */ 3225 */
2838unsigned char * 3226char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3227rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3228{
2841 int seen_esc = 0; /* seen escape? */ 3229 unicode_t ch;
3230 bool seen_esc = false;
2842 unsigned int n = 0; 3231 unsigned int n = 0;
2843 unsigned char *s; 3232 wchar_t string[CBUFSIZ];
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX];
2846 3233
2847 while ((ch = cmd_getc ())) 3234 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3235 {
2849 if (ch == C0_BEL 3236 if (seen_esc)
2850 || ch == CHAR_ST 3237 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3238 if (ch == 0x5c) /* 7bit ST */
2852 break; 3239 break;
2853 3240 else
3241 return NULL;
3242 }
2854 if (ch == C0_ESC) 3243 else if (ch == C0_ESC)
2855 { 3244 {
2856 seen_esc = 1; 3245 seen_esc = true;
2857 continue; 3246 continue;
2858 } 3247 }
3248 else if (ch == C0_BEL || ch == CHAR_ST)
3249 break;
2859 else if (ch == '\t') 3250 else if (ch == C0_SYN)
2860 ch = ' '; /* translate '\t' to space */ 3251 ch = cmd_get8 ();
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3252 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3253 return NULL; /* other control character - exit */
2863 3254
3255 seen_esc = false;
3256
2864 if (n < sizeof (string) - 1) 3257 if (n >= sizeof (string) - 1)
3258 // stop at some sane length
3259 return NULL;
3260
2865 string[n++] = ch; 3261 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3262 }
2869 3263
2870 string[n++] = '\0'; 3264 string[n++] = '\0';
2871 3265
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3266 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3267
2877 return s; 3268 return rxvt_wcstombs (string);
2878} 3269}
2879 3270
2880/*----------------------------------------------------------------------*/ 3271/*----------------------------------------------------------------------*/
2881/* 3272/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3273 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3274 */
2884void 3275void
2885rxvt_term::process_dcs_seq () 3276rxvt_term::process_dcs_seq ()
2886{ 3277{
2887 unsigned char *s;
2888 unicode_t eh;
2889
2890 /* 3278 /*
2891 * Not handled yet 3279 * Not handled yet
2892 */ 3280 */
3281
3282 unicode_t eh;
2893 s = get_to_st (eh); 3283 char *s = get_to_st (eh);
2894 if (s) 3284 if (s)
2895 free (s); 3285 free (s);
2896 3286
2897 return; 3287 return;
2898} 3288}
… …
2902 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3292 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2903 */ 3293 */
2904void 3294void
2905rxvt_term::process_osc_seq () 3295rxvt_term::process_osc_seq ()
2906{ 3296{
2907 unicode_t ch, eh;
2908 int arg; 3297 int arg;
2909 3298
2910 ch = cmd_getc (); 3299 unicode_t ch = cmd_getc ();
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3300 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3301 arg = arg * 10 + (ch - '0');
2913 3302
2914 if (ch == ';') 3303 if (ch == ';')
2915 { 3304 {
3305 unicode_t eh;
2916 unsigned char *s = get_to_st (eh); 3306 char *s = get_to_st (eh);
2917 3307
2918 if (s) 3308 if (s)
2919 { 3309 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3310 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3311 free (s);
2934 } 3312 }
2935 } 3313 }
2936} 3314}
3315
3316void
3317rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3318{
3319 if (str[0] == '?' && !str[1])
3320 {
3321 rgba c;
3322 pix_colors_focused[color].get (c);
3323
3324#if XFT
3325 if (c.a != rgba::MAX_CC)
3326 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3327 else
3328#endif
3329 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3330 }
3331 else
3332 set_window_color (color, str);
3333}
3334
2937/* 3335/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3336 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title
2940 * 1 = change iconName
2941 * 2 = change title
2942 * 4 = change color
2943 * 12 = change text color
2944 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour
2946 * 18 = change bold character color
2947 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented)
2949 * 50 = change font
2950 *
2951 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap
2954 * 39 = change default fg color
2955 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale
2958 * 702 = find font
2959 */ 3337 */
2960void 3338void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3339rxvt_term::process_xterm_seq (int op, char *str, char resp)
2962{ 3340{
2963 int changed = 0;
2964 int color; 3341 int color;
2965 char *buf, *name; 3342 char *buf, *name;
3343 bool query = str[0] == '?' && !str[1];
3344 int saveop = op;
3345
3346 dLocal (Display *, dpy);
2966 3347
2967 assert (str != NULL); 3348 assert (str != NULL);
3349
3350 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3351 return;
3352
2968 switch (op) 3353 switch (op)
2969 { 3354 {
2970 case XTerm_name: 3355 case XTerm_name:
2971 set_title (str); 3356 set_title (str);
2972 /* FALLTHROUGH */ 3357 /* FALLTHROUGH */
… …
2974 set_icon_name (str); 3359 set_icon_name (str);
2975 break; 3360 break;
2976 case XTerm_title: 3361 case XTerm_title:
2977 set_title (str); 3362 set_title (str);
2978 break; 3363 break;
3364 case XTerm_property:
3365 if (str[0] == '?')
3366 {
3367 Atom prop = display->atom (str + 1);
3368 Atom actual_type;
3369 int actual_format;
3370 unsigned long nitems;
3371 unsigned long bytes_after;
3372 unsigned char *value = 0;
3373 const char *str = "";
3374
3375 if (prop
3376 && XGetWindowProperty (dpy, parent,
3377 prop, 0, 1<<16, 0, AnyPropertyType,
3378 &actual_type, &actual_format,
3379 &nitems, &bytes_after, &value) == Success
3380 && actual_type != None
3381 && actual_format == 8)
3382 str = (const char *)(value);
3383
3384 tt_printf ("\033]%d;%s%c", op, str, resp);
3385
3386 XFree (value);
3387 }
3388 else
3389 {
3390 char *eq = strchr (str, '=');
3391
3392 if (eq)
3393 {
3394 *eq = 0;
3395 set_utf8_property (display->atom (str), eq + 1);
3396 }
3397 else
3398 XDeleteProperty (dpy, parent,
3399 display->atom (str));
3400 }
3401 break;
3402
2979 case XTerm_Color: 3403 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3404 for (buf = (char *)str; buf && *buf;)
2981 { 3405 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3406 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3407 break;
2984 3408
2985 *name++ = '\0'; 3409 *name++ = '\0';
2986 color = atoi (buf); 3410 color = atoi (buf) + minCOLOR;
2987 3411
2988 if (color < 0 || color >= TOTAL_COLORS) 3412 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3413 break;
2990 3414
2991 if ((buf = STRCHR (name, ';')) != NULL) 3415 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3416 *buf++ = '\0';
2993 3417
2994 set_window_color (color + minCOLOR, name); 3418 process_color_seq (op, color, name, resp);
2995 } 3419 }
3420 break;
3421 case Rxvt_restoreFG:
3422 case XTerm_Color00:
3423 process_color_seq (op, Color_fg, str, resp);
3424 break;
3425 case Rxvt_restoreBG:
3426 case XTerm_Color01:
3427 process_color_seq (op, Color_bg, str, resp);
2996 break; 3428 break;
2997#ifndef NO_CURSORCOLOR 3429#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3430 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3431 process_color_seq (op, Color_cursor, str, resp);
3000 break; 3432 break;
3001#endif 3433#endif
3002 case XTerm_Color_pointer: 3434 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3435 process_color_seq (op, Color_pointer_fg, str, resp);
3004 break; 3436 break;
3437 case XTerm_Color_pointer_bg:
3438 process_color_seq (op, Color_pointer_bg, str, resp);
3439 break;
3440#ifdef OPTION_HC
3441 case XTerm_Color_HC:
3442 process_color_seq (op, Color_HC, str, resp);
3443 break;
3444 case XTerm_Color_HTC:
3445 process_color_seq (op, Color_HTC, str, resp);
3446 break;
3447#endif
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3448#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3449 case URxvt_Color_BD:
3007 set_window_color (Color_BD, str); 3450 process_color_seq (op, Color_BD, str, resp);
3008 break; 3451 break;
3009 case XTerm_Color_UL: 3452 case URxvt_Color_UL:
3010 set_window_color (Color_UL, str); 3453 process_color_seq (op, Color_UL, str, resp);
3011 break; 3454 break;
3012 case XTerm_Color_RV: 3455 case URxvt_Color_IT:
3013 set_window_color (Color_RV, str); 3456 process_color_seq (op, Color_IT, str, resp);
3014 break; 3457 break;
3015#endif 3458#endif
3459 case URxvt_Color_border:
3460 process_color_seq (op, Color_border, str, resp);
3461 break;
3016 3462
3017 case XTerm_Menu: 3463#if BG_IMAGE_FROM_ROOT
3464 case URxvt_Color_tint:
3465 process_color_seq (op, Color_tint, str, resp);
3018 /* 3466 {
3019 * rxvt_menubar_dispatch () violates the constness of the string, 3467 bool changed = false;
3020 * so DON'T do it here 3468
3469 if (ISSET_PIXCOLOR (Color_tint))
3470 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3471
3472 if (changed)
3473 update_background ();
3021 */ 3474 }
3475
3022 break; 3476 break;
3477#endif
3478
3479#if BG_IMAGE_FROM_FILE
3023 case XTerm_Pixmap: 3480 case Rxvt_Pixmap:
3024 if (*str != ';') 3481 if (!strcmp (str, "?"))
3025 { 3482 {
3026#if XPM_BACKGROUND 3483 char str[256];
3027 scale_pixmap (""); /* reset to default scaling */ 3484 int h_scale = fimage.h_scale;
3028 set_bgPixmap (str); /* change pixmap */ 3485 int v_scale = fimage.v_scale;
3029#endif 3486 int h_align = fimage.h_align;
3030 scr_touch (true); 3487 int v_align = fimage.v_align;
3488
3489 sprintf (str, "[%dx%d+%d+%d]",
3490 h_scale, v_scale,
3491 h_align, v_align);
3492 process_xterm_seq (XTerm_title, str, CHAR_ST);
3031 } 3493 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3494 else
3033 { 3495 {
3496 bool changed = false;
3497
3498 if (*str != ';')
3499 {
3500 try
3501 {
3502 fimage.set_file_geometry (this, str);
3503 changed = true;
3504 }
3505 catch (const class rxvt_failure_exception &e)
3506 {
3507 }
3508 }
3509 else
3510 {
3034 str++; 3511 str++;
3035#if XPM_BACKGROUND 3512 if (fimage.set_geometry (str, true))
3036 changed += scale_pixmap (str); 3513 changed = true;
3037#endif 3514 }
3038 3515
3516 if (changed)
3517 {
3518 if (bg_window_position_sensitive ())
3519 {
3520 int x, y;
3521 get_window_origin (x, y);
3522 parent_x = x;
3523 parent_y = y;
3524 }
3525 update_background ();
3526 }
3039 } 3527 }
3040 if (changed)
3041 {
3042#ifdef XPM_BACKGROUND
3043 resize_pixmap ();
3044#endif
3045 scr_touch (true);
3046 }
3047 break; 3528 break;
3529#endif
3048 3530
3049 case XTerm_restoreFG:
3050 set_window_color (Color_fg, str);
3051 break;
3052 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str);
3054 break;
3055 case XTerm_logfile: 3531 case XTerm_logfile:
3056 // TODO, when secure mode? 3532 // TODO, when secure mode?
3057 break; 3533 break;
3058 case XTerm_font: 3534
3059 change_font (str);
3060 break;
3061#ifndef NO_FRILLS
3062 case XTerm_locale:
3063 if (str[0] == '?' && !str[1])
3064 tt_printf ("%-.250s\n", locale);
3065 else
3066 {
3067 set_locale (str);
3068# ifdef USE_XIM
3069 im_cb ();
3070# endif
3071 }
3072 break;
3073 case XTerm_findfont:
3074 {
3075 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break;
3079#endif
3080#if 0 3535#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3536 case Rxvt_dumpscreen: /* no error notices */
3082 { 3537 {
3083 int fd; 3538 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3539 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3540 {
3086 scr_dump (fd); 3541 scr_dump (fd);
3087 close (fd); 3542 close (fd);
3088 } 3543 }
3089 } 3544 }
3545 break;
3546#endif
3547 case XTerm_font:
3548 op = URxvt_font;
3549 case URxvt_font:
3550#if ENABLE_STYLES
3551 case URxvt_boldFont:
3552 case URxvt_italicFont:
3553 case URxvt_boldItalicFont:
3554#endif
3555 if (query)
3556 tt_printf ("\33]%d;%-.250s%c", saveop,
3557 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3558 ? fontset[op - URxvt_font]->fontdesc : "",
3559 resp);
3560 else
3561 {
3562 const char *&res = rs[Rs_font + (op - URxvt_font)];
3563
3564 res = strdup (str);
3565 allocated.push_back ((void *)res);
3566 set_fonts ();
3567 }
3568 break;
3569
3570 case URxvt_version:
3571 if (query)
3572 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3573 op,
3574 rs[Rs_name], VERSION[0], VERSION[2],
3575 resp);
3576 break;
3577
3578#if !ENABLE_MINIMAL
3579 case URxvt_locale:
3580 if (query)
3581 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3582 else
3583 {
3584 set_locale (str);
3585 pty->set_utf8_mode (enc_utf8);
3586 init_xlocale ();
3587 }
3588 break;
3589
3590 case URxvt_view_up:
3591 case URxvt_view_down:
3592 {
3593 int lines = atoi (str);
3594
3595 if (lines)
3596 scr_page (op == URxvt_view_up ? UP : DN, lines);
3597 else
3598 scr_erase_savelines ();
3599 }
3600
3601 break;
3602#endif
3603
3604#if ENABLE_PERL
3605 case URxvt_perl:
3606 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3090 break; 3607 break;
3091#endif 3608#endif
3092 } 3609 }
3093} 3610}
3094/*----------------------------------------------------------------------*/ 3611/*----------------------------------------------------------------------*/
… …
3101 * 's' = save 3618 * 's' = save
3102 * 'r' = restore 3619 * 'r' = restore
3103 * 't' = toggle 3620 * 't' = toggle
3104 * so no need for fancy checking 3621 * so no need for fancy checking
3105 */ 3622 */
3106int 3623int ecb_cold
3107rxvt_term::privcases (int mode, unsigned long bit) 3624rxvt_term::privcases (int mode, unsigned long bit)
3108{ 3625{
3109 int state; 3626 int state;
3110 3627
3111 if (mode == 's') 3628 if (mode == 's')
3112 { 3629 {
3113 SavedModes |= (PrivateModes & bit); 3630 if (priv_modes & bit)
3631 SavedModes |= bit;
3632 else
3633 SavedModes &= ~bit;
3114 return -1; 3634 return -1;
3115 } 3635 }
3116 else 3636 else
3117 { 3637 {
3118 if (mode == 'r') 3638 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3639 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3640 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3641 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3642
3643 if (state)
3644 priv_modes |= bit;
3645 else
3646 priv_modes &= ~bit;
3123 } 3647 }
3124 3648
3125 return state; 3649 return state;
3126} 3650}
3127 3651
3128/* we're not using priv _yet_ */ 3652/* we're not using priv _yet_ */
3129void 3653void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3654rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3131{ 3655{
3132 unsigned int i, j; 3656 unsigned int i, j;
3133 int state; 3657 int state;
3134 3658
3135 static const struct 3659 static const struct
3136 { 3660 {
3137 const int argval; 3661 const int argval;
3138 const unsigned long bit; 3662 const unsigned long bit;
3139 }
3140
3141 argtopriv[] = { 3663 } argtopriv[] = {
3142 { 1, PrivMode_aplCUR }, 3664 { 1, PrivMode_aplCUR }, // DECCKM
3143 { 2, PrivMode_vt52 }, 3665 { 2, PrivMode_vt52 }, // DECANM
3144 { 3, PrivMode_132 }, 3666 { 3, PrivMode_132 }, // DECCOLM
3145 { 4, PrivMode_smoothScroll }, 3667 { 4, PrivMode_smoothScroll }, // DECSCLM
3146 { 5, PrivMode_rVideo }, 3668 { 5, PrivMode_rVideo }, // DECSCNM
3147 { 6, PrivMode_relOrigin }, 3669 { 6, PrivMode_relOrigin }, // DECOM
3148 { 7, PrivMode_Autowrap }, 3670 { 7, PrivMode_Autowrap }, // DECAWM
3671 // 8, auto-repeat keys // DECARM
3149 { 9, PrivMode_MouseX10 }, 3672 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3673 // 18 end FF to printer after print screen
3151 { menuBar_esc, PrivMode_menuBar }, 3674 // 19 Print screen prints full screen/scroll region
3152#endif 3675 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3153#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3677 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3678#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3679 { 35, PrivMode_ShiftKeys }, // rxvt extension
3680 // 38, tektronix mode // DECTEK
3160 { 40, PrivMode_132OK }, 3681 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3682 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3683 // 45 margin bell NYI
3163 // 46 start logging 3684 // 46 start logging
3164 { 47, PrivMode_Screen }, 3685 { 47, PrivMode_Screen },
3165 { 66, PrivMode_aplKP }, 3686 { 66, PrivMode_aplKP }, // DECNKM
3166#ifndef NO_BACKSPACE_KEY 3687#ifndef NO_BACKSPACE_KEY
3167 { 67, PrivMode_BackSpace }, 3688 { 67, PrivMode_BackSpace }, // DECBKM
3168#endif 3689#endif
3169 { 1000, PrivMode_MouseX11 }, 3690 { 1000, PrivMode_MouseX11 },
3170 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3691 { 1002, PrivMode_MouseBtnEvent },
3171 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3692 { 1003, PrivMode_MouseAnyEvent },
3172 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3693#if ENABLE_FRILLS
3694 { 1005, PrivMode_ExtModeMouse },
3695#endif
3173 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3696 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3174 { 1011, PrivMode_Keypress }, // rxvt extension 3697 { 1011, PrivMode_Keypress }, // rxvt extension
3698#if ENABLE_FRILLS
3699 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3700#endif
3175 // 1035 enable modifiers for alt, numlock NYI 3701 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3702 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3703 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3704 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3705 // 1048 save and restore cursor, implemented in code
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3706 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3707 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3708 { 2004, PrivMode_BracketPaste },
3182 }; 3709 };
3183 3710
3184 if (nargs == 0) 3711 if (nargs == 0)
3185 return; 3712 return;
3186 3713
… …
3193 for (i = 0; i < nargs; i++) 3720 for (i = 0; i < nargs; i++)
3194 { 3721 {
3195 state = -1; 3722 state = -1;
3196 3723
3197 /* basic handling */ 3724 /* basic handling */
3198 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3725 for (j = 0; j < ecb_array_length (argtopriv); j++)
3199 if (argtopriv[j].argval == arg[i]) 3726 if (argtopriv[j].argval == arg[i])
3200 { 3727 {
3201 state = privcases (mode, argtopriv[j].bit); 3728 state = privcases (mode, argtopriv[j].bit);
3202 break; 3729 break;
3203 } 3730 }
3204 3731
3205 /* extra handling for values with state unkept */ 3732 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3733 switch (arg[i])
3207 { 3734 {
3735#if ENABLE_STYLES
3736 case 1021:
3737 set_option (Opt_intensityStyles, mode);
3738
3739 scr_touch (true);
3740 break;
3741#endif
3208 case 1048: /* alternative cursor save */ 3742 case 1048: /* alternative cursor save */
3209 case 1049: 3743 if (option (Opt_secondaryScreen))
3210 if (mode == 0) 3744 if (mode == 0)
3211 scr_cursor (RESTORE); 3745 scr_cursor (RESTORE);
3212 else if (mode == 1) 3746 else if (mode == 1)
3213 scr_cursor (SAVE); 3747 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3748 break;
3215 } 3749 }
3216 3750
3217 if (state >= 0) 3751 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3752 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3753 switch (arg[i])
… …
3222 case 2: /* VT52 mode */ 3756 case 2: /* VT52 mode */
3223 /* oddball mode. should be set regardless of set/reset 3757 /* oddball mode. should be set regardless of set/reset
3224 * parameter. Return from VT52 mode with an ESC < from 3758 * parameter. Return from VT52 mode with an ESC < from
3225 * within VT52 mode 3759 * within VT52 mode
3226 */ 3760 */
3227 PrivMode (1, PrivMode_vt52); 3761 priv_modes |= PrivMode_vt52;
3228 break; 3762 break;
3229 case 3: /* 80/132 */ 3763 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 3764 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3765 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3232 break; 3766 break;
3233 case 4: /* smooth scrolling */ 3767 case 4: /* smooth scrolling */
3234 if (state) 3768 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 3769 break;
3239 case 5: /* reverse video */ 3770 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 3771 scr_rvideo_mode (state);
3241 break; 3772 break;
3242 case 6: /* relative/absolute origins */ 3773 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 3774 scr_relative_origin (state);
3244 break; 3775 break;
3245 case 7: /* autowrap */ 3776 case 7: /* autowrap */
3246 scr_autowrap (state); 3777 scr_autowrap (state);
3247 break; 3778 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3779 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3780 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3781 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3782 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3252 break; 3783 break;
3253#ifdef menuBar_esc
3254 case menuBar_esc:
3255#ifdef MENUBAR
3256 map_menuBar (state);
3257#endif
3258 break;
3259#endif
3260#ifdef scrollBar_esc 3784#ifdef scrollBar_esc
3261 case scrollBar_esc: 3785 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 3786 scrollBar.map (state);
3263 {
3264 resize_all_windows (0, 0, 0); 3787 resize_all_windows (0, 0, 0);
3265 scr_touch (true); 3788 scr_touch (true);
3266 }
3267 break; 3789 break;
3268#endif 3790#endif
3269 case 25: /* visible/invisible cursor */ 3791 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3792 scr_cursor_visible (state);
3271 break; 3793 break;
3272 /* case 35: - shift keys */ 3794 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3795 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3796 case 47: /* secondary screen */
3275 scr_change_screen (state); 3797 scr_change_screen (state);
3276 break; 3798 break;
3277 /* case 66: - application key pad */ 3799 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3800 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3801 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3802 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3803 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3282 break; 3804 break;
3283#if 0
3284 case 1001: 3805 case 1002:
3285 break; /* X11 mouse highlighting */ 3806 case 1003:
3286#endif 3807 if (state)
3808 {
3809 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3810 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3811 mouse_row = mouse_col = 0;
3812 vt_emask_mouse = PointerMotionMask;
3813 }
3814 else
3815 vt_emask_mouse = NoEventMask;
3816
3817 vt_select_input ();
3818 break;
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 3819 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 3820 set_option (Opt_scrollTtyOutput, !state);
3292 break; 3821 break;
3293 case 1011: /* scroll to bottom on key press */ 3822 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3823 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3824 break;
3299 case 1047: /* secondary screen w/ clearing */ 3825 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3826 if (option (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 3827 if (!state)
3302 scr_erase_screen (2); 3828 scr_erase_screen (2);
3303 3829
3304 scr_change_screen (state); 3830 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3831 break;
3832 case 1049: /* secondary screen w/ clearing first */
3833 if (option (Opt_secondaryScreen))
3834 if (state)
3835 scr_cursor (SAVE);
3836
3837 scr_change_screen (state);
3838
3839 if (option (Opt_secondaryScreen))
3840 if (state)
3841 scr_erase_screen (2);
3842 else
3843 scr_cursor (RESTORE);
3844 break;
3306 default: 3845 default:
3307 break; 3846 break;
3308 } 3847 }
3309 } 3848 }
3310} 3849}
3311/*}}} */ 3850/*}}} */
3312 3851
3313/*{{{ process sgr sequences */ 3852/*{{{ process sgr sequences */
3314void 3853void ecb_hot
3315rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3854rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3316{ 3855{
3317 unsigned int i; 3856 unsigned int i;
3318 short rendset; 3857 short rendset;
3319 int rendstyle; 3858 int rendstyle;
… …
3333 rendset = 0, rendstyle = ~RS_None; 3872 rendset = 0, rendstyle = ~RS_None;
3334 break; 3873 break;
3335 case 1: 3874 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3875 rendset = 1, rendstyle = RS_Bold;
3337 break; 3876 break;
3877 //case 2: // low intensity
3878 case 3:
3879 rendset = 1, rendstyle = RS_Italic;
3880 break;
3338 case 4: 3881 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3882 rendset = 1, rendstyle = RS_Uline;
3340 break; 3883 break;
3341 case 5: 3884 case 5: // slowly blinking
3885 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3886 rendset = 1, rendstyle = RS_Blink;
3343 break; 3887 break;
3888 //case 6: // scoansi light background
3344 case 7: 3889 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3890 rendset = 1, rendstyle = RS_RVid;
3346 break; 3891 break;
3347 case 8: 3892 case 8:
3348 // invisible. NYI 3893 // invisible. NYI
3349 break; 3894 break;
3350 case 22: 3895 //case 9: // crossed out
3896 //case 10: // scoansi acs off, primary font
3897 //case 11: // scoansi acs on, first alt font
3898 //case 12: // scoansi acs on, |0x80, second alt font
3899 //...
3900 //case 19: // ninth alt font
3901 //case 20: // gothic
3902 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 3903 rendset = 0, rendstyle = RS_Bold;
3904 break;
3905 case 22: // normal intensity
3906 rendset = 0, rendstyle = RS_Bold;
3907 break;
3908 case 23: // disable italic
3909 rendset = 0, rendstyle = RS_Italic;
3352 break; 3910 break;
3353 case 24: 3911 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 3912 rendset = 0, rendstyle = RS_Uline;
3355 break; 3913 break;
3356 case 25: 3914 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 3915 rendset = 0, rendstyle = RS_Blink;
3358 break; 3916 break;
3917 case 26: // variable spacing (iso 8613)
3918 rendset = 0, rendstyle = RS_Blink;
3919 break;
3359 case 27: 3920 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 3921 rendset = 0, rendstyle = RS_RVid;
3361 break; 3922 break;
3362 case 28:
3363 // visible. NYI 3923 //case 28: // visible. NYI
3364 break; 3924 //case 29: // not crossed-out
3365 } 3925 }
3366 3926
3367 if (rendset != -1) 3927 if (rendset != -1)
3368 { 3928 {
3369 scr_rendition (rendset, rendstyle); 3929 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 3940 case 35:
3381 case 36: 3941 case 36:
3382 case 37: 3942 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3943 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 3944 break;
3385#ifdef TTY_256COLOR 3945 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 3946 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 3947 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3948 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 3949 i += 2;
3391 } 3950 }
3392 break; 3951 break;
3393#endif
3394 case 39: /* default fg */ 3952 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 3953 scr_color (Color_fg, Color_fg);
3396 break; 3954 break;
3397 3955
3398 case 40: 3956 case 40:
… …
3403 case 45: 3961 case 45:
3404 case 46: 3962 case 46:
3405 case 47: 3963 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3964 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 3965 break;
3408#ifdef TTY_256COLOR 3966 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 3967 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 3968 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3969 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 3970 i += 2;
3414 } 3971 }
3415 break; 3972 break;
3416#endif
3417 case 49: /* default bg */ 3973 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 3974 scr_color (Color_bg, Color_bg);
3419 break; 3975 break;
3420 3976
3421#ifndef NO_BRIGHTCOLOR 3977 //case 50: // not variable spacing
3978
3979#if !ENABLE_MINIMAL
3422 case 90: 3980 case 90:
3423 case 91: /* set bright fg color */ 3981 case 91: /* set bright fg color */
3424 case 92: 3982 case 92:
3425 case 93: 3983 case 93:
3426 case 94: 3984 case 94:
3427 case 95: 3985 case 95:
3428 case 96: 3986 case 96:
3429 case 97: 3987 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3988 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 3989 break;
3433 case 100: 3990 case 100:
3434 case 101: /* set bright bg color */ 3991 case 101: /* set bright bg color */
3435 case 102: 3992 case 102:
3436 case 103: 3993 case 103:
3437 case 104: 3994 case 104:
3438 case 105: 3995 case 105:
3439 case 106: 3996 case 106:
3440 case 107: 3997 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3998 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 3999 break;
3444#endif 4000#endif
3445
3446 } 4001 }
3447 } 4002 }
3448} 4003}
3449/*}}} */
3450 4004
3451/*{{{ process Rob Nation's own graphics mode sequences */
3452void 4005void
3453rxvt_term::process_graphics () 4006rxvt_term::set_cursor_style (int style)
3454{ 4007{
3455 unicode_t ch, cmd = cmd_getc (); 4008 if (!IN_RANGE_INC (style, 0, 4))
3456
3457 if (cmd == 'Q')
3458 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */
3460 return; 4009 return;
3461 } 4010
3462 /* swallow other graphics sequences until terminating ':' */ 4011 set_option (Opt_cursorUnderline, style >= 3);
3463 do 4012
3464 ch = cmd_getc (); 4013#ifdef CURSOR_BLINK
3465 while (ch != ':'); 4014 set_option (Opt_cursorBlink, !style || (style & 1));
4015 cursor_blink_reset ();
4016#endif
4017
4018 want_refresh = 1;
3466} 4019}
3467/*}}} */ 4020/*}}} */
3468 4021
3469/* ------------------------------------------------------------------------- */ 4022/* ------------------------------------------------------------------------- */
3470 4023
… …
3474 */ 4027 */
3475void 4028void
3476rxvt_term::tt_printf (const char *fmt,...) 4029rxvt_term::tt_printf (const char *fmt,...)
3477{ 4030{
3478 va_list arg_ptr; 4031 va_list arg_ptr;
3479 unsigned char buf[256]; 4032 char buf[256];
3480 4033
3481 va_start (arg_ptr, fmt); 4034 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4035 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4036 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4037 tt_write (buf, strlen (buf));
3485} 4038}
3486 4039
3487/* ---------------------------------------------------------------------- */ 4040/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4041/* Write data to the pty as typed by the user, pasted with the mouse,
3489 * or generated by us in response to a query ESC sequence. 4042 * or generated by us in response to a query ESC sequence.
3490 */ 4043 */
4044static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4045
3491void 4046void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4047rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 4048{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4049 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4050 return;
3495 4051
3496 if (len) 4052 if (pty->pty < 0)
4053 return;
4054
4055 if (v_buflen == 0)
4056 {
4057 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4058
4059 max_it (written, 0);
4060
4061 if (written == len)
4062 return;
4063
4064 data += written;
4065 len -= written;
3497 { 4066 }
4067
4068 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4069
4070 memcpy (v_buffer + v_buflen, data, len);
4071 v_buflen += len;
4072
4073 pty_ev.set (ev::READ | ev::WRITE);
4074}
4075
4076void rxvt_term::pty_write ()
4077{
4078 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4079
4080 if (written > 0)
4081 {
4082 v_buflen -= written;
4083
3498 if (v_buflen == 0) 4084 if (v_buflen == 0)
3499 { 4085 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3501
3502 if ((unsigned int)written == len)
3503 return;
3504
3505 data += written;
3506 len -= written;
3507 }
3508
3509
3510 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3511
3512 memcpy (v_buffer + v_buflen, data, len);
3513 v_buflen += len;
3514 }
3515
3516 for (;;)
3517 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519
3520 if (written > 0)
3521 {
3522 v_buflen -= written;
3523
3524 if (v_buflen == 0)
3525 {
3526 free (v_buffer); 4086 free (v_buffer);
3527 v_buffer = 0; 4087 v_buffer = 0;
3528 v_buflen = 0;
3529 4088
3530 pty_ev.set (EVENT_READ); 4089 pty_ev.set (ev::READ);
3531 return;
3532 }
3533
3534 memmove (v_buffer, v_buffer + written, v_buflen);
3535 }
3536 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3537 // original code just ignores this...
3538 destroy ();
3539 else
3540 {
3541 pty_ev.set (EVENT_READ | EVENT_WRITE);
3542 return; 4090 return;
3543 } 4091 }
4092
4093 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4094 }
4095 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4096 pty_ev.set (ev::READ);
3545} 4097}
3546 4098
3547/*----------------------- end-of-file (C source) -----------------------*/ 4099/*----------------------- end-of-file (C source) -----------------------*/
3548 4100

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines