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.266 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.604 by sf-exg, Sat Feb 3 15:47:24 2024 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 MENUBAR_MAX || defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count)
929{
930 unsigned int n, s;
931
932 n = cmdbuf_ptr - cmdbuf_base;
933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
934
935 if (n > 0 && s < count)
936 {
937 memmove (cmdbuf_base, cmdbuf_ptr,
938 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
939 cmdbuf_ptr = cmdbuf_base;
940 cmdbuf_endp -= n;
941 s += n;
942 }
943
944 if (count > s)
945 {
946 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
947 count = s;
948 }
949
950 for (; count--;)
951 *cmdbuf_endp++ = *str++;
952
953 cmd_parse ();
954
955 return 0;
956}
957#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}
958 954
959void 955void
960rxvt_term::flush () 956rxvt_term::flush ()
961{ 957{
962 flush_ev.stop (); 958 flush_ev.stop ();
963 959
964#ifdef TRANSPARENT 960#ifdef HAVE_IMG
965 if (want_full_refresh) 961 if (bg_flags & BG_NEEDS_REFRESH)
966 { 962 {
967 want_full_refresh = 0; 963 bg_flags &= ~BG_NEEDS_REFRESH;
968 scr_clear ();
969 scr_touch (false); 964 scr_touch (false);
970 } 965 }
971#endif 966#endif
972 967
973 if (want_refresh) 968 if (want_refresh)
… …
1008 while (l->is_longer () && row < end_row); 1003 while (l->is_longer () && row < end_row);
1009 } 1004 }
1010 while (row < end_row); 1005 while (row < end_row);
1011 } 1006 }
1012 1007
1013 scr_refresh (refresh_type); 1008 scr_refresh ();
1014 scrollbar_show (1); 1009 scrollBar.show (1);
1015#ifdef USE_XIM 1010#if USE_XIM
1016 IMSendSpot (); 1011 im_send_spot ();
1017#endif 1012#endif
1018 } 1013 }
1019 1014
1020 display->flush (); 1015 display->flush ();
1021} 1016}
1022 1017
1018/* checks whether a refresh is requested and starts the refresh timer */
1023void 1019void
1024rxvt_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)
1025{ 1030{
1026 make_current (); 1031 make_current ();
1027 1032
1028 display->flush ();
1029
1030 if (want_refresh && !flush_ev.active)
1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1032}
1033
1034void
1035rxvt_term::flush_cb (time_watcher &w)
1036{
1037 make_current ();
1038
1039 refresh_limit = 1;
1040 refresh_count = 0; 1033 refresh_count = 0;
1041 flush (); 1034 flush ();
1042} 1035}
1043 1036
1044#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1045void 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
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1047{ 1058{
1048 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1060 want_refresh = 1;
1050 1061 refresh_check ();
1051 w.start (w.at + BLINK_INTERVAL);
1052} 1062}
1053#endif 1063#endif
1054 1064
1055#ifdef TEXT_BLINK 1065#ifdef TEXT_BLINK
1056void 1066void
1057rxvt_term::text_blink_cb (time_watcher &w) 1067rxvt_term::text_blink_cb (ev::timer &w, int revents)
1058{ 1068{
1059 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1069 if (scr_refresh_rend (RS_Blink, RS_Blink))
1060 { 1070 {
1061 hidden_text = !hidden_text; 1071 hidden_text = !hidden_text;
1062 want_refresh = 1; 1072 want_refresh = 1;
1063 w.start (w.at + TEXT_BLINK_INTERVAL); 1073 refresh_check ();
1064 } 1074 }
1075 else
1076 w.stop ();
1065} 1077}
1066#endif 1078#endif
1067 1079
1068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1069void 1081void
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1071{ 1083{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1074 { 1086 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1087 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 refresh_check ();
1078 } 1089 }
1090 else
1091 w.stop ();
1079} 1092}
1080#endif 1093#endif
1081 1094
1082#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1083void 1096void
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1085{ 1098{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1087 { 1100 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1102 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
1092 } 1104 }
1105 else
1106 w.stop ();
1093} 1107}
1094#endif 1108#endif
1095 1109
1096#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1097void 1111void
1098rxvt_term::slip_wheel_cb (time_watcher &w) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1099{ 1113{
1100 if (mouse_slip_wheel_speed == 0 1114 if (scr_page (mouse_slip_wheel_speed))
1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1115 {
1104 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0;
1106
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1116 want_refresh = 1;
1109 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)
1110 } 1121 {
1122 mouse_slip_wheel_speed = 0;
1123 w.stop ();
1124 }
1111} 1125}
1112#endif 1126#endif
1113 1127
1114#if HAVE_SCHED_YIELD 1128#if LINUX_YIELD_HACK
1115static struct event_handler 1129static struct event_handler
1116{ 1130{
1117 check_watcher cw_yield; 1131 ev::prepare yield_ev;
1118 1132
1119 void yield (check_watcher &w) 1133 void yield_cb (ev::prepare &w, int revents)
1120 { 1134 {
1121 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
1122 w.stop (); 1146 w.stop ();
1123 } 1147 }
1124 1148
1125 event_handler () 1149 event_handler ()
1126 : cw_yield (this, &event_handler::yield) 1150 : yield_ev (this, &event_handler::yield_cb)
1127 { 1151 {
1128 } 1152 }
1129} event_handler; 1153} event_handler;
1130#endif 1154#endif
1131 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
1132bool 1189bool
1133rxvt_term::pty_fill () 1190rxvt_term::pty_fill ()
1134{ 1191{
1135 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1192 cmdbuf_reify ();
1136 1193
1137 if (CBUFSIZ == n) 1194 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1138 { 1195
1139 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1196 if (!avail)
1140 n = 0;
1141 } 1197 {
1142 1198 // normally this indicates a "too long" command sequence - just drop the data we have
1143 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1199 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1200 cmdbuf_endp = cmdbuf_ptr;
1201 avail = CBUFSIZ;
1202 }
1146 1203
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1204 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1148 1205
1149 if (r > 0) 1206 if (r > 0)
1150 { 1207 {
1151 cmdbuf_endp += r; 1208 cmdbuf_endp += r;
1152 return true; 1209 return true;
1153 } 1210 }
1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1211 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 { 1212 {
1156#if HAVE_SCHED_YIELD 1213#if LINUX_YIELD_HACK
1157 if (display->is_local) 1214 if (display->is_local)
1158 event_handler.cw_yield.start (); 1215 event_handler.yield_ev.start ();
1159#endif 1216#endif
1160 } 1217 }
1161 else 1218 else
1162 { 1219 {
1163 pty_ev.stop (); 1220 pty_ev.stop ();
1164 1221
1165 if (!OPTION (Opt_hold)) 1222 if (!option (Opt_hold))
1166 destroy (); 1223 destroy ();
1167 } 1224 }
1168 1225
1169 return false; 1226 return false;
1170} 1227}
1171 1228
1172void 1229void
1173rxvt_term::pty_cb (io_watcher &w, short revents) 1230rxvt_term::pty_cb (ev::io &w, int revents)
1174{ 1231{
1175 make_current (); 1232 make_current ();
1176 1233
1177 if (revents & EVENT_READ) 1234 if (revents & ev::READ)
1178 // loop, but don't allow a single term to monopolize us 1235 // loop, but don't allow a single term to monopolize us
1179 while (pty_fill ()) 1236 for (int i = CBUFCNT; i-- && pty_fill (); )
1180 if (cmd_parse ()) 1237 cmd_parse ();
1181 break;
1182 1238
1183 if (revents & EVENT_WRITE) 1239 if (revents & ev::WRITE)
1184 pty_write (); 1240 pty_write ();
1185}
1186 1241
1187void 1242 refresh_check ();
1243}
1244
1245void ecb_cold
1188rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1189{ 1247{
1190 XDefineCursor (display->display, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1191 recolour_cursor (); 1249 recolor_cursor ();
1192 1250
1193#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1194 hidden_pointer = 0; 1252 hidden_pointer = 0;
1195 1253
1196 if (OPTION (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1197 pointer_ev.start (NOW + pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1198#endif 1256#endif
1199} 1257}
1200 1258
1201#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1202void 1260void ecb_cold
1203rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1204{ 1262{
1205 if (!OPTION (Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1206 return; 1264 return;
1207 1265
1208 XDefineCursor (display->display, vt, display->blank_cursor); 1266 XDefineCursor (dpy, vt, display->blank_cursor);
1209 XFlush (display->display); 1267 XFlush (dpy);
1210 1268
1211 hidden_pointer = 1; 1269 hidden_pointer = 1;
1212} 1270}
1213 1271
1214void 1272void ecb_cold
1215rxvt_term::pointer_cb (time_watcher &w) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1216{ 1274{
1217 make_current (); 1275 make_current ();
1218 1276
1219 pointer_blank (); 1277 pointer_blank ();
1220} 1278}
1221#endif 1279#endif
1222 1280
1223void 1281void
1224rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1225{ 1283{
1226 int button_number, key_state = 0; 1284 int button_number, state = 0;
1227 int x, y; 1285 int x, y;
1286 bool release = ev.type == ButtonRelease;
1228 1287
1229 x = ev.x; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1230 y = ev.y; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1231 pixel_position (&x, &y); 1290
1291 if (ev.type == MotionNotify)
1292 {
1293 if (x == mouse_row && y == mouse_col)
1294 return;
1295
1296 mouse_row = x;
1297 mouse_col = y;
1298 state += 32;
1299 }
1232 1300
1233 if (MEvent.button == AnyButton) 1301 if (MEvent.button == AnyButton)
1234 button_number = 3; 1302 button_number = 3;
1235 else 1303 else
1236 { 1304 {
1237 button_number = MEvent.button - Button1; 1305 button_number = MEvent.button - Button1;
1238 /* add 0x3D for wheel events, like xterm does */ 1306 if (button_number > 10)
1307 return;
1308 else if (button_number >= 7)
1309 button_number += 128 - 7;
1239 if (button_number >= 3) 1310 else if (button_number >= 3)
1240 button_number += (64 - 3); 1311 button_number += 64 - 3;
1241 } 1312 }
1242 1313
1243 if (priv_modes & PrivMode_MouseX10) 1314 if (priv_modes & PrivMode_MouseX10)
1244 { 1315 {
1245 /* 1316 /*
1246 * do not report ButtonRelease 1317 * do not report ButtonRelease
1247 * no state info allowed 1318 * no state info allowed
1248 */ 1319 */
1249 key_state = 0; 1320 if (release)
1250 if (button_number == 3)
1251 return; 1321 return;
1252 } 1322 }
1253 else 1323 else
1254 { 1324 {
1255 /* XTerm mouse reporting needs these values: 1325 /* XTerm mouse reporting needs these values:
… …
1257 * 8 = Meta 1327 * 8 = Meta
1258 * 16 = Control 1328 * 16 = Control
1259 * plus will add in our own Double-Click reporting 1329 * plus will add in our own Double-Click reporting
1260 * 32 = Double Click 1330 * 32 = Double Click
1261 */ 1331 */
1262 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1332 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1263 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1264 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
1265#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
1266 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 state += ((MEvent.clicks > 1) ? 32 : 0);
1267#endif 1337#endif
1268 } 1338 }
1339
1340 int code = 32 + (release ? 3 : button_number) + state;
1269 1341
1270#if DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
1271 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
1272 if (key_state & 16) 1344 if (state & 16)
1273 fputc ('C', stderr); 1345 fputc ('C', stderr);
1274 if (key_state & 4) 1346 if (state & 4)
1275 fputc ('S', stderr); 1347 fputc ('S', stderr);
1276 if (key_state & 8) 1348 if (state & 8)
1277 fputc ('A', stderr); 1349 fputc ('A', stderr);
1278 if (key_state & 32) 1350 if (state & 32)
1279 fputc ('2', stderr); 1351 fputc ('2', stderr);
1280 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1281 button_number, 1353 button_number,
1282 x + 1, 1354 x,
1283 y + 1); 1355 y);
1284#endif 1356#endif
1285 1357
1358#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseSGR)
1360 tt_printf ("\033[<%d;%d;%d%c",
1361 button_number + state,
1362 x,
1363 y,
1364 release ? 'm' : 'M');
1365 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1366 tt_printf ("\033[%d;%d;%dM",
1367 code,
1368 x,
1369 y);
1370 else if (priv_modes & PrivMode_ExtMouseUTF8)
1371 if (code < 128)
1372 tt_printf ("\033[M%c%lc%lc",
1373 code,
1374 wint_t (32 + x),
1375 wint_t (32 + y));
1376 else
1377 tt_printf ("\033[M%c%c%lc%lc",
1378 0xc0 + (code >> 6),
1379 0x80 + (code & 0x3f),
1380 wint_t (32 + x),
1381 wint_t (32 + y));
1382 else
1383#endif
1286 tt_printf ("\033[M%c%c%c", 1384 tt_printf ("\033[M%c%c%c",
1287 (32 + button_number + key_state), 1385 code,
1288 (32 + x + 1), 1386 32 + x,
1289 (32 + y + 1)); 1387 32 + y);
1290} 1388}
1291
1292#ifdef USING_W11LIB
1293void
1294rxvt_W11_process_x_event (XEvent *ev)
1295{
1296 rxvt_t *r = rxvt_get_r ();
1297
1298 x_cb (*ev);
1299}
1300#endif
1301 1389
1302/*{{{ process an X event */ 1390/*{{{ process an X event */
1303void 1391void ecb_hot
1304rxvt_term::x_cb (XEvent &ev) 1392rxvt_term::x_cb (XEvent &ev)
1305{ 1393{
1306 make_current (); 1394 make_current ();
1307 1395
1308 dDisp; 1396 dLocal (Display *, dpy);
1309 1397
1310 if (ev.xany.window == vt 1398 if (ev.xany.window == vt
1311 && SHOULD_INVOKE (HOOK_X_EVENT) 1399 && SHOULD_INVOKE (HOOK_X_EVENT)
1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1400 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313 return; 1401 return;
… …
1318 unsigned int unused_mask; 1406 unsigned int unused_mask;
1319 1407
1320 switch (ev.type) 1408 switch (ev.type)
1321 { 1409 {
1322 case KeyPress: 1410 case KeyPress:
1323#if ISO_14755 1411 key_press (ev.xkey);
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1326 lookup_key (ev.xkey);
1327
1328 break; 1412 break;
1329 1413
1330 case KeyRelease: 1414 case KeyRelease:
1331 { 1415 key_release (ev.xkey);
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0;
1401#endif
1402 break; 1416 break;
1403 }
1404 1417
1405 case ButtonPress: 1418 case ButtonPress:
1406 button_press (ev.xbutton); 1419 button_press (ev.xbutton);
1407 break; 1420 break;
1408 1421
… …
1410 button_release (ev.xbutton); 1423 button_release (ev.xbutton);
1411 break; 1424 break;
1412 1425
1413 case ClientMessage: 1426 case ClientMessage:
1414 if (ev.xclient.format == 32 1427 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1428 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 1429 {
1430 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1431 {
1432 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1433 {
1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1434 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1435 {
1436 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418 destroy (); 1437 destroy ();
1438 }
1419#if ENABLE_EWMH 1439#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1440 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1441 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1442 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev); 1443 &ev);
1444#endif
1445 }
1446 }
1447#if ENABLE_XEMBED
1448 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449 {
1450 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451 focus_in ();
1452 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453 focus_out ();
1454 }
1424#endif 1455#endif
1425 } 1456 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break;
1462
1463 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1457 break;
1466 1458
1467 /* 1459 /*
1468 * XXX: this is not the _current_ arrangement 1460 * XXX: this is not the _current_ arrangement
1469 * Here's my conclusion: 1461 * Here's my conclusion:
… …
1488 break; 1480 break;
1489 } 1481 }
1490 break; 1482 break;
1491 1483
1492 case FocusIn: 1484 case FocusIn:
1485 if (ev.xfocus.detail != NotifyInferior
1486 && ev.xfocus.detail != NotifyPointer
1487 && ev.xfocus.mode != NotifyGrab)
1493 focus_in (); 1488 focus_in ();
1494 break; 1489 break;
1495 1490
1496 case FocusOut: 1491 case FocusOut:
1492 if (ev.xfocus.detail != NotifyInferior
1493 && ev.xfocus.detail != NotifyPointer
1494 && ev.xfocus.mode != NotifyGrab)
1497 focus_out (); 1495 focus_out ();
1498 break; 1496 break;
1499 1497
1500 case ConfigureNotify: 1498 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0]) 1499 if (ev.xconfigure.window == parent)
1502 { 1500 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1501 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 1502 ;
1503
1504 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1505
1506 if (want_position_change)
1507 {
1508 int x, y;
1509
1510 if (ev.xconfigure.send_event)
1511 {
1512 x = ev.xconfigure.x;
1513 y = ev.xconfigure.y;
1514 }
1515 else
1516 get_window_origin (x, y);
1517
1518 if (x != parent_x || y != parent_y)
1519 {
1520 parent_x = x;
1521 parent_y = y;
1522 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1523 }
1524 }
1505 1525
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1526 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1527 {
1508 seen_resize = 1; 1528 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1529 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1530 }
1511 1531
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1532 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1513 if (OPTION (Opt_transparent))
1514 check_our_parents ();
1515#endif
1516 } 1533 }
1517 break; 1534 break;
1518 1535
1519 case PropertyNotify: 1536 case PropertyNotify:
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1537 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1521 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523
1524 break; 1538 break;
1525 1539
1526 case SelectionClear: 1540 case SelectionClear:
1527 selection_clear (); 1541 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1528 break;
1529
1530 case SelectionNotify:
1531 if (selection_wait == Sel_normal)
1532 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1533 break; 1542 break;
1534 1543
1535 case SelectionRequest: 1544 case SelectionRequest:
1536 selection_send (ev.xselectionrequest); 1545 selection_send (ev.xselectionrequest);
1537 break; 1546 break;
1538 1547
1539 case MapNotify: 1548 case MapNotify:
1540 mapped = 1; 1549 mapped = 1;
1541#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1551 text_blink_ev.start ();
1543#endif 1552#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1553 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break; 1554 break;
1546 1555
1547 case UnmapNotify: 1556 case UnmapNotify:
… …
1549#ifdef TEXT_BLINK 1558#ifdef TEXT_BLINK
1550 text_blink_ev.stop (); 1559 text_blink_ev.stop ();
1551#endif 1560#endif
1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1561 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1553 break; 1562 break;
1554
1555#ifdef TRANSPARENT
1556 case ReparentNotify:
1557 rootwin_cb (ev);
1558 break;
1559#endif /* TRANSPARENT */
1560 1563
1561 case GraphicsExpose: 1564 case GraphicsExpose:
1562 case Expose: 1565 case Expose:
1563 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1564 { 1567 {
1565 do 1568 do
1569 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1572 }
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1574
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1576
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1578 {
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1581 }
1575 1582
1576 want_refresh = 1; 1583 want_refresh = 1;
1577 } 1584 }
1578 else 1585 else
1579 { 1586 {
1580 XEvent unused_event; 1587 XEvent unused_event;
1581 1588
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1589 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1590 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1592 ;
1586 1593
1587 if (isScrollbarWindow (ev.xany.window)) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1588 { 1595 {
1589 scrollBar.setIdle (); 1596 scrollBar.state = SB_STATE_IDLE;
1590 scrollbar_show (0); 1597 scrollBar.show (0);
1591 } 1598 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596
1597#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window);
1600#endif
1601 } 1599 }
1602 break; 1600 break;
1603 1601
1604 case MotionNotify: 1602 case MotionNotify:
1605#ifdef POINTER_BLANK 1603#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1604 if (hidden_pointer)
1607 pointer_unblank (); 1605 pointer_unblank ();
1608#endif 1606#endif
1609#if MENUBAR 1607 if (!bypass_keystate
1610 if (isMenuBarWindow (ev.xany.window)) 1608 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1611 { 1609 || priv_modes & PrivMode_MouseAnyEvent))
1612 menubar_control (ev.xbutton); 1610 mouse_report (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1611 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1612 break;
1618 1613
1619 if (ev.xany.window == vt) 1614 if (ev.xany.window == vt)
1620 { 1615 {
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1616 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1617 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop 1618 ; // nop
1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1619 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625 { 1620 {
1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1621 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1627 ; 1622 ;
1628 1623
1629 XQueryPointer (disp, vt, 1624 XQueryPointer (dpy, vt,
1630 &unused_root, &unused_child, 1625 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1626 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1627 &ev.xbutton.x, &ev.xbutton.y,
1633 &ev.xbutton.state); 1628 &ev.xbutton.state);
1634#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1635 /* deal with a `jumpy' mouse */ 1630 /* deal with a `jumpy' mouse */
1636 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1631 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1632#endif
1637 { 1633 {
1638#endif
1639#if ISO_14755 1634#if ISO_14755
1640 // 5.4 1635 // 5.4
1641 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1636 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1642 { 1637 {
1643 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1638 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1649 1644
1650#ifdef SELECTION_SCROLLING 1645#ifdef SELECTION_SCROLLING
1651 if (ev.xbutton.y < int_bwidth 1646 if (ev.xbutton.y < int_bwidth
1652 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1647 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1653 { 1648 {
1649 page_dirn scroll_selection_dir;
1654 int dist; 1650 int dist;
1655 1651
1656 /* don't clobber the current delay if we are 1652 /* don't clobber the current delay if we are
1657 * already in the middle of scrolling. 1653 * already in the middle of scrolling.
1658 */ 1654 */
1659 if (!sel_scroll_ev.active) 1655 if (!sel_scroll_ev.is_active ())
1660 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1656 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1661 1657
1662 /* save the event params so we can highlight 1658 /* save the event params so we can highlight
1663 * the selection in the pending-scroll loop 1659 * the selection in the pending-scroll loop
1664 */ 1660 */
1665 selection_save_x = ev.xbutton.x; 1661 selection_save_x = ev.xbutton.x;
… …
1673 dist = int_bwidth - ev.xbutton.y; 1669 dist = int_bwidth - ev.xbutton.y;
1674 } 1670 }
1675 else 1671 else
1676 { 1672 {
1677 scroll_selection_dir = DN; 1673 scroll_selection_dir = DN;
1678 dist = ev.xbutton.y - (int_bwidth + height); 1674 dist = ev.xbutton.y - (int_bwidth + vt_height);
1679 } 1675 }
1680 1676
1681 scroll_selection_lines = Pixel2Height (dist) 1677 scroll_selection_lines = Pixel2Height (dist)
1682 / SELECTION_SCROLL_LINE_SPEEDUP 1678 / SELECTION_SCROLL_LINE_SPEEDUP
1683 + 1; 1679 + 1;
1684 min_it (scroll_selection_lines, 1680 min_it (scroll_selection_lines,
1685 SELECTION_SCROLL_MAX_LINES); 1681 SELECTION_SCROLL_MAX_LINES);
1682 scroll_selection_lines *= scroll_selection_dir;
1686 } 1683 }
1687 else 1684 else
1688 { 1685 {
1689 /* we are within the text window, so we 1686 /* we are within the text window, so we
1690 * shouldn't be scrolling 1687 * shouldn't be scrolling
1691 */ 1688 */
1692 if (sel_scroll_ev.active)
1693 sel_scroll_ev.stop(); 1689 sel_scroll_ev.stop();
1694 } 1690 }
1695#endif 1691#endif
1696#ifdef MOUSE_THRESHOLD
1697 } 1692 }
1698#endif
1699 } 1693 }
1700 } 1694 }
1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1695 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1702 { 1696 {
1703 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1697 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1704 MotionNotify, &ev)) 1698 MotionNotify, &ev))
1705 ; 1699 ;
1706 1700
1707 XQueryPointer (disp, scrollBar.win, 1701 XQueryPointer (dpy, scrollBar.win,
1708 &unused_root, &unused_child, 1702 &unused_root, &unused_child,
1709 &unused_root_x, &unused_root_y, 1703 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1704 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1705 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1706 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1713 scrollbar_size ()); 1707 scrollBar.size ());
1714 want_refresh = 1; 1708 want_refresh = 1;
1715 refresh_limit = 0;
1716 scrollbar_show (1); 1709 scrollBar.show (1);
1717 } 1710 }
1718 break; 1711 break;
1719 } 1712 }
1720 1713
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK) 1714#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1715 if (ev.type == KeyPress)
1725 { 1716 cursor_blink_reset ();
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif 1717#endif
1735 1718
1736#if defined(POINTER_BLANK) 1719#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1720 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 { 1721 {
1739 if (ev.type == MotionNotify 1722 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress 1723 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease) 1724 || ev.type == ButtonRelease)
1742 if (hidden_pointer) 1725 if (hidden_pointer)
… …
1744 1727
1745 if (ev.type == KeyPress && hidden_pointer == 0) 1728 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank (); 1729 pointer_blank ();
1747 } 1730 }
1748#endif 1731#endif
1749}
1750 1732
1751void 1733 refresh_check ();
1734}
1735
1736#if ENABLE_FRILLS
1737void ecb_cold
1738rxvt_term::set_urgency (bool enable)
1739{
1740 if (enable == urgency_hint)
1741 return;
1742
1743 if (XWMHints *h = XGetWMHints (dpy, parent))
1744 {
1745 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1746 XSetWMHints (dpy, parent, h);
1747 urgency_hint = enable;
1748 XFree (h);
1749 }
1750}
1751#endif
1752
1753void ecb_cold
1752rxvt_term::focus_in () 1754rxvt_term::focus_in ()
1753{ 1755{
1754 if (!focus) 1756 if (!focus)
1755 { 1757 {
1756 focus = 1; 1758 focus = 1;
1757 want_refresh = 1; 1759 want_refresh = 1;
1758 1760
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1761#if USE_XIM 1761#if USE_XIM
1762 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1763 { 1763 {
1764 IMSetStatusPosition (); 1764 im_set_position ();
1765 XSetICFocus (Input_Context); 1765 XSetICFocus (Input_Context);
1766 } 1766 }
1767#endif 1767#endif
1768#if CURSOR_BLINK 1768#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1769 if (option (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1770 cursor_blink_ev.again ();
1771#endif 1771#endif
1772#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1774 { 1774 {
1775 pix_colors = pix_colors_focused; 1775 pix_colors = pix_colors_focused;
1776 scr_recolour (); 1776 scr_recolor ();
1777 } 1777 }
1778#endif 1778#endif
1779 } 1779#if ENABLE_FRILLS
1780} 1780 if (option (Opt_urgentOnBell))
1781 set_urgency (0);
1781 1782
1782void 1783 if (priv_modes & PrivMode_FocusEvent)
1784 tt_printf ("\x1b[I");
1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1788 }
1789}
1790
1791void ecb_cold
1783rxvt_term::focus_out () 1792rxvt_term::focus_out ()
1784{ 1793{
1785 if (focus) 1794 if (focus)
1786 { 1795 {
1787 focus = 0; 1796 focus = 0;
1788 want_refresh = 1; 1797 want_refresh = 1;
1789 1798
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1799#if ENABLE_FRILLS
1800 if (option (Opt_urgentOnBell))
1801 set_urgency (0);
1791 1802
1803 if (priv_modes & PrivMode_FocusEvent)
1804 tt_printf ("\x1b[O");
1805#endif
1792#if ENABLE_FRILLS || ISO_14755 1806#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf) 1807 if (iso14755buf)
1794 { 1808 {
1795 iso14755buf = 0; 1809 iso14755buf = 0;
1796# if ENABLE_OVERLAY 1810# if ISO_14755
1797 scr_overlay_off (); 1811 scr_overlay_off ();
1798# endif 1812# endif
1799 } 1813 }
1800#endif 1814#endif
1801#if USE_XIM 1815#if USE_XIM
1802 if (Input_Context != NULL) 1816 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context); 1817 XUnsetICFocus (Input_Context);
1804#endif 1818#endif
1805#if CURSOR_BLINK 1819#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink)) 1820 if (option (Opt_cursorBlink))
1807 cursor_blink_ev.stop (); 1821 cursor_blink_ev.stop ();
1822
1808 hidden_cursor = 0; 1823 hidden_cursor = 0;
1809#endif 1824#endif
1810#if OFF_FOCUS_FADING 1825#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade]) 1826 if (rs[Rs_fade])
1812 { 1827 {
1813 pix_colors = pix_colors_unfocused; 1828 pix_colors = pix_colors_unfocused;
1814 scr_recolour (); 1829 scr_recolor ();
1815 } 1830 }
1816#endif 1831#endif
1832
1833 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1834 }
1835}
1836
1837void ecb_cold
1838rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1839{
1840#if OFF_FOCUS_FADING
1841 if (rs[Rs_fade])
1817 } 1842 {
1818} 1843 if (!first_time)
1844 pix_colors_focused [idx].free (this);
1819 1845
1820#if TRANSPARENT 1846 rgba c;
1821void 1847 pix_colors [Color_fade].get (c);
1848 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1849 }
1850#endif
1851}
1852
1853#if ENABLE_PERL
1854void ecb_hot
1822rxvt_term::rootwin_cb (XEvent &ev) 1855rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1856{
1824 make_current (); 1857 make_current ();
1858
1859 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1860 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1861 return;
1825 1862
1826 switch (ev.type) 1863 switch (ev.type)
1827 { 1864 {
1828 case PropertyNotify: 1865 case PropertyNotify:
1829 /* 1866 /*
1830 * if user used some Esetroot compatible prog to set the root bg, 1867 * if user used some Esetroot compatible prog to set the root bg,
1831 * use the property to determine the pixmap. We use it later on. 1868 * use the property to determine the pixmap. We use it later on.
1832 */ 1869 */
1833 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1870 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1871 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 return; 1872 {
1873 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1874 }
1836 1875
1837 /* FALLTHROUGH */
1838 case ReparentNotify:
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1840 want_refresh = want_full_refresh = 1;
1841 break; 1876 break;
1842 } 1877 }
1878
1879 refresh_check ();
1843} 1880}
1844#endif 1881#endif
1845 1882
1846void 1883void
1847rxvt_term::button_press (XButtonEvent &ev) 1884rxvt_term::button_press (XButtonEvent &ev)
… …
1856 /* 1893 /*
1857 * VT window processing of button press 1894 * VT window processing of button press
1858 */ 1895 */
1859 if (ev.window == vt) 1896 if (ev.window == vt)
1860 { 1897 {
1898 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 return;
1900
1861#if ISO_14755 1901#if ISO_14755
1862 // 5.4 1902 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1903 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1904 {
1865 iso14755_54 (ev.x, ev.y); 1905 iso14755_54 (ev.x, ev.y);
1866 return; 1906 return;
1867 } 1907 }
1868#endif 1908#endif
1869 1909
1870 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1910 clickintime = ev.time - MEvent.time < multiClickTime;
1871 1911
1872 if (reportmode) 1912 if (reportmode)
1873 { 1913 {
1874 /* mouse report from vt window */ 1914 /* mouse report from vt window */
1875 /* save the xbutton state (for ButtonRelease) */ 1915 /* save the xbutton state (for ButtonRelease) */
1876 MEvent.state = ev.state; 1916 MEvent.state = ev.state;
1877#ifdef MOUSE_REPORT_DOUBLECLICK 1917#ifdef MOUSE_REPORT_DOUBLECLICK
1878 if (ev.button == MEvent.button && clickintime) 1918 if (ev.button == MEvent.button && clickintime)
1879 { 1919 {
1880 /* same button, within alloted time */ 1920 /* same button, within allowed time */
1881 MEvent.clicks++; 1921 MEvent.clicks++;
1882 1922
1883 if (MEvent.clicks > 1) 1923 if (MEvent.clicks > 1)
1884 { 1924 {
1885 /* only report double clicks */ 1925 /* only report double clicks */
… …
1899 mouse_report (ev); 1939 mouse_report (ev);
1900 } 1940 }
1901#else 1941#else
1902 MEvent.button = ev.button; 1942 MEvent.button = ev.button;
1903 mouse_report (ev); 1943 mouse_report (ev);
1904#endif /* MOUSE_REPORT_DOUBLECLICK */ 1944#endif /* MOUSE_REPORT_DOUBLECLICK */
1905 1945
1906 } 1946 }
1907 else 1947 else
1908 { 1948 {
1909 if (ev.button != MEvent.button) 1949 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1950 MEvent.clicks = 0;
1911 1951
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1952 switch (ev.button)
1914 { 1953 {
1915 case Button1: 1954 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1955 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1956 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1957#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1958 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1959#else
1921 selection.rect = false; 1960 selection.rect = false;
1922#endif 1961#endif
1923 1962
1924 /* allow shift+left click to extend selection */ 1963 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1964 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1965 {
1927 if (MEvent.button == Button1 && clickintime) 1966 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1967 selection_rotate (ev.x, ev.y);
1929 else 1968 else
1930 selection_extend (ev.x, ev.y, 1); 1969 selection_extend (ev.x, ev.y, 1);
1931 } 1970 }
1932 else 1971 else
1933 { 1972 {
1934 if (MEvent.button == Button1 && clickintime) 1973 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1974 MEvent.clicks++;
1936 else 1975 else
1937 MEvent.clicks = 1; 1976 MEvent.clicks = 1;
1938 1977
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1978 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1979 }
1941 1980
1942 MEvent.button = Button1; 1981 MEvent.button = Button1;
1943 break; 1982 break;
1944 1983
1945 case Button3: 1984 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1985 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1986 selection_rotate (ev.x, ev.y);
1948 else 1987 else
1949 selection_extend (ev.x, ev.y, 1); 1988 selection_extend (ev.x, ev.y, 1);
1950 1989
1951 MEvent.button = Button3; 1990 MEvent.button = Button3;
1952 break; 1991 break;
1953 } 1992 }
1954 } 1993 }
1955 1994
1956 MEvent.time = ev.time; 1995 MEvent.time = ev.time;
1957 return; 1996 return;
1958 } 1997 }
1959 1998
1960 /* 1999 /*
1961 * Scrollbar window processing of button press 2000 * Scrollbar window processing of button press
1962 */ 2001 */
1963 if (isScrollbarWindow (ev.window)) 2002 if (scrollBar.state && ev.window == scrollBar.win)
1964 { 2003 {
1965 scrollBar.setIdle (); 2004 page_dirn direction = NO_DIR;
2005
2006 if (scrollBar.upButton (ev.y))
2007 direction = UP; /* up */
2008 else if (scrollBar.dnButton (ev.y))
2009 direction = DN; /* down */
2010
2011 scrollBar.state = SB_STATE_IDLE;
1966 /* 2012 /*
1967 * Rxvt-style scrollbar: 2013 * Rxvt-style scrollbar:
1968 * move up if mouse is above slider 2014 * move up if mouse is above slider
1969 * move dn if mouse is below slider 2015 * move dn if mouse is below slider
1970 * 2016 *
… …
1979 /* 2025 /*
1980 * Mouse report disabled scrollbar: 2026 * Mouse report disabled scrollbar:
1981 * arrow buttons - send up/down 2027 * arrow buttons - send up/down
1982 * click on scrollbar - send pageup/down 2028 * click on scrollbar - send pageup/down
1983 */ 2029 */
1984 if ((scrollBar.style == R_SB_NEXT 2030 if (direction == UP)
1985 && scrollbarnext_upButton (ev.y))
1986 || (scrollBar.style == R_SB_RXVT
1987 && scrollbarrxvt_upButton (ev.y)))
1988 tt_printf ("\033[A"); 2031 tt_printf ("\033[A");
1989 else if ((scrollBar.style == R_SB_NEXT 2032 else if (direction == DN)
1990 && scrollbarnext_dnButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_dnButton (ev.y)))
1993 tt_printf ("\033[B"); 2033 tt_printf ("\033[B");
1994 else 2034 else
1995 switch (ev.button) 2035 switch (ev.button)
1996 { 2036 {
1997 case Button2: 2037 case Button2:
… …
2004 tt_printf ("\033[5~"); 2044 tt_printf ("\033[5~");
2005 break; 2045 break;
2006 } 2046 }
2007 } 2047 }
2008 else 2048 else
2009#endif /* NO_SCROLLBAR_REPORT */ 2049#endif /* NO_SCROLLBAR_REPORT */
2010
2011 {
2012 char upordown = 0;
2013
2014 if (scrollBar.style == R_SB_NEXT)
2015 { 2050 {
2016 if (scrollbarnext_upButton (ev.y)) 2051 if (direction != NO_DIR)
2017 upordown = -1; /* up */
2018 else if (scrollbarnext_dnButton (ev.y))
2019 upordown = 1; /* down */
2020 }
2021 else if (scrollBar.style == R_SB_RXVT)
2022 {
2023 if (scrollbarrxvt_upButton (ev.y))
2024 upordown = -1; /* up */
2025 else if (scrollbarrxvt_dnButton (ev.y))
2026 upordown = 1; /* down */
2027 }
2028 if (upordown)
2029 { 2052 {
2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2053#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2054 if (!cont_scroll_ev.is_active ())
2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2055 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2056#endif
2033 if (scr_page (upordown < 0 ? UP : DN, 1)) 2057 if (scr_page (direction, 1))
2034 { 2058 {
2035 if (upordown < 0) 2059 if (direction == UP)
2036 scrollBar.setUp (); 2060 scrollBar.state = SB_STATE_UP;
2037 else 2061 else
2038 scrollBar.setDn (); 2062 scrollBar.state = SB_STATE_DOWN;
2039 } 2063 }
2040 } 2064 }
2041 else 2065 else
2042 switch (ev.button) 2066 switch (ev.button)
2043 { 2067 {
2044 case Button2: 2068 case Button2:
2045 switch (scrollbar_align) 2069 switch (scrollBar.align)
2046 { 2070 {
2047 case R_SB_ALIGN_TOP: 2071 case SB_ALIGN_TOP:
2048 csrO = 0; 2072 csrO = 0;
2049 break; 2073 break;
2050 case R_SB_ALIGN_CENTRE: 2074 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2075 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2076 break;
2053 case R_SB_ALIGN_BOTTOM: 2077 case SB_ALIGN_BOTTOM:
2054 csrO = scrollBar.bot - scrollBar.top; 2078 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2079 break;
2056 } 2080 }
2057 2081
2058 if (scrollBar.style == R_SB_XTERM 2082 if (scrollBar.style == SB_STYLE_XTERM
2059 || scrollbar_above_slider (ev.y) 2083 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2084 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2085 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2086
2063 scrollBar.setMotion (); 2087 scrollBar.state = SB_STATE_MOTION;
2064 break; 2088 break;
2065 2089
2066 case Button1: 2090 case Button1:
2067 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2091 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2092 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2093 /* FALLTHROUGH */
2070 2094
2071 case Button3: 2095 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2096 if (scrollBar.style != SB_STYLE_XTERM)
2073 { 2097 {
2074 if (scrollbar_above_slider (ev.y)) 2098 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2100 scr_page (UP, nrow - 1);
2077# else 2101# else
2078 scr_page (UP, nrow / 4); 2102 scr_page (UP, nrow / 4);
2079# endif 2103# endif
2080 else if (scrollbar_below_slider (ev.y)) 2104 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2105# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2106 scr_page (DN, nrow - 1);
2083# else 2107# else
2084 scr_page (DN, nrow / 4); 2108 scr_page (DN, nrow / 4);
2085# endif 2109# endif
2086 else 2110 else
2087 scrollBar.setMotion (); 2111 scrollBar.state = SB_STATE_MOTION;
2088 } 2112 }
2089 else 2113 else
2090 { 2114 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2115 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2116 (nrow
2093 * scrollbar_position (ev.y) 2117 * scrollBar.position (ev.y)
2094 / scrollbar_size ())); 2118 / scrollBar.size ()));
2095 } 2119 }
2096 2120
2097 break; 2121 break;
2098 } 2122 }
2099 } 2123 }
2100 2124
2101 return; 2125 return;
2102 } 2126 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2127}
2112 2128
2113void 2129void
2114rxvt_term::button_release (XButtonEvent &ev) 2130rxvt_term::button_release (XButtonEvent &ev)
2115{ 2131{
… …
2117 2133
2118 csrO = 0; /* reset csr Offset */ 2134 csrO = 0; /* reset csr Offset */
2119 if (!bypass_keystate) 2135 if (!bypass_keystate)
2120 reportmode = !! (priv_modes & PrivMode_mouse_report); 2136 reportmode = !! (priv_modes & PrivMode_mouse_report);
2121 2137
2122 if (scrollbar_isUpDn ()) 2138 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2123 { 2139 {
2124 scrollBar.setIdle (); 2140 scrollBar.state = SB_STATE_IDLE;
2125 scrollbar_show (0); 2141 scrollBar.show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2142 }
2130 2143
2131#ifdef SELECTION_SCROLLING 2144#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2145 sel_scroll_ev.stop();
2134#endif 2146#endif
2135 2147
2136 if (ev.window == vt) 2148 if (ev.window == vt)
2137 { 2149 {
2150 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2151 return;
2152
2138#if ISO_14755 2153#if ISO_14755
2139 // 5.4 2154 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2155 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2156 return;
2142#endif 2157#endif
2158
2143 if (reportmode) 2159 if (reportmode)
2144 { 2160 {
2145 /* mouse report from vt window */ 2161 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2162 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2163 if (ev.button >= 4 && ev.button <= 7)
2148 return; 2164 return;
2149#ifdef MOUSE_REPORT_DOUBLECLICK 2165#ifdef MOUSE_REPORT_DOUBLECLICK
2150 /* only report the release of 'slow' single clicks */ 2166 /* only report the release of 'slow' single clicks */
2151 if (MEvent.button != AnyButton 2167 if (MEvent.button != AnyButton
2152 && (ev.button != MEvent.button 2168 && (ev.button != MEvent.button
2153 || (ev.time - MEvent.time 2169 || (ev.time - MEvent.time
2154 > MULTICLICK_TIME / 2))) 2170 > multiClickTime / 2)))
2155 { 2171 {
2156 MEvent.clicks = 0; 2172 MEvent.clicks = 0;
2157 MEvent.button = AnyButton; 2173 MEvent.button = ev.button;
2158 mouse_report (ev); 2174 mouse_report (ev);
2159 } 2175 }
2160#else /* MOUSE_REPORT_DOUBLECLICK */ 2176#else /* MOUSE_REPORT_DOUBLECLICK */
2177 MEvent.button = ev.button;
2178 mouse_report (ev);
2161 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2162 mouse_report (ev);
2163#endif /* MOUSE_REPORT_DOUBLECLICK */ 2180#endif /* MOUSE_REPORT_DOUBLECLICK */
2164 return; 2181 return;
2165 } 2182 }
2166 2183
2167 /* 2184 /*
2168 * dumb hack to compensate for the failure of click-and-drag 2185 * dumb hack to compensate for the failure of click-and-drag
… …
2171 if (priv_modes & PrivMode_mouse_report 2188 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2189 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2190 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2191 selection_extend (ev.x, ev.y, 0);
2175 2192
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2193 switch (ev.button)
2180 { 2194 {
2181 case Button1: 2195 case Button1:
2182 case Button3: 2196 case Button3:
2183 selection_make (ev.time); 2197 selection_make (ev.time);
2184 break; 2198 break;
2199
2185 case Button2: 2200 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2201 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2202 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2203 break;
2204
2188#ifdef MOUSE_WHEEL 2205#ifdef MOUSE_WHEEL
2189 case Button4: 2206 case Button4:
2190 case Button5: 2207 case Button5:
2191 { 2208 {
2192 int i; 2209 int lines;
2193 page_dirn v; 2210 page_dirn dirn;
2194 2211
2195 v = ev.button == Button4 ? UP : DN; 2212 dirn = ev.button == Button4 ? UP : DN;
2196 2213
2197 if (ev.state & ShiftMask) 2214 if (ev.state & ShiftMask)
2198 i = 1; 2215 lines = 1;
2199 else if (OPTION (Opt_mouseWheelScrollPage)) 2216 else if (option (Opt_mouseWheelScrollPage))
2200 i = nrow - 1; 2217 lines = nrow - 1;
2201 else 2218 else
2202 i = 5; 2219 lines = 5;
2203 2220
2204# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2205 if (ev.state & ControlMask) 2222 if (ev.state & ControlMask)
2206 { 2223 {
2207 mouse_slip_wheel_speed += v ? -1 : 1; 2224 mouse_slip_wheel_speed += dirn;
2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2225 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2210 2226
2211 if (slip_wheel_ev.at < NOW) 2227 if (!slip_wheel_ev.is_active ())
2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2228 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2213
2214 slip_wheel_ev.start ();
2215 } 2229 }
2216 else 2230 else
2231# endif
2217 { 2232 {
2218# endif
2219 scr_page (v, i); 2233 scr_page (dirn, lines);
2220 scrollbar_show (1); 2234 scrollBar.show (1);
2221# ifdef MOUSE_SLIP_WHEELING
2222 } 2235 }
2223# endif
2224 } 2236 }
2225 break; 2237 break;
2226#endif 2238#endif
2227 } 2239 }
2228 } 2240 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2241}
2234
2235#ifdef TRANSPARENT
2236#if TINTING
2237/* taken from aterm-0.4.2 */
2238
2239typedef uint32_t RUINT32T;
2240
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{
2243 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i;
2249
2250 Visual *visual = display->visual;
2251
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253
2254 /* for convenience */
2255 mask_r = visual->red_mask;
2256 mask_g = visual->green_mask;
2257 mask_b = visual->blue_mask;
2258
2259 /* boring lookup table pre-initialization */
2260 switch (srcImage->bits_per_pixel) {
2261 case 15:
2262 if ((mask_r != 0x7c00) ||
2263 (mask_g != 0x03e0) ||
2264 (mask_b != 0x001f))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2267 lookup_r = lookup;
2268 lookup_g = lookup+32;
2269 lookup_b = lookup+32+32;
2270 sh_r = 10;
2271 sh_g = 5;
2272 sh_b = 0;
2273 break;
2274 case 16:
2275 if ((mask_r != 0xf800) ||
2276 (mask_g != 0x07e0) ||
2277 (mask_b != 0x001f))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2280 lookup_r = lookup;
2281 lookup_g = lookup+32;
2282 lookup_b = lookup+32+64;
2283 sh_r = 11;
2284 sh_g = 5;
2285 sh_b = 0;
2286 break;
2287 case 24:
2288 if ((mask_r != 0xff0000) ||
2289 (mask_g != 0x00ff00) ||
2290 (mask_b != 0x0000ff))
2291 return;
2292 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2293 lookup_r = lookup;
2294 lookup_g = lookup+256;
2295 lookup_b = lookup+256+256;
2296 sh_r = 16;
2297 sh_g = 8;
2298 sh_b = 0;
2299 break;
2300 case 32:
2301 if ((mask_r != 0xff0000) ||
2302 (mask_g != 0x00ff00) ||
2303 (mask_b != 0x0000ff))
2304 return;
2305 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2306 lookup_r = lookup;
2307 lookup_g = lookup+256;
2308 lookup_b = lookup+256+256;
2309 sh_r = 16;
2310 sh_g = 8;
2311 sh_b = 0;
2312 break;
2313 default:
2314 return; /* we do not support this color depth */
2315 }
2316
2317 /* prepare limits for color transformation (each channel is handled separately) */
2318 if (shade < 0) {
2319 shade = -shade;
2320 if (shade < 0) shade = 0;
2321 if (shade > 100) shade = 100;
2322
2323 lower_lim_r = 65535-rm;
2324 lower_lim_g = 65535-gm;
2325 lower_lim_b = 65535-bm;
2326
2327 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2328 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2329 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2330
2331 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2332 } else {
2333 if (shade < 0) shade = 0;
2334 if (shade > 100) shade = 100;
2335
2336 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2337
2338 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2339 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2340 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2341 }
2342
2343 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2344 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2345 {
2346 unsigned int tmp;
2347
2348 tmp = lower_lim_r;
2349 lower_lim_r = lower_lim_b;
2350 lower_lim_b = tmp;
2351
2352 tmp = upper_lim_r;
2353 upper_lim_r = upper_lim_b;
2354 upper_lim_b = tmp;
2355 }
2356
2357 /* fill our lookup tables */
2358 for (i = 0; i <= mask_r>>sh_r; i++)
2359 {
2360 RUINT32T tmp;
2361 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2362 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2363 lookup_r[i] = (tmp/65535)<<sh_r;
2364 }
2365 for (i = 0; i <= mask_g>>sh_g; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2369 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2370 lookup_g[i] = (tmp/65535)<<sh_g;
2371 }
2372 for (i = 0; i <= mask_b>>sh_b; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2376 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2377 lookup_b[i] = (tmp/65535)<<sh_b;
2378 }
2379
2380 /* apply table to input image (replacing colors by newly calculated ones) */
2381 switch (srcImage->bits_per_pixel)
2382 {
2383 case 15:
2384 {
2385 unsigned short *p1, *pf, *p, *pl;
2386 p1 = (unsigned short *) srcImage->data;
2387 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0x7c00)>>10] |
2395 lookup_g[(*p & 0x03e0)>> 5] |
2396 lookup_b[(*p & 0x001f)];
2397 }
2398 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2399 }
2400 break;
2401 }
2402 case 16:
2403 {
2404 unsigned short *p1, *pf, *p, *pl;
2405 p1 = (unsigned short *) srcImage->data;
2406 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2407 while (p1 < pf)
2408 {
2409 p = p1;
2410 pl = p1 + srcImage->width;
2411 for (; p < pl; p++)
2412 {
2413 *p = lookup_r[(*p & 0xf800)>>11] |
2414 lookup_g[(*p & 0x07e0)>> 5] |
2415 lookup_b[(*p & 0x001f)];
2416 }
2417 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2418 }
2419 break;
2420 }
2421 case 24:
2422 {
2423 unsigned char *p1, *pf, *p, *pl;
2424 p1 = (unsigned char *) srcImage->data;
2425 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width * 3;
2430 for (; p < pl; p += 3)
2431 {
2432 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2433 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2434 p[2] = lookup_r[(p[2] & 0x0000ff)];
2435 }
2436 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2437 }
2438 break;
2439 }
2440 case 32:
2441 {
2442 RUINT32T *p1, *pf, *p, *pl;
2443 p1 = (RUINT32T *) srcImage->data;
2444 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2445
2446 while (p1 < pf)
2447 {
2448 p = p1;
2449 pl = p1 + srcImage->width;
2450 for (; p < pl; p++)
2451 {
2452 *p = lookup_r[(*p & 0xff0000)>>16] |
2453 lookup_g[(*p & 0x00ff00)>> 8] |
2454 lookup_b[(*p & 0x0000ff)] |
2455 (*p & ~0xffffff);
2456 }
2457 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2458 }
2459 break;
2460 }
2461 }
2462
2463 free (lookup);
2464}
2465#endif
2466
2467/*
2468 * Check our parents are still who we think they are.
2469 * Do transparency updates if required
2470 */
2471int
2472rxvt_term::check_our_parents ()
2473{
2474 int i, pchanged, aformat, have_pixmap, rootdepth;
2475 unsigned long nitems, bytes_after;
2476 Atom atype;
2477 unsigned char *prop = NULL;
2478 Window root, oldp, *list;
2479 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2482
2483 pchanged = 0;
2484
2485 if (!OPTION (Opt_transparent))
2486 return pchanged; /* Don't try any more */
2487
2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth;
2490
2491 XGetWindowAttributes (disp, parent[0], &wattr);
2492
2493 if (rootdepth != wattr.depth)
2494 {
2495 if (am_transparent)
2496 {
2497 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0;
2500 }
2501
2502 return pchanged; /* Don't try any more */
2503 }
2504
2505 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False);
2507
2508 /*
2509 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that.
2512 */
2513 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success);
2517
2518 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL
2525#if TINTING
2526 || !rs[Rs_color + Color_tint]
2527#endif
2528 )
2529 have_pixmap = 0;
2530 else
2531 {
2532 have_pixmap = 1;
2533 rootpixmap = *(Pixmap *)prop;
2534 XFree (prop);
2535 }
2536
2537 if (have_pixmap)
2538 {
2539 /*
2540 * Copy display->root pixmap transparency
2541 */
2542 int sx, sy, nx, ny;
2543 unsigned int nw, nh;
2544 Window cr;
2545 XImage *image;
2546 GC gc;
2547 XGCValues gcvalue;
2548
2549 XTranslateCoordinates (disp, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height;
2553 nx = ny = 0;
2554
2555 if (sx < 0)
2556 {
2557 nw += sx;
2558 nx = -sx;
2559 sx = 0;
2560 }
2561
2562 if (sy < 0)
2563 {
2564 nh += sy;
2565 ny = -sy;
2566 sy = 0;
2567 }
2568
2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
2573 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */
2578 allowedxerror = 0;
2579
2580 if (image == NULL)
2581 {
2582 if (am_transparent && am_pixmap_trans)
2583 {
2584 pchanged = 1;
2585 if (pixmap != None)
2586 {
2587 XFreePixmap (disp, pixmap);
2588 pixmap = None;
2589 }
2590 }
2591
2592 am_pixmap_trans = 0;
2593 }
2594 else
2595 {
2596 if (pixmap != None)
2597 XFreePixmap (disp, pixmap);
2598
2599#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint))
2601 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2606
2607 ShadeXImage (display, image, shade, rm, gm, bm);
2608 }
2609#endif
2610
2611 pixmap = XCreatePixmap (disp, vt,
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc);
2617 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]);
2620
2621 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1;
2623
2624 am_transparent = am_pixmap_trans = 1;
2625 }
2626 }
2627
2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2631 {
2632 unsigned int n;
2633 /*
2634 * InheritPixmap transparency
2635 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 {
2638 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root,
2640 &parent[i], &list, &n);
2641 XFree (list);
2642
2643 if (parent[i] == display->root)
2644 {
2645 if (oldp != None)
2646 pchanged = 1;
2647
2648 break;
2649 }
2650
2651 if (oldp != parent[i])
2652 pchanged = 1;
2653 }
2654
2655 n = 0;
2656
2657 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++)
2660 {
2661 XGetWindowAttributes (disp, parent[n], &wattr);
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break;
2666 }
2667 }
2668 }
2669
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2671 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */
2676 }
2677 else
2678 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++)
2685 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]);
2688 }
2689
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2691 am_transparent = 1;
2692 }
2693
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None;
2696 }
2697
2698 if (scrollBar.win)
2699 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle ();
2702 scrollbar_show (0);
2703 }
2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2710 }
2711
2712 return pchanged;
2713}
2714#endif
2715 2242
2716/*}}} */ 2243/*}}} */
2717 2244
2718bool 2245void ecb_hot
2719rxvt_term::cmd_parse () 2246rxvt_term::cmd_parse ()
2720{ 2247{
2721 bool flag = false;
2722 wchar_t ch = NOCHAR; 2248 wchar_t ch = NOCHAR;
2723 char *seq_begin; // remember start of esc-sequence here 2249 char *seq_begin; // remember start of esc-sequence here
2724 2250
2725 for (;;) 2251 for (;;)
2726 { 2252 {
2727 if (ch == NOCHAR) 2253 if (ecb_unlikely (ch == NOCHAR))
2728 { 2254 {
2729 seq_begin = cmdbuf_ptr; 2255 seq_begin = cmdbuf_ptr;
2730 ch = next_char (); 2256 ch = next_char ();
2731 2257
2732 if (ch == NOCHAR) 2258 if (ch == NOCHAR)
2733 break; 2259 break;
2734 } 2260 }
2735 2261
2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2262 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2737 { 2263 {
2738 if (!seen_input) 2264 if (ecb_unlikely (!seen_input))
2739 { 2265 {
2740 seen_input = 1; 2266 seen_input = 1;
2741 // many badly-written programs (e.g. jed) contain a race condition: 2267 // many badly-written programs (e.g. jed) contain a race condition:
2742 // they first read the screensize and then install a SIGWINCH handler. 2268 // they first read the screensize and then install a SIGWINCH handler.
2743 // some window managers resize the window early, and these programs 2269 // some window managers resize the window early, and these programs
… …
2756 wchar_t *str = buf; 2282 wchar_t *str = buf;
2757 wchar_t *eol = str + min (ncol, UBUFSIZ); 2283 wchar_t *eol = str + min (ncol, UBUFSIZ);
2758 2284
2759 for (;;) 2285 for (;;)
2760 { 2286 {
2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2287 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2762 break; 2288 break;
2763 2289
2764 *str++ = ch; 2290 *str++ = ch;
2765 2291
2766 if (ch == C0_LF || str >= eol) 2292 if (ecb_unlikely (ch == C0_LF || str >= eol))
2767 { 2293 {
2768 if (ch == C0_LF) 2294 if (ch == C0_LF)
2769 nlines++; 2295 nlines++;
2770 2296
2771 refresh_count++; 2297 refresh_count++;
2772 2298
2773 if (!OPTION (Opt_jumpScroll) 2299 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2775 { 2300 {
2776 refreshnow = true;
2777 refresh_count = 0; 2301 refresh_count = 0;
2302
2303 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2304 {
2305 refreshnow = true;
2778 ch = NOCHAR; 2306 ch = NOCHAR;
2779 break; 2307 break;
2308 }
2780 } 2309 }
2781 2310
2782 // scr_add_lines only works for nlines <= nrow - 1. 2311 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2312 if (nlines >= nrow - 1)
2784 { 2313 {
… …
2812 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2341 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2813 scr_add_lines (buf, str - buf, nlines); 2342 scr_add_lines (buf, str - buf, nlines);
2814 2343
2815 /* 2344 /*
2816 * If there have been a lot of new lines, then update the screen 2345 * If there have been a lot of new lines, then update the screen
2817 * What the heck I'll cheat and only refresh less than every page-full. 2346 * What the heck we'll cheat and only refresh less than every page-full.
2818 * the number of pages between refreshes is refresh_limit, which 2347 * if skipScroll is enabled.
2819 * is incremented here because we must be doing flat-out scrolling.
2820 */ 2348 */
2821 if (refreshnow) 2349 if (refreshnow)
2822 { 2350 {
2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824 refresh_limit++;
2825 else
2826 {
2827 flag = true;
2828 scr_refresh (refresh_type); 2351 scr_refresh ();
2829 want_refresh = 1; 2352 want_refresh = 1;
2830 }
2831 } 2353 }
2832
2833 } 2354 }
2834 else 2355 else
2835 { 2356 {
2836 try 2357 try
2837 { 2358 {
… …
2845 } 2366 }
2846 2367
2847 ch = NOCHAR; 2368 ch = NOCHAR;
2848 } 2369 }
2849 } 2370 }
2850
2851 return flag;
2852} 2371}
2853 2372
2854// read the next character 2373// read the next character
2855wchar_t 2374wchar_t ecb_hot
2856rxvt_term::next_char () 2375rxvt_term::next_char () noexcept
2857{ 2376{
2858 while (cmdbuf_ptr < cmdbuf_endp) 2377 while (cmdbuf_ptr < cmdbuf_endp)
2859 { 2378 {
2860 // assume 7-bit to be ascii ALWAYS 2379 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2380 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2862 return *cmdbuf_ptr++; 2381 return *cmdbuf_ptr++;
2863 2382
2864 wchar_t wc; 2383 wchar_t wc;
2865 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2384 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2866 2385
… …
2870 cmdbuf_ptr = cmdbuf_endp; 2389 cmdbuf_ptr = cmdbuf_endp;
2871 break; 2390 break;
2872 } 2391 }
2873 2392
2874 if (len == (size_t)-1) 2393 if (len == (size_t)-1)
2394 {
2395 mbstate.reset (); // reset now undefined conversion state
2396 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2397 // in which case we "erroneously" return the next byte which might be valid.
2875 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2398 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 }
2876 2400
2877 // assume wchar == unicode 2401 // assume wchar == unicode
2878 cmdbuf_ptr += len; 2402 cmdbuf_ptr += len;
2879 return wc & UNICODE_MASK; 2403 return wc & UNICODE_MASK;
2880 } 2404 }
2881 2405
2882 return NOCHAR; 2406 return NOCHAR;
2883} 2407}
2884 2408
2885// read the next octet 2409// read the next octet
2886uint32_t 2410uint32_t ecb_hot
2887rxvt_term::next_octet () 2411rxvt_term::next_octet () noexcept
2888{ 2412{
2889 return cmdbuf_ptr < cmdbuf_endp 2413 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++ 2414 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR; 2415 : NOCHAR;
2892} 2416}
2893 2417
2894/* rxvt_cmd_getc () - Return next input character */ 2418static class out_of_input out_of_input;
2895/* 2419
2896 * Return the next input character after first passing any keyboard input 2420wchar_t ecb_hot
2897 * to the command.
2898 */
2899wchar_t
2900rxvt_term::cmd_getc () 2421rxvt_term::cmd_getc ()
2901{ 2422{
2902 wchar_t c = next_char (); 2423 wchar_t c = next_char ();
2903 2424
2904 if (c == NOCHAR) 2425 if (c == NOCHAR)
2905 throw out_of_input; 2426 throw out_of_input;
2906 2427
2907 return c; 2428 return c;
2908} 2429}
2909 2430
2910uint32_t 2431uint32_t ecb_hot
2911rxvt_term::cmd_get8 () 2432rxvt_term::cmd_get8 ()
2912{ 2433{
2913 uint32_t c = next_octet (); 2434 uint32_t c = next_octet ();
2914 2435
2915 if (c == NOCHAR) 2436 if (c == NOCHAR)
… …
2919} 2440}
2920 2441
2921/*{{{ print pipe */ 2442/*{{{ print pipe */
2922/*----------------------------------------------------------------------*/ 2443/*----------------------------------------------------------------------*/
2923#ifdef PRINTPIPE 2444#ifdef PRINTPIPE
2924FILE * 2445FILE * ecb_cold
2925rxvt_term::popen_printer () 2446rxvt_term::popen_printer ()
2926{ 2447{
2927 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2448 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2928 2449
2929 if (stream == NULL) 2450 if (stream == NULL)
2930 rxvt_warn ("can't open printer pipe, not printing.\n"); 2451 rxvt_warn ("can't open printer pipe, not printing.\n");
2931 2452
2932 return stream; 2453 return stream;
2933} 2454}
2934 2455
2935int 2456int ecb_cold
2936rxvt_term::pclose_printer (FILE *stream) 2457rxvt_term::pclose_printer (FILE *stream)
2937{ 2458{
2938 fflush (stream); 2459 fflush (stream);
2939 return pclose (stream); 2460 return pclose (stream);
2940} 2461}
2941 2462
2942/* 2463/*
2943 * simulate attached vt100 printer 2464 * simulate attached vt100 printer
2944 */ 2465 */
2945void 2466void ecb_cold
2946rxvt_term::process_print_pipe () 2467rxvt_term::process_print_pipe ()
2947{ 2468{
2948 int done; 2469 FILE *fd = popen_printer ();
2949 FILE *fd;
2950 2470
2951 if ((fd = popen_printer ()) == NULL) 2471 if (!fd)
2952 return; 2472 return;
2953 2473
2954 /* 2474 /*
2955 * Send all input to the printer until either ESC[4i or ESC[?4i 2475 * Send all input to the printer until either ESC[4i or ESC[?4i
2956 * is received. 2476 * is received.
2957 */ 2477 */
2958 for (done = 0; !done;) 2478 for (int done = 0; !done; )
2959 { 2479 {
2960 unsigned char buf[8]; 2480 unsigned char buf[8];
2961 unicode_t ch; 2481 unicode_t ch;
2962 unsigned int i, len; 2482 unsigned int i, len;
2963 2483
… …
2982 { 2502 {
2983 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2984 break; /* done = 1 */ 2504 break; /* done = 1 */
2985 } 2505 }
2986 } 2506 }
2987 2507
2988 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2989 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2990 { 2510 {
2991 done = 1; 2511 done = 1;
2992 break; 2512 break;
… …
2994 } 2514 }
2995 } 2515 }
2996 2516
2997 pclose_printer (fd); 2517 pclose_printer (fd);
2998} 2518}
2999#endif /* PRINTPIPE */ 2519#endif /* PRINTPIPE */
3000/*}}} */ 2520/*}}} */
3001 2521
3002/* *INDENT-OFF* */
3003enum { 2522enum {
3004 C1_40 = 0x40, 2523 C1_40 = 0x40,
3005 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2524 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
3006 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2525 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
3007 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2526 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
3008 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2527 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
3009}; 2528};
3010/* *INDENT-ON* */
3011 2529
3012/*{{{ process non-printing single characters */ 2530/*{{{ process non-printing single characters */
3013void 2531void ecb_hot
3014rxvt_term::process_nonprinting (unicode_t ch) 2532rxvt_term::process_nonprinting (unicode_t ch)
3015{ 2533{
3016 switch (ch) 2534 switch (ch)
3017 { 2535 {
3018 case C0_ESC: 2536 case C0_ESC:
… …
3048 scr_charset_choose (0); 2566 scr_charset_choose (0);
3049 break; 2567 break;
3050 2568
3051#ifdef EIGHT_BIT_CONTROLS 2569#ifdef EIGHT_BIT_CONTROLS
3052 // 8-bit controls 2570 // 8-bit controls
3053 case 0x90: /* DCS */ 2571 case 0x90: /* DCS */
3054 process_dcs_seq (); 2572 process_dcs_seq ();
3055 break; 2573 break;
3056 case 0x9b: /* CSI */ 2574 case 0x9b: /* CSI */
3057 process_csi_seq (); 2575 process_csi_seq ();
3058 break; 2576 break;
3059 case 0x9d: /* CSI */ 2577 case 0x9d: /* OSC */
3060 process_osc_seq (); 2578 process_osc_seq ();
3061 break; 2579 break;
3062#endif 2580#endif
3063 } 2581 }
3064} 2582}
3065/*}}} */ 2583/*}}} */
3066 2584
3067 2585
3068/*{{{ process VT52 escape sequences */ 2586/*{{{ process VT52 escape sequences */
3069void 2587void ecb_cold
3070rxvt_term::process_escape_vt52 (unicode_t ch) 2588rxvt_term::process_escape_vt52 (unicode_t ch)
3071{ 2589{
3072 int row, col; 2590 int row, col;
3073 2591
3074 switch (ch) 2592 switch (ch)
… …
3108 break; 2626 break;
3109 case 'Z': /* identify the terminal type */ 2627 case 'Z': /* identify the terminal type */
3110 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2628 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3111 break; 2629 break;
3112 case '<': /* turn off VT52 mode */ 2630 case '<': /* turn off VT52 mode */
3113 PrivMode (0, PrivMode_vt52); 2631 priv_modes &= ~PrivMode_vt52;
3114 break; 2632 break;
3115 case 'F': /* use special graphics character set */ 2633 case 'F': /* use special graphics character set */
3116 case 'G': /* use regular character set */ 2634 case 'G': /* use regular character set */
3117 /* unimplemented */ 2635 /* unimplemented */
3118 break; 2636 break;
… …
3124} 2642}
3125/*}}} */ 2643/*}}} */
3126 2644
3127 2645
3128/*{{{ process escape sequences */ 2646/*{{{ process escape sequences */
3129void 2647void ecb_hot
3130rxvt_term::process_escape_seq () 2648rxvt_term::process_escape_seq ()
3131{ 2649{
3132 unicode_t ch = cmd_getc (); 2650 unicode_t ch = cmd_getc ();
3133 2651
3134 if (priv_modes & PrivMode_vt52) 2652 if (priv_modes & PrivMode_vt52)
… …
3137 return; 2655 return;
3138 } 2656 }
3139 2657
3140 switch (ch) 2658 switch (ch)
3141 { 2659 {
3142 /* case 1: do_tek_mode (); break; */
3143 case '#': 2660 case '#':
3144 if (cmd_getc () == '8') 2661 if (cmd_getc () == '8')
3145 scr_E (); 2662 scr_E ();
3146 break; 2663 break;
3147 case '(': 2664 case '(':
… …
3154 scr_charset_set (2, (unsigned int)cmd_getc ()); 2671 scr_charset_set (2, (unsigned int)cmd_getc ());
3155 break; 2672 break;
3156 case '+': 2673 case '+':
3157 scr_charset_set (3, (unsigned int)cmd_getc ()); 2674 scr_charset_set (3, (unsigned int)cmd_getc ());
3158 break; 2675 break;
3159#if ENABLE_FRILLS 2676#if !ENABLE_MINIMAL
3160 case '6': 2677 case '6':
3161 scr_backindex (); 2678 scr_backindex ();
3162 break; 2679 break;
3163#endif 2680#endif
3164 case '7': 2681 case '7':
3165 scr_cursor (SAVE); 2682 scr_cursor (SAVE);
3166 break; 2683 break;
3167 case '8': 2684 case '8':
3168 scr_cursor (RESTORE); 2685 scr_cursor (RESTORE);
3169 break; 2686 break;
3170#if ENABLE_FRILLS 2687#if !ENABLE_MINIMAL
3171 case '9': 2688 case '9':
3172 scr_forwardindex (); 2689 scr_forwardindex ();
3173 break; 2690 break;
3174#endif 2691#endif
2692 // DECPAM/DECPNM
3175 case '=': 2693 case '=':
2694 priv_modes |= PrivMode_aplKP;
2695 break;
3176 case '>': 2696 case '>':
3177 PrivMode ((ch == '='), PrivMode_aplKP); 2697 priv_modes &= ~PrivMode_aplKP;
3178 break; 2698 break;
3179 2699
3180 case C1_40: 2700 case C1_40:
3181 cmd_getc (); 2701 cmd_getc ();
3182 break; 2702 break;
… …
3186 2706
3187 /* 8.3.87: NEXT LINE */ 2707 /* 8.3.87: NEXT LINE */
3188 case C1_NEL: /* ESC E */ 2708 case C1_NEL: /* ESC E */
3189 { 2709 {
3190 wchar_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
3191 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2711 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3192 } 2712 }
3193 break; 2713 break;
3194 2714
2715#if 0 // disabled because embedded newlines can make exploits easier
3195 /* kidnapped escape sequence: Should be 8.3.48 */ 2716 /* kidnapped escape sequence: Should be 8.3.48 */
3196 case C1_ESA: /* ESC G */ 2717 case C1_ESA: /* ESC G */
3197 process_graphics (); 2718 // used by original rxvt for rob nations own graphics mode
2719 if (cmd_getc () == 'Q' && option (Opt_insecure))
2720 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3198 break; 2721 break;
2722#endif
3199 2723
3200 /* 8.3.63: CHARACTER TABULATION SET */ 2724 /* 8.3.63: CHARACTER TABULATION SET */
3201 case C1_HTS: /* ESC H */ 2725 case C1_HTS: /* ESC H */
3202 scr_set_tab (1); 2726 scr_set_tab (1);
3203 break; 2727 break;
… …
3206 case C1_RI: /* ESC M */ 2730 case C1_RI: /* ESC M */
3207 scr_index (DN); 2731 scr_index (DN);
3208 break; 2732 break;
3209 2733
3210 /* 8.3.142: SINGLE-SHIFT TWO */ 2734 /* 8.3.142: SINGLE-SHIFT TWO */
3211 /*case C1_SS2: scr_single_shift (2); break; */ 2735 /* case C1_SS2: break; */
3212 2736
3213 /* 8.3.143: SINGLE-SHIFT THREE */ 2737 /* 8.3.143: SINGLE-SHIFT THREE */
3214 /*case C1_SS3: scr_single_shift (3); break; */ 2738 /* case C1_SS3: break; */
3215 2739
3216 /* 8.3.27: DEVICE CONTROL STRING */ 2740 /* 8.3.27: DEVICE CONTROL STRING */
3217 case C1_DCS: /* ESC P */ 2741 case C1_DCS: /* ESC P */
3218 process_dcs_seq (); 2742 process_dcs_seq ();
3219 break; 2743 break;
… …
3221 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2745 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3222 case C1_SCI: /* ESC Z */ 2746 case C1_SCI: /* ESC Z */
3223 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2747 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3224 break; /* steal obsolete ESC [ c */ 2748 break; /* steal obsolete ESC [ c */
3225 2749
3226 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2750 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3227 case C1_CSI: /* ESC [ */ 2751 case C1_CSI: /* ESC [ */
3228 process_csi_seq (); 2752 process_csi_seq ();
3229 break; 2753 break;
3230 2754
3231 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2755 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3232 case C1_OSC: /* ESC ] */ 2756 case C1_OSC: /* ESC ] */
3233 process_osc_seq (); 2757 process_osc_seq ();
3234 break; 2758 break;
3235 2759
3236 /* 8.3.106: RESET TO INITIAL STATE */ 2760 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3237 case 'c': 2761 case 'c':
3238 mbstate.reset (); 2762 mbstate.reset ();
3239 scr_poweron (); 2763 scr_poweron ();
3240 scrollbar_show (1); 2764 scrollBar.show (1);
3241 break; 2765 break;
3242 2766
3243 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2767 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3244 case 'n': 2768 case 'n':
3245 scr_charset_choose (2); 2769 scr_charset_choose (2);
… …
3252 } 2776 }
3253} 2777}
3254/*}}} */ 2778/*}}} */
3255 2779
3256/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2780/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3257/* *INDENT-OFF* */
3258enum { 2781enum {
3259 CSI_ICH = 0x40, 2782 CSI_ICH = 0x40,
3260 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2783 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3261 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2784 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3262 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2785 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3265 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2788 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3266 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2789 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3267 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2790 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3268}; 2791};
3269 2792
3270#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2793#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3271 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2794 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3272 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2795 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3273#define get_byte_array_bit(array, bit) \ 2796#define get_byte_array_bit(array, bit) \
3274 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2797 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3275 2798
3276const unsigned char csi_defaults[] = 2799static const unsigned char csi_defaults[] =
3277 { 2800 {
3278 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2801 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3279 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2802 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3280 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2803 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3281 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2804 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3282 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2805 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3283 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2806 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3284 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2807 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3285 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2808 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3286 }; 2809 };
3287/* *INDENT-ON* */
3288 2810
3289void 2811void ecb_hot
3290rxvt_term::process_csi_seq () 2812rxvt_term::process_csi_seq ()
3291{ 2813{
3292 unicode_t ch, priv, i; 2814 unicode_t ch, priv, prev_ch, i;
3293 unsigned int nargs, p; 2815 unsigned int nargs, p;
3294 int n, ndef; 2816 int n, ndef;
3295 int arg[ESC_ARGS]; 2817 int arg[ESC_ARGS] = { };
3296 2818
3297 for (nargs = ESC_ARGS; nargs > 0;) 2819 nargs = 0;
3298 arg[--nargs] = 0;
3299 2820
3300 priv = 0; 2821 priv = 0;
3301 ch = cmd_getc (); 2822 ch = cmd_getc ();
3302 if (ch >= '<' && ch <= '?') 2823 if ((ch >= '<' && ch <= '?') || ch == '!')
2824 {
3303 { /* '<' '=' '>' '?' */ 2825 /* '<' '=' '>' '?' '!' */
3304 priv = ch; 2826 priv = ch;
3305 ch = cmd_getc (); 2827 ch = cmd_getc ();
3306 } 2828 }
3307 2829
2830 prev_ch = 0;
3308 /* read any numerical arguments */ 2831 /* read any numerical arguments */
3309 for (n = -1; ch < CSI_ICH; ) 2832 for (n = -1; ch < CSI_ICH; )
3310 { 2833 {
3311 if (isdigit (ch)) 2834 if (isdigit (ch))
3312 { 2835 {
… …
3322 n = -1; 2845 n = -1;
3323 } 2846 }
3324 else if (IS_CONTROL (ch)) 2847 else if (IS_CONTROL (ch))
3325 process_nonprinting (ch); 2848 process_nonprinting (ch);
3326 2849
2850 prev_ch = ch;
3327 ch = cmd_getc (); 2851 ch = cmd_getc ();
3328 } 2852 }
3329 2853
3330 if (ch > CSI_7F) 2854 if (ch > CSI_7F)
3331 return; 2855 return;
… …
3337 ndef = get_byte_array_bit (csi_defaults, i); 2861 ndef = get_byte_array_bit (csi_defaults, i);
3338 for (p = 0; p < nargs; p++) 2862 for (p = 0; p < nargs; p++)
3339 if (arg[p] == -1) 2863 if (arg[p] == -1)
3340 arg[p] = ndef; 2864 arg[p] = ndef;
3341 2865
3342#ifdef DEBUG_CMD
3343 fprintf (stderr, "CSI ");
3344 for (p = 0; p < nargs; p++)
3345 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3346 fprintf (stderr, "%c\n", ch);
3347#endif
3348
3349 /* 2866 /*
3350 * private mode handling 2867 * private mode handling
3351 */ 2868 */
3352 if (priv) 2869 if (priv)
3353 { 2870 {
3354 switch (priv) 2871 switch (priv)
3355 { 2872 {
3356 case '>': 2873 case '>':
3357 if (ch == CSI_DA) /* secondary device attributes */ 2874 if (ch == CSI_DA) /* secondary device attributes */
3358 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2875 {
2876 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2877 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2878 //
2879 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2880 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2881 // versions.
2882 //
2883 tt_printf ("\033[>%d;95;0c", 'U');
2884 }
3359 break; 2885 break;
2886
3360 case '?': 2887 case '?':
3361 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2888 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3362 process_terminal_mode (ch, priv, nargs, arg); 2889 process_terminal_mode (ch, priv, nargs, arg);
2890 if (prev_ch == '$' && ch == 'p')
2891 process_terminal_mode (ch, priv, nargs, arg);
3363 break; 2892 break;
2893
2894 case '!':
2895 if (ch == CSI_70)
2896 {
2897 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2898 scr_soft_reset ();
2899
2900 static const int pm_h[] = { 7, 25 };
2901 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2902
2903 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2904 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3364 } 2905 }
2906 break;
2907 }
2908
3365 return; 2909 return;
3366 } 2910 }
3367 2911
3368 switch (ch) 2912 switch (ch)
3369 { 2913 {
… …
3383 } 2927 }
3384 break; 2928 break;
3385#endif 2929#endif
3386 2930
3387 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2931 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3388 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2932 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3389 arg[0] = -arg[0]; 2933 arg[0] = -arg[0];
3390 /* FALLTHROUGH */ 2934 /* FALLTHROUGH */
3391 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2935 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3392 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2936 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3393 scr_gotorc (arg[0], 0, RELATIVE); 2937 scr_gotorc (arg[0], 0, RELATIVE);
3394 break; 2938 break;
3395 2939
3396 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2940 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3397 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2941 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3398#ifdef ISO6429 2942#ifdef ISO6429
3399 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
3400#else /* emulate common DEC VTs */ 2944#else /* emulate common DEC VTs */
3401 arg[0] = arg[0] ? -arg[0] : -1; 2945 arg[0] = arg[0] ? -arg[0] : -1;
3402#endif 2946#endif
… …
3489 break; 3033 break;
3490 case 6: /* CPR requested */ 3034 case 6: /* CPR requested */
3491 scr_report_position (); 3035 scr_report_position ();
3492 break; 3036 break;
3493 case 7: /* unofficial extension */ 3037 case 7: /* unofficial extension */
3494 if (OPTION (Opt_insecure)) 3038 if (option (Opt_insecure))
3495 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3039 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3496 break; 3040 break;
3497 case 8: /* unofficial extension */ 3041 case 8: /* unofficial extension */
3042 {
3043 string_term st;
3044 st.v[0] = CHAR_ST;
3045 st.v[1] = '\0';
3498 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3046 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3499 break; 3047 break;
3048 }
3500 } 3049 }
3501 break; 3050 break;
3502 3051
3503 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3052 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3504 switch (arg[0]) 3053 switch (arg[0])
… …
3547 scr_insert_mode (1); 3096 scr_insert_mode (1);
3548 else if (arg[0] == 20) 3097 else if (arg[0] == 20)
3549 priv_modes |= PrivMode_LFNL; 3098 priv_modes |= PrivMode_LFNL;
3550 break; 3099 break;
3551 3100
3101 case CSI_71: // DECSCUSR: set cursor style
3102 if (prev_ch == ' ')
3103 set_cursor_style (arg[0]);
3104 break;
3105
3552 /* 3106 /*
3553 * PRIVATE USE beyond this point. All CSI_7? sequences here 3107 * PRIVATE USE beyond this point. All CSI_7? sequences here
3554 */ 3108 */
3555 case CSI_72: /* DECSTBM: set top and bottom margins */ 3109 case CSI_72: /* DECSTBM: set top and bottom margins */
3556 if (nargs == 1) 3110 if (nargs == 1)
… …
3566 break; 3120 break;
3567 case CSI_75: 3121 case CSI_75:
3568 scr_cursor (RESTORE); 3122 scr_cursor (RESTORE);
3569 break; 3123 break;
3570 3124
3571#if ENABLE_FRILLS 3125#if !ENABLE_MINIMAL
3572 case CSI_74: 3126 case CSI_74:
3573 process_window_ops (arg, nargs); 3127 process_window_ops (arg, nargs);
3574 break; 3128 break;
3575#endif 3129#endif
3576 3130
… …
3583 break; 3137 break;
3584 } 3138 }
3585} 3139}
3586/*}}} */ 3140/*}}} */
3587 3141
3588#if ENABLE_FRILLS 3142#if !ENABLE_MINIMAL
3589/* ARGSUSED */
3590void 3143void
3591rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3144rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592{ 3145{
3593 int x, y; 3146 int x, y;
3594 XWindowAttributes wattr; 3147 XWindowAttributes wattr;
3595 Window wdummy; 3148 Window wdummy;
3596 dDisp; 3149
3150 dLocal (Display *, dpy);
3597 3151
3598 if (nargs == 0) 3152 if (nargs == 0)
3599 return; 3153 return;
3600 3154
3601 switch (args[0]) 3155 switch (args[0])
3602 { 3156 {
3603 /* 3157 /*
3604 * commands 3158 * commands
3605 */ 3159 */
3606 case 1: /* deiconify window */ 3160 case 1: /* deiconify window */
3607 XMapWindow (disp, parent[0]); 3161 XMapWindow (dpy, parent);
3608 break; 3162 break;
3609 case 2: /* iconify window */ 3163 case 2: /* iconify window */
3610 XIconifyWindow (disp, parent[0], display->screen); 3164 XIconifyWindow (dpy, parent, display->screen);
3611 break; 3165 break;
3612 case 3: /* set position (pixels) */ 3166 case 3: /* set position (pixels) */
3613 XMoveWindow (disp, parent[0], args[1], args[2]); 3167 XMoveWindow (dpy, parent, args[1], args[2]);
3614 break; 3168 break;
3615 case 4: /* set size (pixels) */ 3169 case 4: /* set size (pixels) */
3616 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3170 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617 break; 3171 break;
3618 case 5: /* raise window */ 3172 case 5: /* raise window */
3619 XRaiseWindow (disp, parent[0]); 3173 XRaiseWindow (dpy, parent);
3620 break; 3174 break;
3621 case 6: /* lower window */ 3175 case 6: /* lower window */
3622 XLowerWindow (disp, parent[0]); 3176 XLowerWindow (dpy, parent);
3623 break; 3177 break;
3624 case 7: /* refresh window */ 3178 case 7: /* refresh window */
3625 scr_touch (true); 3179 scr_touch (true);
3626 break; 3180 break;
3627 case 8: /* set size (chars) */ 3181 case 8: /* set size (chars) */
… …
3630 break; 3184 break;
3631 3185
3632 //case 9: NYI, TODO, restore maximized window or maximize window 3186 //case 9: NYI, TODO, restore maximized window or maximize window
3633 default: 3187 default:
3634 if (args[0] >= 24) /* set height (chars) */ 3188 if (args[0] >= 24) /* set height (chars) */
3635 set_widthheight ((unsigned int)width, 3189 set_widthheight ((unsigned int)vt_width,
3636 (unsigned int) (args[1] * fheight)); 3190 (unsigned int) (args[1] * fheight));
3637 break; 3191 break;
3638
3639 3192
3640 /* 3193 /*
3641 * reports - some output format copied from XTerm 3194 * reports - some output format copied from XTerm
3642 */ 3195 */
3643 case 11: /* report window state */ 3196 case 11: /* report window state */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3197 XGetWindowAttributes (dpy, parent, &wattr);
3645 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3198 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646 break; 3199 break;
3647 case 13: /* report window position */ 3200 case 13: /* report window position */
3648 XGetWindowAttributes (disp, parent[0], &wattr); 3201 XGetWindowAttributes (dpy, parent, &wattr);
3649 XTranslateCoordinates (disp, parent[0], wattr.root, 3202 XTranslateCoordinates (dpy, parent, wattr.root,
3650 -wattr.border_width, -wattr.border_width, 3203 -wattr.border_width, -wattr.border_width,
3651 &x, &y, &wdummy); 3204 &x, &y, &wdummy);
3652 tt_printf ("\033[3;%d;%dt", x, y); 3205 tt_printf ("\033[3;%d;%dt", x, y);
3653 break; 3206 break;
3654 case 14: /* report window size (pixels) */ 3207 case 14: /* report window size (pixels) */
3655 XGetWindowAttributes (disp, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3656 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3209 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657 break; 3210 break;
3658 case 18: /* report text area size (chars) */ 3211 case 18: /* report text area size (chars) */
3659 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3212 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660 break; 3213 break;
… …
3662 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3215 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663 break; 3216 break;
3664 case 20: /* report icon label */ 3217 case 20: /* report icon label */
3665 { 3218 {
3666 char *s; 3219 char *s;
3667 XGetIconName (disp, parent[0], &s); 3220 XGetIconName (dpy, parent, &s);
3668 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3221 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3669 XFree (s); 3222 XFree (s);
3670 } 3223 }
3671 break; 3224 break;
3672 case 21: /* report window title */ 3225 case 21: /* report window title */
3673 { 3226 {
3674 char *s; 3227 char *s;
3675 XFetchName (disp, parent[0], &s); 3228 XFetchName (dpy, parent, &s);
3676 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3229 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677 XFree (s); 3230 XFree (s);
3678 } 3231 }
3679 break; 3232 break;
3680 } 3233 }
3681} 3234}
… …
3685/* 3238/*
3686 * get input up until STRING TERMINATOR (or BEL) 3239 * get input up until STRING TERMINATOR (or BEL)
3687 * ends_how is terminator used. returned input must be free()'d 3240 * ends_how is terminator used. returned input must be free()'d
3688 */ 3241 */
3689char * 3242char *
3690rxvt_term::get_to_st (unicode_t &ends_how) 3243rxvt_term::get_to_st (string_term &st)
3691{ 3244{
3692 unicode_t ch; 3245 unicode_t ch;
3693 bool seen_esc = false; 3246 bool seen_esc = false;
3694 unsigned int n = 0; 3247 unsigned int n = 0;
3695 wchar_t string[STRING_MAX]; 3248 wchar_t string[CBUFSIZ];
3696 3249
3697 while ((ch = cmd_getc ()) != NOCHAR) 3250 while ((ch = cmd_getc ()) != NOCHAR)
3698 { 3251 {
3699 if (seen_esc) 3252 if (seen_esc)
3700 { 3253 {
… …
3708 seen_esc = true; 3261 seen_esc = true;
3709 continue; 3262 continue;
3710 } 3263 }
3711 else if (ch == C0_BEL || ch == CHAR_ST) 3264 else if (ch == C0_BEL || ch == CHAR_ST)
3712 break; 3265 break;
3266 else if (ch == C0_SYN)
3267 ch = cmd_get8 ();
3713 else if (ch < 0x20) 3268 else if (ch < 0x20)
3714 return NULL; /* other control character - exit */ 3269 return NULL; /* other control character - exit */
3715 3270
3716 seen_esc = false; 3271 seen_esc = false;
3717 3272
3718 if (n >= STRING_MAX - 1) 3273 if (n >= sizeof (string) - 1)
3719 // stop at some sane length 3274 // stop at some sane length
3720 return NULL; 3275 return NULL;
3721 3276
3722 if (ch == C0_SYN)
3723 string[n++] = cmd_get8 ();
3724 else
3725 string[n++] = ch; 3277 string[n++] = ch;
3726 } 3278 }
3727 3279
3728 string[n++] = '\0'; 3280 string[n++] = '\0';
3729 3281
3730 ends_how = (ch == 0x5c ? C0_ESC : ch); 3282 n = 0;
3283 if (ch == 0x5c)
3284 st.v[n++] = C0_ESC;
3285 st.v[n++] = ch;
3286 st.v[n] = '\0';
3731 3287
3732 return rxvt_wcstombs (string); 3288 return rxvt_wcstombs (string);
3733} 3289}
3734 3290
3735/*----------------------------------------------------------------------*/ 3291/*----------------------------------------------------------------------*/
… …
3737 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3293 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3738 */ 3294 */
3739void 3295void
3740rxvt_term::process_dcs_seq () 3296rxvt_term::process_dcs_seq ()
3741{ 3297{
3742 char *s;
3743 unicode_t eh;
3744
3745 /* 3298 /*
3746 * Not handled yet 3299 * Not handled yet
3747 */ 3300 */
3301
3302 string_term st;
3748 s = get_to_st (eh); 3303 char *s = get_to_st (st);
3749 if (s) 3304 if (s)
3750 free (s); 3305 free (s);
3751 3306
3752 return; 3307 return;
3753} 3308}
… …
3757 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3312 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3758 */ 3313 */
3759void 3314void
3760rxvt_term::process_osc_seq () 3315rxvt_term::process_osc_seq ()
3761{ 3316{
3762 unicode_t ch, eh;
3763 int arg; 3317 int arg;
3764 3318
3765 ch = cmd_getc (); 3319 unicode_t ch = cmd_getc ();
3766 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3320 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3767 arg = arg * 10 + (ch - '0'); 3321 arg = arg * 10 + (ch - '0');
3768 3322
3769 if (ch == ';') 3323 if (ch == ';')
3770 { 3324 {
3325 string_term st;
3771 char *s = get_to_st (eh); 3326 char *s = get_to_st (st);
3772 3327
3773 if (s) 3328 if (s)
3774 { 3329 {
3775 process_xterm_seq (arg, s, eh); 3330 process_xterm_seq (arg, s, st);
3776 free (s); 3331 free (s);
3777 } 3332 }
3778 } 3333 }
3779} 3334}
3780 3335
3336static unsigned int
3337colorcube_index (unsigned int idx_r,
3338 unsigned int idx_g,
3339 unsigned int idx_b)
3340{
3341 assert (idx_r < Red_levels);
3342 assert (idx_g < Green_levels);
3343 assert (idx_b < Blue_levels);
3344
3345 return idx_r * Blue_levels * Green_levels +
3346 idx_g * Blue_levels +
3347 idx_b;
3348}
3349
3350/*
3351 * Find the nearest color slot in the hidden color cube,
3352 * adapt its value to the 32bit RGBA color.
3353 */
3354unsigned int
3355rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3356{
3357 r &= 0xff;
3358 g &= 0xff;
3359 b &= 0xff;
3360 a &= 0xff;
3361
3362 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3363
3364 /* we allow one of the 6 closest neighbouring colours */
3365 /* to replace the current color, if they not used recently */
3366 #if 0
3367 static const unsigned char dxyz[][3] = {
3368 0, 0, 0,
3369 0, 0, 4,
3370 0, 4, 4,
3371 4, 4, 0,
3372 4, 0, 4,
3373 0, 4, 0,
3374 4, 0, 0,
3375 };
3376 #else
3377 // silly compressed verlapping triplets version of above
3378 static const unsigned char dxyz[] = {
3379 0, 0, 0, 4, 4, 0, 4, 0, 0,
3380 };
3381 #endif
3382
3383 static const unsigned char color_level[8][32] = {
3384 // neighbour index
3385 {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},
3386 {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},
3387 {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},
3388 {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},
3389 // Red_levels/Green_levels/Blue_levels index
3390 {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},
3391 {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},
3392 {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},
3393 {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},
3394 };
3395
3396 unsigned int idx;
3397
3398 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3399 {
3400 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3401 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3402 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3403 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3404
3405 if (n == 0)
3406 idx = index;
3407
3408 if (rgb24_color[index] == color)
3409 {
3410 rgb24_seqno[index] = ++rgb24_sequence;
3411 return index + minTermCOLOR24;
3412 }
3413
3414 // minor issue: could update index 0 few more times
3415 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3416 {
3417 idx = index;
3418 goto update;
3419 }
3420
3421 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3422 // but also handles wrap around values well enough
3423 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3424 idx = index;
3425 }
3426
3427update:
3428 rgb24_color[idx] = color;
3429 rgb24_seqno[idx] = ++rgb24_sequence;
3430
3431 idx += minTermCOLOR24;
3432 pix_colors_focused [idx].free (this);
3433 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3434 update_fade_color (idx, false);
3435
3436 return idx;
3437}
3438
3781void 3439void
3782rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3440rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3783{ 3441{
3784 if (str[0] == '?' && !str[1]) 3442 if (str[0] == '?' && !str[1])
3785 { 3443 {
3786 unsigned short r, g, b; 3444 rgba c;
3787 pix_colors_focused[color].get (display, r, g, b); 3445 pix_colors_focused[color].get (c);
3788 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3446 char rgba_str[32];
3447
3448#if XFT
3449 if (c.a != rgba::MAX_CC)
3450 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3451 else
3452#endif
3453 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3454
3455 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3456 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3457 else
3458 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3789 } 3459 }
3790 else 3460 else
3791 set_window_color (color, str); 3461 set_window_color (color, str);
3792} 3462}
3793 3463
3794/* 3464/*
3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3465 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796 */ 3466 */
3797void 3467void
3798rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3468rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3799{ 3469{
3800 int changed = 0;
3801 int color; 3470 int color;
3802 char *buf, *name; 3471 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1]; 3472 bool query = str[0] == '?' && !str[1];
3804 int saveop = op; 3473 int saveop = op;
3805 dDisp; 3474
3475 dLocal (Display *, dpy);
3806 3476
3807 assert (str != NULL); 3477 assert (str != NULL);
3478
3479 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3480 return;
3481
3808 switch (op) 3482 switch (op)
3809 { 3483 {
3810 case XTerm_name: 3484 case XTerm_name:
3811 set_title (str); 3485 set_title (str);
3812 /* FALLTHROUGH */ 3486 /* FALLTHROUGH */
… …
3826 unsigned long bytes_after; 3500 unsigned long bytes_after;
3827 unsigned char *value = 0; 3501 unsigned char *value = 0;
3828 const char *str = ""; 3502 const char *str = "";
3829 3503
3830 if (prop 3504 if (prop
3831 && XGetWindowProperty (disp, parent[0], 3505 && XGetWindowProperty (dpy, parent,
3832 prop, 0, 1<<16, 0, AnyPropertyType, 3506 prop, 0, 1<<16, 0, AnyPropertyType,
3833 &actual_type, &actual_format, 3507 &actual_type, &actual_format,
3834 &nitems, &bytes_after, &value) == Success 3508 &nitems, &bytes_after, &value) == Success
3835 && actual_type != None 3509 && actual_type != None
3836 && actual_format == 8) 3510 && actual_format == 8)
3837 str = (const char *)(value); 3511 str = (const char *)(value);
3838 3512
3839 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3513 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3840 3514
3841 XFree (value); 3515 XFree (value);
3842 } 3516 }
3843 else 3517 else
3844 { 3518 {
3845 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3519 char *eq = strchr (str, '=');
3846 3520
3847 if (eq) 3521 if (eq)
3848 { 3522 {
3849 *eq = 0; 3523 *eq = 0;
3850 set_utf8_property (display->atom (str), eq + 1); 3524 set_utf8_property (display->atom (str), eq + 1);
3851 } 3525 }
3852 else 3526 else
3853 XDeleteProperty (disp, parent[0], 3527 XDeleteProperty (dpy, parent,
3854 display->atom (str)); 3528 display->atom (str));
3855 } 3529 }
3856 break; 3530 break;
3857 3531
3858 case XTerm_Color: 3532 case XTerm_Color:
… …
3868 break; 3542 break;
3869 3543
3870 if ((buf = strchr (name, ';')) != NULL) 3544 if ((buf = strchr (name, ';')) != NULL)
3871 *buf++ = '\0'; 3545 *buf++ = '\0';
3872 3546
3873 if (name[0] == '?' && !name[1]) 3547 process_color_seq (op, color, name, st);
3874 {
3875 unsigned short r, g, b;
3876 pix_colors_focused[color].get (display, r, g, b);
3877 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878 }
3879 else
3880 set_window_color (color, name);
3881 } 3548 }
3882 break; 3549 break;
3550 case Rxvt_restoreFG:
3883 case XTerm_Color00: 3551 case XTerm_Color00:
3884 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3552 process_color_seq (op, Color_fg, str, st);
3885 break; 3553 break;
3554 case Rxvt_restoreBG:
3886 case XTerm_Color01: 3555 case XTerm_Color01:
3887 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3556 process_color_seq (op, Color_bg, str, st);
3888 break; 3557 break;
3889#ifndef NO_CURSORCOLOR 3558#ifndef NO_CURSORCOLOR
3890 case XTerm_Color_cursor: 3559 case XTerm_Color_cursor:
3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3560 process_color_seq (op, Color_cursor, str, st);
3892 break; 3561 break;
3893#endif 3562#endif
3894 case XTerm_Color_pointer_fg: 3563 case XTerm_Color_pointer_fg:
3895 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3564 process_color_seq (op, Color_pointer_fg, str, st);
3896 break; 3565 break;
3897 case XTerm_Color_pointer_bg: 3566 case XTerm_Color_pointer_bg:
3898 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3567 process_color_seq (op, Color_pointer_bg, str, st);
3899 break; 3568 break;
3569#ifdef OPTION_HC
3570 case XTerm_Color_HC:
3571 process_color_seq (op, Color_HC, str, st);
3572 break;
3573 case XTerm_Color_HTC:
3574 process_color_seq (op, Color_HTC, str, st);
3575 break;
3576#endif
3900#ifndef NO_BOLD_UNDERLINE_REVERSE 3577#ifndef NO_BOLD_UNDERLINE_REVERSE
3901 case XTerm_Color_RV:
3902 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3903 break;
3904 case Rxvt_Color_BD:
3905 case URxvt_Color_BD: 3578 case URxvt_Color_BD:
3906 process_color_seq (op, Color_BD, str, resp); 3579 process_color_seq (op, Color_BD, str, st);
3907 break; 3580 break;
3908 case Rxvt_Color_UL:
3909 case URxvt_Color_UL: 3581 case URxvt_Color_UL:
3910 process_color_seq (op, Color_UL, str, resp); 3582 process_color_seq (op, Color_UL, str, st);
3911 break; 3583 break;
3912 case URxvt_Color_IT: 3584 case URxvt_Color_IT:
3913 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3585 process_color_seq (op, Color_IT, str, st);
3914 break; 3586 break;
3915#endif 3587#endif
3916#if TRANSPARENT && TINTING
3917 case URxvt_Color_tint: 3588 case URxvt_Color_border:
3918 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3589 process_color_seq (op, Color_border, str, st);
3919 check_our_parents ();
3920 if (am_transparent)
3921 want_full_refresh = want_refresh = 1;
3922 break;
3923#endif
3924
3925 case Rxvt_Pixmap:
3926 if (*str != ';')
3927 {
3928#if XPM_BACKGROUND
3929 scale_pixmap (""); /* reset to default scaling */
3930 set_bgPixmap (str); /* change pixmap */
3931 scr_touch (true);
3932#endif
3933 }
3934
3935 while ((str = strchr (str, ';')) != NULL)
3936 {
3937 str++;
3938#if XPM_BACKGROUND
3939 changed += scale_pixmap (str);
3940#endif
3941 }
3942
3943 if (changed)
3944 {
3945#ifdef XPM_BACKGROUND
3946 resize_pixmap ();
3947 scr_touch (true);
3948#endif
3949 }
3950 break;
3951
3952 case Rxvt_restoreFG:
3953 set_window_color (Color_fg, str);
3954 break;
3955 case Rxvt_restoreBG:
3956 set_window_color (Color_bg, str);
3957 break; 3590 break;
3958 3591
3959 case XTerm_logfile: 3592 case XTerm_logfile:
3960 // TODO, when secure mode? 3593 // TODO, when secure mode?
3961 break; 3594 break;
3962 3595
3963#ifdef MENUBAR
3964 case URxvt_Menu:
3965 if (OPTION (Opt_insecure))
3966 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3967 break;
3968#endif
3969#if 0 3596#if 0
3970 case Rxvt_dumpscreen: /* no error notices */ 3597 case Rxvt_dumpscreen: /* no error notices */
3971 { 3598 {
3972 int fd; 3599 int fd;
3973 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3600 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3985 case URxvt_boldFont: 3612 case URxvt_boldFont:
3986 case URxvt_italicFont: 3613 case URxvt_italicFont:
3987 case URxvt_boldItalicFont: 3614 case URxvt_boldItalicFont:
3988#endif 3615#endif
3989 if (query) 3616 if (query)
3990 tt_printf ("\33]%d;%-.250s%c", saveop, 3617 tt_printf ("\33]%d;%-.250s%s", saveop,
3991 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3618 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3992 ? fontset[op - URxvt_font]->fontdesc : "", 3619 ? fontset[op - URxvt_font]->fontdesc : "",
3993 resp); 3620 st.v);
3994 else 3621 else
3995 { 3622 {
3996 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3623 const char *&res = rs[Rs_font + (op - URxvt_font)];
3997 3624
3998 res = strdup (str); 3625 res = strdup (str);
3999 allocated.push_back ((void *)res); 3626 allocated.push_back ((void *)res);
4000 set_fonts (); 3627 set_fonts ();
4001 } 3628 }
4002 break; 3629 break;
4003 3630
4004#if ENABLE_FRILLS 3631 case URxvt_version:
3632 if (query)
3633 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3634 op,
3635 rs[Rs_name], VERSION[0], VERSION[2],
3636 st.v);
3637 break;
3638
3639#if !ENABLE_MINIMAL
3640 case URxvt_cellinfo:
3641 if (query)
3642 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3643 fwidth, fheight, fbase,
3644 st.v);
3645 break;
3646
4005 case URxvt_locale: 3647 case URxvt_locale:
4006 if (query) 3648 if (query)
4007 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3649 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
4008 else 3650 else
4009 { 3651 {
4010 set_locale (str); 3652 set_locale (str);
4011 pty.set_utf8_mode (enc_utf8); 3653 pty->set_utf8_mode (enc_utf8);
4012 init_xlocale (); 3654 init_xlocale ();
4013 } 3655 }
4014 break; 3656 break;
4015 3657
4016 case URxvt_view_up: 3658 case URxvt_view_up:
… …
4027 break; 3669 break;
4028#endif 3670#endif
4029 3671
4030#if ENABLE_PERL 3672#if ENABLE_PERL
4031 case URxvt_perl: 3673 case URxvt_perl:
4032 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3674 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
4033 ; // no responses yet
4034 break; 3675 break;
4035#endif 3676#endif
4036 } 3677 }
4037} 3678}
4038/*----------------------------------------------------------------------*/ 3679/*----------------------------------------------------------------------*/
… …
4045 * 's' = save 3686 * 's' = save
4046 * 'r' = restore 3687 * 'r' = restore
4047 * 't' = toggle 3688 * 't' = toggle
4048 * so no need for fancy checking 3689 * so no need for fancy checking
4049 */ 3690 */
4050int 3691int ecb_cold
4051rxvt_term::privcases (int mode, unsigned long bit) 3692rxvt_term::privcases (int mode, unsigned long bit)
4052{ 3693{
4053 int state; 3694 int state;
4054 3695
4055 if (mode == 's') 3696 if (mode == 's')
4056 { 3697 {
4057 SavedModes |= (priv_modes & bit); 3698 if (priv_modes & bit)
3699 SavedModes |= bit;
3700 else
3701 SavedModes &= ~bit;
4058 return -1; 3702 return -1;
4059 } 3703 }
4060 else 3704 else
4061 { 3705 {
4062 if (mode == 'r') 3706 if (mode == 'r')
4063 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3707 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4064 else 3708 else
4065 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3709 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4066 PrivMode (state, bit); 3710
3711 if (state)
3712 priv_modes |= bit;
3713 else
3714 priv_modes &= ~bit;
4067 } 3715 }
4068 3716
4069 return state; 3717 return state;
4070} 3718}
4071 3719
4072/* we're not using priv _yet_ */ 3720/* we're not using priv _yet_ */
4073void 3721void
4074rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3722rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4075{ 3723{
4076 unsigned int i, j; 3724 unsigned int i, j;
4077 int state; 3725 int state;
4078 3726
4079 static const struct 3727 static const struct
4080 { 3728 {
4081 const int argval; 3729 const int argval;
4082 const unsigned long bit; 3730 const unsigned long bit;
4083 }
4084
4085 argtopriv[] = { 3731 } argtopriv[] = {
4086 { 1, PrivMode_aplCUR }, 3732 { 1, PrivMode_aplCUR }, // DECCKM
4087 { 2, PrivMode_vt52 }, 3733 { 2, PrivMode_vt52 }, // DECANM
4088 { 3, PrivMode_132 }, 3734 { 3, PrivMode_132 }, // DECCOLM
4089 { 4, PrivMode_smoothScroll }, 3735 { 4, PrivMode_smoothScroll }, // DECSCLM
4090 { 5, PrivMode_rVideo }, 3736 { 5, PrivMode_rVideo }, // DECSCNM
4091 { 6, PrivMode_relOrigin }, 3737 { 6, PrivMode_relOrigin }, // DECOM
4092 { 7, PrivMode_Autowrap }, 3738 { 7, PrivMode_Autowrap }, // DECAWM
4093 // 8, bi-directional support mode 3739 // 8, auto-repeat keys // DECARM
4094 { 9, PrivMode_MouseX10 }, 3740 { 9, PrivMode_MouseX10 },
4095#ifdef menuBar_esc
4096 { menuBar_esc, PrivMode_menuBar },
4097#endif
4098 // 18, 19 printing-related
4099 { 25, PrivMode_VisibleCursor }, 3741 { 12, PrivMode_BlinkingCursor },
3742 // 18 end FF to printer after print screen
3743 // 19 Print screen prints full screen/scroll region
3744 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4100#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
4101 { scrollBar_esc, PrivMode_scrollBar }, 3746 { scrollBar_esc, PrivMode_scrollBar },
4102#endif 3747#endif
4103 { 35, PrivMode_ShiftKeys }, // rxvt extension 3748 { 35, PrivMode_ShiftKeys }, // rxvt extension
3749 // 38, tektronix mode // DECTEK
4104 { 40, PrivMode_132OK }, 3750 { 40, PrivMode_132OK },
4105 // 41 xterm more fixes NYI 3751 // 41 xterm more fixes NYI
4106 // 45 margin bell NYI 3752 // 45 margin bell NYI
4107 // 46 start logging 3753 // 46 start logging
4108 { 47, PrivMode_Screen }, 3754 { 47, PrivMode_Screen },
4109 { 66, PrivMode_aplKP }, 3755 { 66, PrivMode_aplKP }, // DECNKM
4110#ifndef NO_BACKSPACE_KEY 3756#ifndef NO_BACKSPACE_KEY
4111 { 67, PrivMode_BackSpace }, 3757 { 67, PrivMode_BackSpace }, // DECBKM
4112#endif 3758#endif
4113 { 1000, PrivMode_MouseX11 }, 3759 { 1000, PrivMode_MouseX11 },
4114 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3760 { 1002, PrivMode_MouseBtnEvent },
4115 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3761 { 1003, PrivMode_MouseAnyEvent },
4116 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3762#if ENABLE_FRILLS
3763 { 1004, PrivMode_FocusEvent },
3764 { 1005, PrivMode_ExtMouseUTF8 },
3765 { 1006, PrivMode_ExtMouseSGR },
3766#endif
4117 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3767 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4118 { 1011, PrivMode_Keypress }, // rxvt extension 3768 { 1011, PrivMode_Keypress }, // rxvt extension
3769#if ENABLE_FRILLS
3770 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3771#endif
4119 // 1035 enable modifiers for alt, numlock NYI 3772 // 1035 enable modifiers for alt, numlock NYI
4120 // 1036 send ESC for meta keys NYI 3773 // 1036 send ESC for meta keys NYI
4121 // 1037 send DEL for keypad delete NYI 3774 // 1037 send DEL for keypad delete NYI
4122 { 1047, PrivMode_Screen }, 3775 { 1047, PrivMode_Screen },
4123 // 1048 save and restore cursor 3776 // 1048 save and restore cursor, implemented in code
4124 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3777 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4125 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3778 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3779#if ENABLE_FRILLS
3780 { 2004, PrivMode_BracketPaste },
3781#endif
4126 }; 3782 };
4127 3783
4128 if (nargs == 0) 3784 if (nargs == 0)
4129 return; 3785 return;
3786
3787 // DECRQM
3788 if (mode == 'p')
3789 {
3790 int status = 0;
3791 if (nargs != 1)
3792 return;
3793
3794 for (j = 0; j < ecb_array_length (argtopriv); j++)
3795 if (argtopriv[j].argval == arg[0])
3796 {
3797 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3798 break;
3799 }
3800
3801 tt_printf ("\33[?%d;%d$y", arg[0], status);
3802 return;
3803 }
4130 3804
4131 /* make lo/hi boolean */ 3805 /* make lo/hi boolean */
4132 if (mode == 'l') 3806 if (mode == 'l')
4133 mode = 0; /* reset */ 3807 mode = 0; /* reset */
4134 else if (mode == 'h') 3808 else if (mode == 'h')
… …
4137 for (i = 0; i < nargs; i++) 3811 for (i = 0; i < nargs; i++)
4138 { 3812 {
4139 state = -1; 3813 state = -1;
4140 3814
4141 /* basic handling */ 3815 /* basic handling */
4142 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3816 for (j = 0; j < ecb_array_length (argtopriv); j++)
4143 if (argtopriv[j].argval == arg[i]) 3817 if (argtopriv[j].argval == arg[i])
4144 { 3818 {
4145 state = privcases (mode, argtopriv[j].bit); 3819 state = privcases (mode, argtopriv[j].bit);
4146 break; 3820 break;
4147 } 3821 }
… …
4155 3829
4156 scr_touch (true); 3830 scr_touch (true);
4157 break; 3831 break;
4158#endif 3832#endif
4159 case 1048: /* alternative cursor save */ 3833 case 1048: /* alternative cursor save */
4160 case 1049:
4161 if (OPTION (Opt_secondaryScreen)) 3834 if (option (Opt_secondaryScreen))
4162 if (mode == 0) 3835 if (mode == 0)
4163 scr_cursor (RESTORE); 3836 scr_cursor (RESTORE);
4164 else if (mode == 1) 3837 else if (mode == 1)
4165 scr_cursor (SAVE); 3838 scr_cursor (SAVE);
4166 break; 3839 break;
… …
4174 case 2: /* VT52 mode */ 3847 case 2: /* VT52 mode */
4175 /* oddball mode. should be set regardless of set/reset 3848 /* oddball mode. should be set regardless of set/reset
4176 * parameter. Return from VT52 mode with an ESC < from 3849 * parameter. Return from VT52 mode with an ESC < from
4177 * within VT52 mode 3850 * within VT52 mode
4178 */ 3851 */
4179 PrivMode (1, PrivMode_vt52); 3852 priv_modes |= PrivMode_vt52;
4180 break; 3853 break;
4181 case 3: /* 80/132 */ 3854 case 3: /* 80/132 */
4182 if (priv_modes & PrivMode_132OK) 3855 if (priv_modes & PrivMode_132OK)
4183 set_widthheight (((state ? 132 : 80) * fwidth), height); 3856 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4184 break; 3857 break;
4185 case 4: /* smooth scrolling */ 3858 case 4: /* smooth scrolling */
4186 set_option (Opt_jumpScroll, !state); 3859 set_option (Opt_jumpScroll, !state);
4187 break; 3860 break;
4188 case 5: /* reverse video */ 3861 case 5: /* reverse video */
… …
4195 scr_autowrap (state); 3868 scr_autowrap (state);
4196 break; 3869 break;
4197 /* case 8: - auto repeat, can't do on a per window basis */ 3870 /* case 8: - auto repeat, can't do on a per window basis */
4198 case 9: /* X10 mouse reporting */ 3871 case 9: /* X10 mouse reporting */
4199 if (state) /* orthogonal */ 3872 if (state) /* orthogonal */
4200 priv_modes &= ~PrivMode_MouseX11; 3873 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4201 break; 3874 break;
4202#ifdef menuBar_esc
4203 case menuBar_esc:
4204#ifdef MENUBAR
4205 map_menuBar (state);
4206#endif
4207 break;
4208#endif
4209#ifdef scrollBar_esc 3875#ifdef scrollBar_esc
4210 case scrollBar_esc: 3876 case scrollBar_esc:
4211 if (scrollbar_mapping (state)) 3877 scrollBar.map (state);
4212 {
4213 resize_all_windows (0, 0, 0); 3878 resize_all_windows (0, 0, 0);
4214 scr_touch (true); 3879 scr_touch (true);
4215 } 3880 break;
3881#endif
3882#ifdef CURSOR_BLINK
3883 case 12:
3884 cursor_blink_reset ();
4216 break; 3885 break;
4217#endif 3886#endif
4218 case 25: /* visible/invisible cursor */ 3887 case 25: /* visible/invisible cursor */
4219 scr_cursor_visible (state); 3888 scr_cursor_visible (state);
4220 break; 3889 break;
… …
4225 break; 3894 break;
4226 /* case 66: - application key pad */ 3895 /* case 66: - application key pad */
4227 /* case 67: - backspace key */ 3896 /* case 67: - backspace key */
4228 case 1000: /* X11 mouse reporting */ 3897 case 1000: /* X11 mouse reporting */
4229 if (state) /* orthogonal */ 3898 if (state) /* orthogonal */
4230 priv_modes &= ~PrivMode_MouseX10; 3899 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4231 break; 3900 break;
4232#if 0
4233 case 1001: 3901 case 1002:
4234 break; /* X11 mouse highlighting */ 3902 case 1003:
4235#endif 3903 if (state)
3904 {
3905 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3906 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3907 mouse_row = mouse_col = 0;
3908 vt_emask_mouse = PointerMotionMask;
3909 }
3910 else
3911 vt_emask_mouse = NoEventMask;
3912
3913 vt_select_input ();
3914 break;
4236 case 1010: /* scroll to bottom on TTY output inhibit */ 3915 case 1010: /* scroll to bottom on TTY output inhibit */
4237 set_option (Opt_scrollTtyOutput, !state); 3916 set_option (Opt_scrollTtyOutput, !state);
4238 break; 3917 break;
4239 case 1011: /* scroll to bottom on key press */ 3918 case 1011: /* scroll to bottom on key press */
4240 set_option (Opt_scrollTtyKeypress, state); 3919 set_option (Opt_scrollTtyKeypress, state);
4241 break; 3920 break;
4242 case 1047: /* secondary screen w/ clearing last */ 3921 case 1047: /* secondary screen w/ clearing last */
4243 if (OPTION (Opt_secondaryScreen)) 3922 if (option (Opt_secondaryScreen))
4244 if (current_screen != PRIMARY) 3923 if (!state)
4245 scr_erase_screen (2); 3924 scr_erase_screen (2);
3925
4246 scr_change_screen (state); 3926 scr_change_screen (state);
4247 break; 3927 break;
4248 case 1049: /* secondary screen w/ clearing first */ 3928 case 1049: /* secondary screen w/ clearing first */
3929 if (option (Opt_secondaryScreen))
3930 if (state)
3931 scr_cursor (SAVE);
3932
4249 scr_change_screen (state); 3933 scr_change_screen (state);
3934
4250 if (OPTION (Opt_secondaryScreen)) 3935 if (option (Opt_secondaryScreen))
4251 if (current_screen != PRIMARY) 3936 if (state)
4252 scr_erase_screen (2); 3937 scr_erase_screen (2);
3938 else
3939 scr_cursor (RESTORE);
4253 break; 3940 break;
4254 default: 3941 default:
4255 break; 3942 break;
4256 } 3943 }
4257 } 3944 }
4258} 3945}
4259/*}}} */ 3946/*}}} */
4260 3947
4261/*{{{ process sgr sequences */ 3948/*{{{ process sgr sequences */
4262void 3949void ecb_hot
4263rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3950rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4264{ 3951{
4265 unsigned int i; 3952 unsigned int i;
4266 short rendset; 3953 short rendset;
4267 int rendstyle; 3954 int rendstyle;
… …
4309 //case 19: // ninth alt font 3996 //case 19: // ninth alt font
4310 //case 20: // gothic 3997 //case 20: // gothic
4311 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3998 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4312 rendset = 0, rendstyle = RS_Bold; 3999 rendset = 0, rendstyle = RS_Bold;
4313 break; 4000 break;
4314 case 22: // normal intensity 4001 case 22: // bold off (vt220)
4315 rendset = 0, rendstyle = RS_Bold; 4002 rendset = 0, rendstyle = RS_Bold;
4316 break; 4003 break;
4317 case 23: // disable italic 4004 case 23: // disable italic
4318 rendset = 0, rendstyle = RS_Italic; 4005 rendset = 0, rendstyle = RS_Italic;
4319 break; 4006 break;
4320 case 24: 4007 case 24: // underline off (vt220)
4321 rendset = 0, rendstyle = RS_Uline; 4008 rendset = 0, rendstyle = RS_Uline;
4322 break; 4009 break;
4323 case 25: 4010 case 25: // blink off (vt220)
4324 rendset = 0, rendstyle = RS_Blink; 4011 rendset = 0, rendstyle = RS_Blink;
4325 break; 4012 break;
4326 case 26: // variable spacing (iso 8613) 4013 case 26: // variable spacing (iso 8613)
4327 rendset = 0, rendstyle = RS_Blink; 4014 rendset = 0, rendstyle = RS_Blink;
4328 break; 4015 break;
4329 case 27: 4016 case 27: // reverse off (vt220)
4330 rendset = 0, rendstyle = RS_RVid; 4017 rendset = 0, rendstyle = RS_RVid;
4331 break; 4018 break;
4332 //case 28: // visible. NYI 4019 //case 28: // visible. NYI
4333 //case 29: // not crossed-out 4020 //case 29: // not crossed-out
4334 } 4021 }
… …
4349 case 35: 4036 case 35:
4350 case 36: 4037 case 36:
4351 case 37: 4038 case 37:
4352 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4039 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4353 break; 4040 break;
4354 case 38: // set fg color, ISO 8613-6
4355 if (nargs > i + 2 && arg[i + 1] == 5)
4356 {
4357 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4358 i += 2;
4359 }
4360 break;
4361 case 39: /* default fg */ 4041 case 39: /* default fg */
4362 scr_color (Color_fg, Color_fg); 4042 scr_color (Color_fg, Color_fg);
4363 break; 4043 break;
4364 4044
4365 case 40: 4045 case 40:
… …
4370 case 45: 4050 case 45:
4371 case 46: 4051 case 46:
4372 case 47: 4052 case 47:
4373 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4053 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4374 break; 4054 break;
4375 case 48: // set bg color, ISO 8613-6
4376 if (nargs > i + 2 && arg[i + 1] == 5)
4377 {
4378 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4379 i += 2;
4380 }
4381 break;
4382 case 49: /* default bg */ 4055 case 49: /* default bg */
4383 scr_color (Color_bg, Color_bg); 4056 scr_color (Color_bg, Color_bg);
4384 break; 4057 break;
4385 4058
4059 case 38: // set fg color, ISO 8613-6
4060 case 48: // set bg color, ISO 8613-6
4061 {
4062 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4063 unsigned int idx;
4064
4065 if (nargs > i + 2 && arg[i + 1] == 5)
4066 {
4067 idx = minCOLOR + arg[i + 2];
4068 i += 2;
4069
4070 scr_color (idx, fgbg);
4071 }
4072 else if (nargs > i + 4 && arg[i + 1] == 2)
4073 {
4074 unsigned int r = arg[i + 2];
4075 unsigned int g = arg[i + 3];
4076 unsigned int b = arg[i + 4];
4077 unsigned int a = 0xff;
4078
4079 idx = map_rgb24_color (r, g, b, a);
4080
4081 i += 4;
4082
4083 scr_color (idx, fgbg);
4084 }
4085 }
4086 break;
4087
4386 //case 50: // not variable spacing 4088 //case 50: // not variable spacing
4387 4089
4388#if ENABLE_FRILLS 4090#if !ENABLE_MINIMAL
4389 case 90: 4091 case 90:
4390 case 91: /* set bright fg color */ 4092 case 91: /* set bright fg color */
4391 case 92: 4093 case 92:
4392 case 93: 4094 case 93:
4393 case 94: 4095 case 94:
… …
4408 break; 4110 break;
4409#endif 4111#endif
4410 } 4112 }
4411 } 4113 }
4412} 4114}
4115
4116void
4117rxvt_term::set_cursor_style (int style)
4118{
4119 if (!IN_RANGE_INC (style, 0, 6))
4120 return;
4121
4122 if (style == 0)
4123 style = 1;
4124
4125 cursor_type = (style - 1) / 2;
4126 set_option (Opt_cursorUnderline, cursor_type == 1);
4127
4128#ifdef CURSOR_BLINK
4129 set_option (Opt_cursorBlink, style & 1);
4130 cursor_blink_reset ();
4131#endif
4132
4133 want_refresh = 1;
4134}
4413/*}}} */ 4135/*}}} */
4414 4136
4415/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4416void
4417rxvt_term::process_graphics ()
4418{
4419 unicode_t ch, cmd = cmd_getc ();
4420
4421 if (cmd == 'Q')
4422 { /* query graphics */
4423 tt_printf ("\033G0\012"); /* no graphics */
4424 return;
4425 }
4426 /* swallow other graphics sequences until terminating ':' */
4427 do
4428 ch = cmd_getc ();
4429 while (ch != ':');
4430}
4431/*}}} */
4432
4433/* ------------------------------------------------------------------------- */ 4137/* ---------------------------------------------------------------------- */
4138/* Write data to the pty as typed by the user, pasted with the mouse,
4139 * or generated by us in response to a query ESC sequence.
4140 */
4434 4141
4435/* 4142/*
4436 * Send printf () formatted output to the command. 4143 * Send printf () formatted output to the command.
4437 * Only use for small amounts of data. 4144 * Only use for small amounts of data.
4438 */ 4145 */
… …
4446 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4153 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4447 va_end (arg_ptr); 4154 va_end (arg_ptr);
4448 tt_write (buf, strlen (buf)); 4155 tt_write (buf, strlen (buf));
4449} 4156}
4450 4157
4451/* ---------------------------------------------------------------------- */
4452/* Write data to the pty as typed by the user, pasted with the mouse, 4158/* Write data to the pty as typed by the user. */
4453 * or generated by us in response to a query ESC sequence. 4159void
4454 */ 4160rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4455const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4161{
4162 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4163 return;
4164
4165 if (option (Opt_scrollTtyKeypress))
4166 if (view_start)
4167 {
4168 view_start = 0;
4169 want_refresh = 1;
4170 }
4171
4172 tt_write_ (data, len);
4173}
4456 4174
4457void 4175void
4458rxvt_term::tt_write (const char *data, unsigned int len) 4176rxvt_term::tt_write (const char *data, unsigned int len)
4459{ 4177{
4460 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4178 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4461 return; 4179 return;
4462 4180
4181 tt_write_ (data, len);
4182}
4183
4184static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4185
4186void
4187rxvt_term::tt_write_ (const char *data, unsigned int len)
4188{
4463 if (pty.pty < 0) 4189 if (pty->pty < 0)
4464 return; 4190 return;
4465 4191
4466 if (v_buflen == 0) 4192 if (v_buflen == 0)
4467 { 4193 {
4468 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4194 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4469 4195
4196 max_it (written, 0);
4197
4470 if ((unsigned int)written == len) 4198 if (written == len)
4471 return; 4199 return;
4472 4200
4473 data += written; 4201 data += written;
4474 len -= written; 4202 len -= written;
4475 } 4203 }
4476 4204
4477 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4205 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4478 4206
4479 memcpy (v_buffer + v_buflen, data, len); 4207 memcpy (v_buffer + v_buflen, data, len);
4480 v_buflen += len; 4208 v_buflen += len;
4481 4209
4482 pty_ev.set (EVENT_READ | EVENT_WRITE); 4210 pty_ev.set (ev::READ | ev::WRITE);
4483} 4211}
4484 4212
4485void rxvt_term::pty_write () 4213void rxvt_term::pty_write ()
4486{ 4214{
4487 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4215 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4488 4216
4489 if (written > 0) 4217 if (written > 0)
4490 { 4218 {
4491 v_buflen -= written; 4219 v_buflen -= written;
4492 4220
4493 if (v_buflen == 0) 4221 if (v_buflen == 0)
4494 { 4222 {
4495 free (v_buffer); 4223 free (v_buffer);
4496 v_buffer = 0; 4224 v_buffer = 0;
4497 v_buflen = 0;
4498 4225
4499 pty_ev.set (EVENT_READ); 4226 pty_ev.set (ev::READ);
4500 return; 4227 return;
4501 } 4228 }
4502 4229
4503 memmove (v_buffer, v_buffer + written, v_buflen); 4230 memmove (v_buffer, v_buffer + written, v_buflen);
4504 } 4231 }
4505 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4232 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4506 pty_ev.set (EVENT_READ); 4233 pty_ev.set (ev::READ);
4507} 4234}
4508 4235
4509/*----------------------- end-of-file (C source) -----------------------*/ 4236/*----------------------- end-of-file (C source) -----------------------*/
4510 4237

Diff Legend

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