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

Diff Legend

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