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.450 by sf-exg, Sun Apr 18 11:11:28 2010 UTC vs.
Revision 1.603 by root, Mon Jun 5 13:39:34 2023 UTC

… …
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * 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,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
84 XK_Right, 0x2192, 84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193, 86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91 89
92 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
93 XK_Next, 0x21df, 91 XK_Next, 0x21df,
94 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
… …
110 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
111 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
112 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
115 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
118 XK_Break, 0x238a, 119 XK_Break, 0x238a,
119 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
120 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
121 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
122 124
123 XK_space, 0x2423, 125 XK_space, 0x2423,
124 126
125#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
131 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
132#endif 134#endif
133 0, 135 0,
134}; 136};
135 137
136void 138void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
138{ 140{
139 x = Pixel2Col (x); 141 x = Pixel2Col (x);
140 y = Pixel2Row (y); 142 y = Pixel2Row (y);
141 143
… …
149 151
150 text_t t = l.t[x]; 152 text_t t = l.t[x];
151 153
152 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
153 { 155 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 156 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
156 break; 158 break;
157 } 159 }
158 160
159 x--; 161 x--;
160 } 162 }
161} 163}
162 164
163void 165void ecb_cold
164rxvt_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)
165{ 167{
166 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 169 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 170 int len;
169 171
170# if ENABLE_COMBINING 172# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
172 { 174 {
173 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
176 } 178 }
177 else 179 else
178# endif 180# endif
… …
181 183
182 alloc = 0; 184 alloc = 0;
183 chr = &ch2; 185 chr = &ch2;
184 len = 1; 186 len = 1;
185 } 187 }
188
189 char rowcol[40];
190 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 191
187 char attr[80]; // plenty 192 char attr[80]; // plenty
188 193
189 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",
190 (int)r, 195 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 208 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 209 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 210 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 211 }
207 212
208 max_it (width, 8+5); // for char + hex
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 + 1); 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 !UNICODE_3 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);
235 241
236 if (WCWIDTH (ch) >= 2) 242 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 243 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 244 }
239 245
240// { 246// {
241// char buf[4+4+3+1]; 247// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 248// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 249// scr_overlay_set (0, 0, buf);
244// } 250// }
245 scr_overlay_set (0, len , attr); 251 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 252 for (int i = 0; i < len; i++)
247 { 253 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 254 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 255 free (fname[i]);
250 } 256 }
251 257
252# if ENABLE_COMBINING 258# if ENABLE_COMBINING
253 if (alloc) 259 if (alloc)
254 delete [] alloc; 260 delete [] alloc;
255# endif 261# endif
256} 262}
257#endif 263#endif
258 264
259void 265void ecb_cold
260rxvt_term::commit_iso14755 () 266rxvt_term::commit_iso14755 ()
261{ 267{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 268 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 269
267 if (iso14755buf & ISO_14755_51) 270 if (iso14755buf & ISO_14755_51)
268 { 271 {
269 char mb[16]; 272 char mb[MB_LEN_MAX];
270 int len; 273 int len;
271 274
272 // allow verbatim 0-bytes and control-bytes to be entered 275 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 276 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 277 len = wctomb (mb, ch);
275 else 278 else
276 { 279 {
277 mb[0] = ch[0]; 280 mb[0] = ch;
278 len = 1; 281 len = 1;
279 } 282 }
280 283
281 if (len > 0) 284 if (len > 0)
282 tt_write (mb, len); 285 tt_write (mb, len);
… …
285 } 288 }
286 289
287 iso14755buf = 0; 290 iso14755buf = 0;
288} 291}
289 292
290static int 293static int ecb_cold
291hex_keyval (XKeyEvent &ev) 294hex_keyval (XKeyEvent &ev)
292{ 295{
293 // check whether this event corresponds to a hex digit 296 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 297 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 298 for (int index = 0; index < 8; index++)
… …
304 307
305 return -1; 308 return -1;
306} 309}
307#endif 310#endif
308 311
309static inline KeySym 312static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 313translate_keypad (KeySym keysym, bool kp)
311{ 314{
312#ifdef XK_KP_Home 315#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 316 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 317 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left 318 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up 319 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right 320 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down 321 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior 322 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next 323 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End 324 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin 325 XK_KP_5, // XK_KP_Begin
328 }; 326 };
329 327
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
340# endif 338# endif
341#endif 339#endif
342 return keysym; 340 return keysym;
343} 341}
344 342
345static inline int 343static inline int ecb_cold
346map_function_key (KeySym keysym) 344map_function_key (KeySym keysym)
347{ 345{
348 int param = 0; 346 int param = 0;
349 347
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 348 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
375 param = 3; 373 param = 3;
376 break; 374 break;
377 case XK_Select: 375 case XK_Select:
378 param = 4; 376 param = 4;
379 break; 377 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior: 378 case XK_Prior:
382 param = 5; 379 param = 5;
383 break; 380 break;
384 case XK_Next: 381 case XK_Next:
385 param = 6; 382 param = 6;
… …
388 param = 7; 385 param = 7;
389 break; 386 break;
390 case XK_End: 387 case XK_End:
391 param = 8; 388 param = 8;
392 break; 389 break;
393#endif
394 case XK_Help: 390 case XK_Help:
395 param = 28; 391 param = 28;
396 break; 392 break;
397 case XK_Menu: 393 case XK_Menu:
398 param = 29; 394 param = 29;
399 break; 395 break;
400 } 396 }
401 return param; 397 return param;
402} 398}
403 399
404void 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
405rxvt_term::key_press (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
406{ 411{
407 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
408 KeySym keysym; 413 KeySym keysym = NoSymbol;
409 int valid_keysym;
410 char kbuf[KBUFSZ]; 414 char rkbuf[KBUFSZ + 1];
415 char *kbuf = rkbuf + 1;
411 416
412#if ISO_14755 417#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 418 if (iso14755buf & ISO_14755_52)
414 return; 419 return;
415#endif 420#endif
… …
424 ctrl = ev.state & ControlMask; 429 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 430 meta = ev.state & ModMetaMask;
426 431
427 kbuf[0] = 0; 432 kbuf[0] = 0;
428 433
429#ifdef USE_XIM 434#if USE_XIM
430 if (Input_Context) 435 if (Input_Context)
431 { 436 {
432 Status status_return; 437 Status status_return;
433 438
434#if 0 439#if 0
… …
472 } 477 }
473 } 478 }
474 else 479 else
475 len = 0; 480 len = 0;
476 } 481 }
477
478 valid_keysym = status_return == XLookupKeySym
479 || status_return == XLookupBoth;
480 } 482 }
481 else 483 else
482#endif 484#endif
483 { 485 {
484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
485 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
486 } 490 {
491 KeySym orig_keysym = keysym;
487 492
488 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)
489 { 706 {
490#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 709 return;
493#endif 710#endif
494 711
495 if (saveLines) 712 if (saveLines)
496 { 713 {
… …
509#endif 726#endif
510 max_it (lnsppg, 1); 727 max_it (lnsppg, 1);
511 728
512 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
513 { 730 {
514 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
515 return; 732 return;
516 } 733 }
517 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
518 { 735 {
519 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
520 return; 737 return;
521 } 738 }
522 } 739 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
525 { 742 {
526 if (keysym == XK_Up) 743 if (keysym == XK_Up)
527 { 744 {
528 scr_page (UP, 1); 745 scr_page (1);
529 return; 746 return;
530 } 747 }
531 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
532 { 749 {
533 scr_page (DN, 1); 750 scr_page (-1);
534 return; 751 return;
535 } 752 }
536 } 753 }
537#endif 754#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
540 { 757 {
541 if (keysym == XK_Home) 758 if (keysym == XK_Home)
542 { 759 {
543 scr_move_to (0, 1); 760 scr_changeview (top_row);
544 return; 761 return;
545 } 762 }
546 else if (keysym == XK_End) 763 else if (keysym == XK_End)
547 { 764 {
548 scr_move_to (1, 1); 765 scr_changeview (0);
549 return; 766 return;
550 } 767 }
551 } 768 }
552#endif 769#endif
553 } 770 }
554 771
555 if (shft) 772 if (shft)
556 { 773 {
557 /* Shift + F1 - F10 generates F11 - F20 */
558 if (keysym >= XK_F1 && keysym <= XK_F10)
559 {
560 keysym += (XK_F11 - XK_F1);
561 shft = 0; /* turn off Shift */
562 }
563 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
564 { 775 {
565 switch (keysym) 776 switch (keysym)
566 { 777 {
567 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
568 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
569 selection_request (ev.time); 780 selection_request (ev.time);
570 return; 781 return;
571#if TODO 782#if TODO
572 /* rxvt extras */ 783 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 785 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 787 return;
579#endif 788#endif
580 } 789 }
581 } 790 }
791 }
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;
582 } 806 }
583 807
584#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 809 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 865 {
642 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
643 return; 867 return;
644 } 868 }
645#endif 869#endif
646
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
773 {
774 int param = map_function_key (keysym);
775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
779 }
780 break;
781 }
782
783 if (newlen)
784 len = strlen (kbuf);
785
786 /*
787 * Pass meta for all function keys, if 'meta' option set
788 */
789#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0)
791 kbuf[len - 1] |= 0x80;
792#endif
793
794 }
795 else if (ctrl && keysym == XK_minus)
796 {
797 len = 1;
798 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
799 }
800 else if (keysym == XK_ISO_Left_Tab)
801 {
802 strcpy (kbuf, "\033[Z");
803 len = 3;
804 }
805 else
806 {
807#ifdef META8_OPTION
808 /* set 8-bit on */
809 if (meta && (meta_char == 0x80))
810 {
811 char *ch;
812
813 for (ch = kbuf; ch < kbuf + len; ch++)
814 *ch |= 0x80;
815
816 meta = 0;
817 }
818#endif
819 /* nil */ ;
820 }
821 } 870 }
822
823 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
824 return;
825 871
826 if (len <= 0) 872 if (len <= 0)
827 return; /* not mapped */ 873 return; /* not mapped */
828 874
829 if (option (Opt_scrollTtyKeypress))
830 if (view_start)
831 {
832 view_start = 0;
833 want_refresh = 1;
834 }
835
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
862} 876}
863 877
864void 878void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
866{ 880{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 882 KeySym keysym;
869 883
… …
889 commit_iso14755 (); 903 commit_iso14755 ();
890 904
891 return; 905 return;
892 } 906 }
893 907
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 909 if (i[0] == keysym)
896 { 910 {
897 iso14755buf = ISO_14755_51 | i[1]; 911 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 912 commit_iso14755 ();
899 913
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 951 mouse_slip_wheel_speed = 0;
938#endif 952#endif
939} 953}
940 954
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 955void
975rxvt_term::flush () 956rxvt_term::flush ()
976{ 957{
977 flush_ev.stop (); 958 flush_ev.stop ();
978 959
979#ifdef HAVE_BG_PIXMAP 960#ifdef HAVE_IMG
980 if (bgPixmap.check_clearChanged ()) 961 if (bg_flags & BG_NEEDS_REFRESH)
981 { 962 {
982// scr_clear (true); This needs to be researched further! 963 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 964 scr_touch (false);
984 } 965 }
985#endif 966#endif
986 967
987 if (want_refresh) 968 if (want_refresh)
… …
1024 while (row < end_row); 1005 while (row < end_row);
1025 } 1006 }
1026 1007
1027 scr_refresh (); 1008 scr_refresh ();
1028 scrollBar.show (1); 1009 scrollBar.show (1);
1029#ifdef USE_XIM 1010#if USE_XIM
1030 IMSendSpot (); 1011 im_send_spot ();
1031#endif 1012#endif
1032 } 1013 }
1033 1014
1034 display->flush (); 1015 display->flush ();
1035} 1016}
… …
1037/* checks whether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1038void 1019void
1039rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1040{ 1021{
1041 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start ();
1043 1024
1044 display->flush (); 1025 display->flush ();
1045} 1026}
1046 1027
1047void 1028void
… …
1052 refresh_count = 0; 1033 refresh_count = 0;
1053 flush (); 1034 flush ();
1054} 1035}
1055 1036
1056#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
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
1057void 1056void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1058{
1060 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1060 want_refresh = 1;
… …
1080 1079
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1081void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1083{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1086 {
1088 want_refresh = 1; 1087 want_refresh = 1;
1089 refresh_check (); 1088 refresh_check ();
1090 } 1089 }
1091 else 1090 else
… …
1095 1094
1096#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1097void 1096void
1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1099{ 1098{
1100 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1101 { 1100 {
1102 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1103 want_refresh = 1; 1102 want_refresh = 1;
1104 refresh_check (); 1103 refresh_check ();
1105 } 1104 }
… …
1110 1109
1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1112void 1111void
1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1114{ 1113{
1115 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1114 if (scr_page (mouse_slip_wheel_speed))
1116 { 1115 {
1117 want_refresh = 1; 1116 want_refresh = 1;
1118 refresh_check (); 1117 refresh_check ();
1119 } 1118 }
1120 1119
… …
1152 { 1151 {
1153 } 1152 }
1154} event_handler; 1153} event_handler;
1155#endif 1154#endif
1156 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
1157bool 1189bool
1158rxvt_term::pty_fill () 1190rxvt_term::pty_fill ()
1159{ 1191{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1192 cmdbuf_reify ();
1161 1193
1162 if (CBUFSIZ == n) 1194 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1195
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1196 if (!avail)
1165 n = 0;
1166 } 1197 {
1167 1198 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1199 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1200 cmdbuf_endp = cmdbuf_ptr;
1201 avail = CBUFSIZ;
1202 }
1171 1203
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1204 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1205
1174 if (r > 0) 1206 if (r > 0)
1175 { 1207 {
1176 cmdbuf_endp += r; 1208 cmdbuf_endp += r;
1177 return true; 1209 return true;
… …
1208 pty_write (); 1240 pty_write ();
1209 1241
1210 refresh_check (); 1242 refresh_check ();
1211} 1243}
1212 1244
1213void 1245void ecb_cold
1214rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1215{ 1247{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1249 recolor_cursor ();
1218 1250
1219#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1220 hidden_pointer = 0; 1252 hidden_pointer = 0;
1221 1253
1222 if (option (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1223 pointer_ev.start (pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1224#endif 1256#endif
1225} 1257}
1226 1258
1227#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1228void 1260void ecb_cold
1229rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1230{ 1262{
1231 if (!option (Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1232 return; 1264 return;
1233 1265
… …
1235 XFlush (dpy); 1267 XFlush (dpy);
1236 1268
1237 hidden_pointer = 1; 1269 hidden_pointer = 1;
1238} 1270}
1239 1271
1240void 1272void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1274{
1243 make_current (); 1275 make_current ();
1244 1276
1245 pointer_blank (); 1277 pointer_blank ();
… …
1247#endif 1279#endif
1248 1280
1249void 1281void
1250rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1251{ 1283{
1252 int button_number, key_state = 0; 1284 int button_number, state = 0;
1253 int x, y; 1285 int x, y;
1254 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1255 1287
1256 x = Pixel2Col (ev.x); 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1257 y = Pixel2Row (ev.y); 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1290
1258 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1259 { 1292 {
1260 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1261 return; 1294 return;
1295
1262 mouse_row = x; 1296 mouse_row = x;
1263 mouse_col = y; 1297 mouse_col = y;
1264 code += 32; 1298 state += 32;
1265 }
1266
1267 if (MEvent.button == AnyButton)
1268 button_number = 3;
1269 else
1270 { 1299 }
1300
1271 button_number = MEvent.button - Button1; 1301 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1302 if (button_number > 10)
1303 return;
1304 else if (button_number >= 7)
1305 button_number += 128 - 7;
1273 if (button_number >= 3) 1306 else if (button_number >= 3)
1274 button_number += (64 - 3); 1307 button_number += 64 - 3;
1275 }
1276 1308
1277 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1278 { 1310 {
1279 /* 1311 /*
1280 * do not report ButtonRelease 1312 * do not report ButtonRelease
1281 * no state info allowed 1313 * no state info allowed
1282 */ 1314 */
1283 key_state = 0; 1315 if (release)
1284 if (button_number == 3)
1285 return; 1316 return;
1286 } 1317 }
1287 else 1318 else
1288 { 1319 {
1289 /* XTerm mouse reporting needs these values: 1320 /* XTerm mouse reporting needs these values:
… …
1291 * 8 = Meta 1322 * 8 = Meta
1292 * 16 = Control 1323 * 16 = Control
1293 * plus will add in our own Double-Click reporting 1324 * plus will add in our own Double-Click reporting
1294 * 32 = Double Click 1325 * 32 = Double Click
1295 */ 1326 */
1296 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1327 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1297 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1328 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1298 + ((MEvent.state & ControlMask) ? 16 : 0); 1329 + ((MEvent.state & ControlMask) ? 16 : 0);
1299#ifdef MOUSE_REPORT_DOUBLECLICK 1330#ifdef MOUSE_REPORT_DOUBLECLICK
1300 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1331 state += ((MEvent.clicks > 1) ? 32 : 0);
1301#endif 1332#endif
1302 } 1333 }
1334
1335 int code = 32 + (release ? 3 : button_number) + state;
1303 1336
1304#if DEBUG_MOUSEREPORT 1337#if DEBUG_MOUSEREPORT
1305 fprintf (stderr, "Mouse ["); 1338 fprintf (stderr, "Mouse [");
1306 if (key_state & 16) 1339 if (state & 16)
1307 fputc ('C', stderr); 1340 fputc ('C', stderr);
1308 if (key_state & 4) 1341 if (state & 4)
1309 fputc ('S', stderr); 1342 fputc ('S', stderr);
1310 if (key_state & 8) 1343 if (state & 8)
1311 fputc ('A', stderr); 1344 fputc ('A', stderr);
1312 if (key_state & 32) 1345 if (state & 32)
1313 fputc ('2', stderr); 1346 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1347 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1348 button_number,
1316 x + 1, 1349 x,
1317 y + 1); 1350 y);
1318#endif 1351#endif
1319 1352
1353#if ENABLE_FRILLS
1354 if (priv_modes & PrivMode_ExtMouseSGR)
1355 tt_printf ("\033[<%d;%d;%d%c",
1356 button_number + state,
1357 x,
1358 y,
1359 release ? 'm' : 'M');
1360 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1361 tt_printf ("\033[%d;%d;%dM",
1362 code,
1363 x,
1364 y);
1365 else if (priv_modes & PrivMode_ExtMouseUTF8)
1366 if (code < 128)
1367 tt_printf ("\033[M%c%lc%lc",
1368 code,
1369 wint_t (32 + x),
1370 wint_t (32 + y));
1371 else
1372 tt_printf ("\033[M%c%c%lc%lc",
1373 0xc0 + (code >> 6),
1374 0x80 + (code & 0x3f),
1375 wint_t (32 + x),
1376 wint_t (32 + y));
1377 else
1378#endif
1320 tt_printf ("\033[M%c%c%c", 1379 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1380 code,
1322 (32 + x + 1), 1381 32 + x,
1323 (32 + y + 1)); 1382 32 + y);
1324} 1383}
1325 1384
1326/*{{{ process an X event */ 1385/*{{{ process an X event */
1327void 1386void ecb_hot
1328rxvt_term::x_cb (XEvent &ev) 1387rxvt_term::x_cb (XEvent &ev)
1329{ 1388{
1330 make_current (); 1389 make_current ();
1331 1390
1332 dLocal (Display *, dpy); 1391 dLocal (Display *, dpy);
… …
1430 && ev.xfocus.mode != NotifyGrab) 1489 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1490 focus_out ();
1432 break; 1491 break;
1433 1492
1434 case ConfigureNotify: 1493 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1494 if (ev.xconfigure.window == parent)
1439 { 1495 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1496 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1497 ;
1498
1499 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1500
1501 if (want_position_change)
1502 {
1503 int x, y;
1504
1505 if (ev.xconfigure.send_event)
1506 {
1507 x = ev.xconfigure.x;
1508 y = ev.xconfigure.y;
1509 }
1510 else
1511 get_window_origin (x, y);
1512
1513 if (x != parent_x || y != parent_y)
1514 {
1515 parent_x = x;
1516 parent_y = y;
1517 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1518 }
1519 }
1442 1520
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1521 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1522 {
1445 seen_resize = 1; 1523 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1524 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1525 }
1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 {
1453 if (mapped)
1454 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1458#endif
1459 }
1460 1526
1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 } 1528 }
1463 break; 1529 break;
1464 1530
1465 case PropertyNotify: 1531 case PropertyNotify:
1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1532 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470
1471 break; 1533 break;
1472 1534
1473 case SelectionClear: 1535 case SelectionClear:
1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1536 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1475 break; 1537 break;
1476 1538
1477 case SelectionNotify:
1478 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break;
1481
1482 case SelectionRequest: 1539 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1484 break; 1541 break;
1485 1542
1486 case MapNotify: 1543 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does
1492 * reparenting.
1493 * We should not render background immidiately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results.
1499 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1501 update_background_ev.start (0.025);
1502#endif
1503 mapped = 1; 1544 mapped = 1;
1504#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1505 text_blink_ev.start (); 1546 text_blink_ev.start ();
1506#endif 1547#endif
1507 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1520 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1521 { 1562 {
1522 do 1563 do
1523 { 1564 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1567 }
1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1569
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1571
1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 { 1573 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1535 } 1576 }
1536 1577
1537 want_refresh = 1; 1578 want_refresh = 1;
1538 } 1579 }
1539 else 1580 else
… …
1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1546 ; 1587 ;
1547 1588
1548 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1549 { 1590 {
1550 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1551 scrollBar.show (0); 1592 scrollBar.show (0);
1552 } 1593 }
1553 } 1594 }
1554 break; 1595 break;
1555 1596
1556 case MotionNotify: 1597 case MotionNotify:
1557#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1558 if (hidden_pointer) 1599 if (hidden_pointer)
1559 pointer_unblank (); 1600 pointer_unblank ();
1560#endif 1601#endif
1602 if (!bypass_keystate
1561 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1603 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1562 || priv_modes & PrivMode_MouseAnyEvent) 1604 || priv_modes & PrivMode_MouseAnyEvent))
1563 mouse_report (ev.xbutton); 1605 mouse_report (ev.xbutton);
1564 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1565 break; 1607 break;
1566 1608
1567 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
… …
1579 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1580 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1581 &ev.xbutton.state); 1623 &ev.xbutton.state);
1582#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1583 /* deal with a `jumpy' mouse */ 1625 /* deal with a `jumpy' mouse */
1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1626 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1627#endif
1585 { 1628 {
1586#endif
1587#if ISO_14755 1629#if ISO_14755
1588 // 5.4 1630 // 5.4
1589 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1631 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1590 { 1632 {
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1633 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1597 1639
1598#ifdef SELECTION_SCROLLING 1640#ifdef SELECTION_SCROLLING
1599 if (ev.xbutton.y < int_bwidth 1641 if (ev.xbutton.y < int_bwidth
1600 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1642 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1601 { 1643 {
1644 page_dirn scroll_selection_dir;
1602 int dist; 1645 int dist;
1603 1646
1604 /* don't clobber the current delay if we are 1647 /* don't clobber the current delay if we are
1605 * already in the middle of scrolling. 1648 * already in the middle of scrolling.
1606 */ 1649 */
… …
1621 dist = int_bwidth - ev.xbutton.y; 1664 dist = int_bwidth - ev.xbutton.y;
1622 } 1665 }
1623 else 1666 else
1624 { 1667 {
1625 scroll_selection_dir = DN; 1668 scroll_selection_dir = DN;
1626 dist = ev.xbutton.y - (int_bwidth + height); 1669 dist = ev.xbutton.y - (int_bwidth + vt_height);
1627 } 1670 }
1628 1671
1629 scroll_selection_lines = Pixel2Height (dist) 1672 scroll_selection_lines = Pixel2Height (dist)
1630 / SELECTION_SCROLL_LINE_SPEEDUP 1673 / SELECTION_SCROLL_LINE_SPEEDUP
1631 + 1; 1674 + 1;
1632 min_it (scroll_selection_lines, 1675 min_it (scroll_selection_lines,
1633 SELECTION_SCROLL_MAX_LINES); 1676 SELECTION_SCROLL_MAX_LINES);
1677 scroll_selection_lines *= scroll_selection_dir;
1634 } 1678 }
1635 else 1679 else
1636 { 1680 {
1637 /* we are within the text window, so we 1681 /* we are within the text window, so we
1638 * shouldn't be scrolling 1682 * shouldn't be scrolling
1639 */ 1683 */
1640 sel_scroll_ev.stop(); 1684 sel_scroll_ev.stop();
1641 } 1685 }
1642#endif 1686#endif
1643#ifdef MOUSE_THRESHOLD
1644 } 1687 }
1645#endif
1646 } 1688 }
1647 } 1689 }
1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1649 { 1691 {
1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1651 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1652 ; 1694 ;
1653 1695
1654 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1655 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1658 &unused_mask); 1700 &unused_mask);
1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1660 scrollBar.size ()); 1702 scrollBar.size ());
1661 want_refresh = 1; 1703 want_refresh = 1;
1662 scrollBar.show (1); 1704 scrollBar.show (1);
1663 } 1705 }
1664 break; 1706 break;
1665 } 1707 }
1666 1708
1667#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1668 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1669 {
1670 if (hidden_cursor)
1671 {
1672 hidden_cursor = 0;
1673 want_refresh = 1;
1674 }
1675
1676 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1677 }
1678#endif 1712#endif
1679 1713
1680#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1681 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1716 {
… …
1693 1727
1694 refresh_check (); 1728 refresh_check ();
1695} 1729}
1696 1730
1697#if ENABLE_FRILLS 1731#if ENABLE_FRILLS
1698void 1732void ecb_cold
1699rxvt_term::set_urgency (bool enable) 1733rxvt_term::set_urgency (bool enable)
1700{ 1734{
1701 if (enable == urgency_hint) 1735 if (enable == urgency_hint)
1702 return; 1736 return;
1703 1737
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1705 { 1739 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h); 1741 XSetWMHints (dpy, parent, h);
1708 urgency_hint = enable; 1742 urgency_hint = enable;
1743 XFree (h);
1709 } 1744 }
1710} 1745}
1711#endif 1746#endif
1712 1747
1713void 1748void ecb_cold
1714rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1715{ 1750{
1716 if (!focus) 1751 if (!focus)
1717 { 1752 {
1718 focus = 1; 1753 focus = 1;
1719 want_refresh = 1; 1754 want_refresh = 1;
1720 1755
1721#if USE_XIM 1756#if USE_XIM
1722 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1723 { 1758 {
1724 IMSetPosition (); 1759 im_set_position ();
1725 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1726 } 1761 }
1727#endif 1762#endif
1728#if CURSOR_BLINK 1763#if CURSOR_BLINK
1729 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1731#endif 1766#endif
1732#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1734 { 1769 {
1735 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1771 scr_recolor ();
1737 } 1772 }
1738#endif 1773#endif
1739#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1740 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1741 set_urgency (0); 1776 set_urgency (0);
1777
1778 if (priv_modes & PrivMode_FocusEvent)
1779 tt_printf ("\x1b[I");
1742#endif 1780#endif
1743 1781
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1782 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1745 } 1783 }
1746} 1784}
1747 1785
1748void 1786void ecb_cold
1749rxvt_term::focus_out () 1787rxvt_term::focus_out ()
1750{ 1788{
1751 if (focus) 1789 if (focus)
1752 { 1790 {
1753 focus = 0; 1791 focus = 0;
1754 want_refresh = 1; 1792 want_refresh = 1;
1755 1793
1756#if ENABLE_FRILLS 1794#if ENABLE_FRILLS
1757 if (option (Opt_urgentOnBell)) 1795 if (option (Opt_urgentOnBell))
1758 set_urgency (0); 1796 set_urgency (0);
1797
1798 if (priv_modes & PrivMode_FocusEvent)
1799 tt_printf ("\x1b[O");
1759#endif 1800#endif
1760#if ENABLE_FRILLS || ISO_14755 1801#if ENABLE_FRILLS || ISO_14755
1761 if (iso14755buf) 1802 if (iso14755buf)
1762 { 1803 {
1763 iso14755buf = 0; 1804 iso14755buf = 0;
… …
1778#endif 1819#endif
1779#if OFF_FOCUS_FADING 1820#if OFF_FOCUS_FADING
1780 if (rs[Rs_fade]) 1821 if (rs[Rs_fade])
1781 { 1822 {
1782 pix_colors = pix_colors_unfocused; 1823 pix_colors = pix_colors_unfocused;
1783 scr_recolour (); 1824 scr_recolor ();
1784 } 1825 }
1785#endif 1826#endif
1786 1827
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1828 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1788 } 1829 }
1789} 1830}
1790 1831
1791void 1832void ecb_cold
1792rxvt_term::update_fade_color (unsigned int idx) 1833rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1793{ 1834{
1794#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1796 { 1837 {
1838 if (!first_time)
1839 pix_colors_focused [idx].free (this);
1840
1797 rgba c; 1841 rgba c;
1798 pix_colors [Color_fade].get (c); 1842 pix_colors [Color_fade].get (c);
1799 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1843 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1800 } 1844 }
1801#endif 1845#endif
1802} 1846}
1803 1847
1804#if ENABLE_TRANSPARENCY || ENABLE_PERL 1848#if ENABLE_PERL
1805void 1849void ecb_hot
1806rxvt_term::rootwin_cb (XEvent &ev) 1850rxvt_term::rootwin_cb (XEvent &ev)
1807{ 1851{
1808 make_current (); 1852 make_current ();
1809 1853
1810 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1854 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1811 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1855 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1812 return; 1856 return;
1813 1857
1814# if ENABLE_TRANSPARENCY
1815 switch (ev.type) 1858 switch (ev.type)
1816 { 1859 {
1817 case PropertyNotify: 1860 case PropertyNotify:
1818 /* 1861 /*
1819 * if user used some Esetroot compatible prog to set the root bg, 1862 * if user used some Esetroot compatible prog to set the root bg,
1820 * use the property to determine the pixmap. We use it later on. 1863 * use the property to determine the pixmap. We use it later on.
1821 */ 1864 */
1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1865 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1866 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1824 { 1867 {
1825 bgPixmap.set_root_pixmap (); 1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1826 update_background ();
1827 } 1869 }
1828 1870
1829 break; 1871 break;
1830 } 1872 }
1831# endif
1832 1873
1833 refresh_check (); 1874 refresh_check ();
1834} 1875}
1835#endif 1876#endif
1836 1877
… …
1859 iso14755_54 (ev.x, ev.y); 1900 iso14755_54 (ev.x, ev.y);
1860 return; 1901 return;
1861 } 1902 }
1862#endif 1903#endif
1863 1904
1864 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1905 clickintime = ev.time - MEvent.time < multiClickTime;
1865 1906
1866 if (reportmode) 1907 if (reportmode)
1867 { 1908 {
1868 /* mouse report from vt window */ 1909 /* mouse report from vt window */
1869 /* save the xbutton state (for ButtonRelease) */ 1910 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state; 1911 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK 1912#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime) 1913 if (ev.button == MEvent.button && clickintime)
1873 { 1914 {
1874 /* same button, within alloted time */ 1915 /* same button, within allowed time */
1875 MEvent.clicks++; 1916 MEvent.clicks++;
1876 1917
1877 if (MEvent.clicks > 1) 1918 if (MEvent.clicks > 1)
1878 { 1919 {
1879 /* only report double clicks */ 1920 /* only report double clicks */
… …
1960 if (scrollBar.upButton (ev.y)) 2001 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */ 2002 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y)) 2003 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */ 2004 direction = DN; /* down */
1964 2005
1965 scrollBar.state = STATE_IDLE; 2006 scrollBar.state = SB_STATE_IDLE;
1966 /* 2007 /*
1967 * Rxvt-style scrollbar: 2008 * Rxvt-style scrollbar:
1968 * move up if mouse is above slider 2009 * move up if mouse is above slider
1969 * move dn if mouse is below slider 2010 * move dn if mouse is below slider
1970 * 2011 *
… …
2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2050 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2010#endif 2051#endif
2011 if (scr_page (direction, 1)) 2052 if (scr_page (direction, 1))
2012 { 2053 {
2013 if (direction == UP) 2054 if (direction == UP)
2014 scrollBar.state = STATE_UP; 2055 scrollBar.state = SB_STATE_UP;
2015 else 2056 else
2016 scrollBar.state = STATE_DOWN; 2057 scrollBar.state = SB_STATE_DOWN;
2017 } 2058 }
2018 } 2059 }
2019 else 2060 else
2020 switch (ev.button) 2061 switch (ev.button)
2021 { 2062 {
2022 case Button2: 2063 case Button2:
2023 switch (scrollBar.align) 2064 switch (scrollBar.align)
2024 { 2065 {
2025 case R_SB_ALIGN_TOP: 2066 case SB_ALIGN_TOP:
2026 csrO = 0; 2067 csrO = 0;
2027 break; 2068 break;
2028 case R_SB_ALIGN_CENTRE: 2069 case SB_ALIGN_CENTRE:
2029 csrO = (scrollBar.bot - scrollBar.top) / 2; 2070 csrO = (scrollBar.bot - scrollBar.top) / 2;
2030 break; 2071 break;
2031 case R_SB_ALIGN_BOTTOM: 2072 case SB_ALIGN_BOTTOM:
2032 csrO = scrollBar.bot - scrollBar.top; 2073 csrO = scrollBar.bot - scrollBar.top;
2033 break; 2074 break;
2034 } 2075 }
2035 2076
2036 if (scrollBar.style == R_SB_XTERM 2077 if (scrollBar.style == SB_STYLE_XTERM
2037 || scrollbar_above_slider (ev.y) 2078 || scrollBar.above_slider (ev.y)
2038 || scrollbar_below_slider (ev.y)) 2079 || scrollBar.below_slider (ev.y))
2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2080 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2040 2081
2041 scrollBar.state = STATE_MOTION; 2082 scrollBar.state = SB_STATE_MOTION;
2042 break; 2083 break;
2043 2084
2044 case Button1: 2085 case Button1:
2045 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2086 if (scrollBar.align == SB_ALIGN_CENTRE)
2046 csrO = ev.y - scrollBar.top; 2087 csrO = ev.y - scrollBar.top;
2047 /* FALLTHROUGH */ 2088 /* FALLTHROUGH */
2048 2089
2049 case Button3: 2090 case Button3:
2050 if (scrollBar.style != R_SB_XTERM) 2091 if (scrollBar.style != SB_STYLE_XTERM)
2051 { 2092 {
2052 if (scrollbar_above_slider (ev.y)) 2093 if (scrollBar.above_slider (ev.y))
2053# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2054 scr_page (UP, nrow - 1); 2095 scr_page (UP, nrow - 1);
2055# else 2096# else
2056 scr_page (UP, nrow / 4); 2097 scr_page (UP, nrow / 4);
2057# endif 2098# endif
2058 else if (scrollbar_below_slider (ev.y)) 2099 else if (scrollBar.below_slider (ev.y))
2059# ifdef RXVT_SCROLL_FULL 2100# ifdef RXVT_SCROLL_FULL
2060 scr_page (DN, nrow - 1); 2101 scr_page (DN, nrow - 1);
2061# else 2102# else
2062 scr_page (DN, nrow / 4); 2103 scr_page (DN, nrow / 4);
2063# endif 2104# endif
2064 else 2105 else
2065 scrollBar.state = STATE_MOTION; 2106 scrollBar.state = SB_STATE_MOTION;
2066 } 2107 }
2067 else 2108 else
2068 { 2109 {
2069 scr_page ((ev.button == Button1 ? DN : UP), 2110 scr_page ((ev.button == Button1 ? DN : UP),
2070 (nrow 2111 (nrow
2071 * scrollbar_position (ev.y) 2112 * scrollBar.position (ev.y)
2072 / scrollBar.size ())); 2113 / scrollBar.size ()));
2073 } 2114 }
2074 2115
2075 break; 2116 break;
2076 } 2117 }
… …
2087 2128
2088 csrO = 0; /* reset csr Offset */ 2129 csrO = 0; /* reset csr Offset */
2089 if (!bypass_keystate) 2130 if (!bypass_keystate)
2090 reportmode = !! (priv_modes & PrivMode_mouse_report); 2131 reportmode = !! (priv_modes & PrivMode_mouse_report);
2091 2132
2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2133 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2093 { 2134 {
2094 scrollBar.state = STATE_IDLE; 2135 scrollBar.state = SB_STATE_IDLE;
2095 scrollBar.show (0); 2136 scrollBar.show (0);
2096 } 2137 }
2097 2138
2098#ifdef SELECTION_SCROLLING 2139#ifdef SELECTION_SCROLLING
2099 sel_scroll_ev.stop(); 2140 sel_scroll_ev.stop();
… …
2112 2153
2113 if (reportmode) 2154 if (reportmode)
2114 { 2155 {
2115 /* mouse report from vt window */ 2156 /* mouse report from vt window */
2116 /* don't report release of wheel "buttons" */ 2157 /* don't report release of wheel "buttons" */
2117 if (ev.button >= 4) 2158 if (ev.button >= 4 && ev.button <= 7)
2118 return; 2159 return;
2119#ifdef MOUSE_REPORT_DOUBLECLICK 2160#ifdef MOUSE_REPORT_DOUBLECLICK
2120 /* only report the release of 'slow' single clicks */ 2161 /* only report the release of 'slow' single clicks */
2121 if (MEvent.button != AnyButton 2162 if (MEvent.button != AnyButton
2122 && (ev.button != MEvent.button 2163 && (ev.button != MEvent.button
2123 || (ev.time - MEvent.time 2164 || (ev.time - MEvent.time
2124 > MULTICLICK_TIME / 2))) 2165 > multiClickTime / 2)))
2125 { 2166 {
2126 MEvent.clicks = 0; 2167 MEvent.clicks = 0;
2127 MEvent.button = AnyButton; 2168 MEvent.button = ev.button;
2128 mouse_report (ev); 2169 mouse_report (ev);
2129 } 2170 }
2130#else /* MOUSE_REPORT_DOUBLECLICK */ 2171#else /* MOUSE_REPORT_DOUBLECLICK */
2131 MEvent.button = AnyButton; 2172 MEvent.button = ev.button;
2132 mouse_report (ev); 2173 mouse_report (ev);
2133#endif /* MOUSE_REPORT_DOUBLECLICK */ 2174#endif /* MOUSE_REPORT_DOUBLECLICK */
2134 return; 2175 return;
2135 } 2176 }
2136 2177
… …
2149 case Button3: 2190 case Button3:
2150 selection_make (ev.time); 2191 selection_make (ev.time);
2151 break; 2192 break;
2152 2193
2153 case Button2: 2194 case Button2:
2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2195 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2196 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2156 break; 2197 break;
2157 2198
2158#ifdef MOUSE_WHEEL 2199#ifdef MOUSE_WHEEL
2159 case Button4: 2200 case Button4:
2160 case Button5: 2201 case Button5:
2161 { 2202 {
2162 int i; 2203 int lines;
2163 page_dirn v; 2204 page_dirn dirn;
2164 2205
2165 v = ev.button == Button4 ? UP : DN; 2206 dirn = ev.button == Button4 ? UP : DN;
2166 2207
2167 if (ev.state & ShiftMask) 2208 if (ev.state & ShiftMask)
2168 i = 1; 2209 lines = 1;
2169 else if (option (Opt_mouseWheelScrollPage)) 2210 else if (option (Opt_mouseWheelScrollPage))
2170 i = nrow - 1; 2211 lines = nrow - 1;
2171 else 2212 else
2172 i = 5; 2213 lines = 5;
2173 2214
2174# ifdef MOUSE_SLIP_WHEELING 2215# ifdef MOUSE_SLIP_WHEELING
2175 if (ev.state & ControlMask) 2216 if (ev.state & ControlMask)
2176 { 2217 {
2177 mouse_slip_wheel_speed += v ? -1 : 1; 2218 mouse_slip_wheel_speed += dirn;
2178 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2219 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2179 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2180 2220
2181 if (!slip_wheel_ev.is_active ()) 2221 if (!slip_wheel_ev.is_active ())
2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2183 } 2223 }
2184 else 2224 else
2185# endif 2225# endif
2186 { 2226 {
2187 scr_page (v, i); 2227 scr_page (dirn, lines);
2188 scrollBar.show (1); 2228 scrollBar.show (1);
2189 } 2229 }
2190 } 2230 }
2191 break; 2231 break;
2192#endif 2232#endif
… …
2194 } 2234 }
2195} 2235}
2196 2236
2197/*}}} */ 2237/*}}} */
2198 2238
2199void 2239void ecb_hot
2200rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2201{ 2241{
2202 wchar_t ch = NOCHAR; 2242 wchar_t ch = NOCHAR;
2203 char *seq_begin; // remember start of esc-sequence here 2243 char *seq_begin; // remember start of esc-sequence here
2204 2244
2205 for (;;) 2245 for (;;)
2206 { 2246 {
2207 if (expect_false (ch == NOCHAR)) 2247 if (ecb_unlikely (ch == NOCHAR))
2208 { 2248 {
2209 seq_begin = cmdbuf_ptr; 2249 seq_begin = cmdbuf_ptr;
2210 ch = next_char (); 2250 ch = next_char ();
2211 2251
2212 if (ch == NOCHAR) 2252 if (ch == NOCHAR)
2213 break; 2253 break;
2214 } 2254 }
2215 2255
2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2256 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2217 { 2257 {
2218 if (expect_false (!seen_input)) 2258 if (ecb_unlikely (!seen_input))
2219 { 2259 {
2220 seen_input = 1; 2260 seen_input = 1;
2221 // many badly-written programs (e.g. jed) contain a race condition: 2261 // many badly-written programs (e.g. jed) contain a race condition:
2222 // they first read the screensize and then install a SIGWINCH handler. 2262 // they first read the screensize and then install a SIGWINCH handler.
2223 // some window managers resize the window early, and these programs 2263 // some window managers resize the window early, and these programs
… …
2236 wchar_t *str = buf; 2276 wchar_t *str = buf;
2237 wchar_t *eol = str + min (ncol, UBUFSIZ); 2277 wchar_t *eol = str + min (ncol, UBUFSIZ);
2238 2278
2239 for (;;) 2279 for (;;)
2240 { 2280 {
2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2281 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2242 break; 2282 break;
2243 2283
2244 *str++ = ch; 2284 *str++ = ch;
2245 2285
2246 if (expect_false (ch == C0_LF || str >= eol)) 2286 if (ecb_unlikely (ch == C0_LF || str >= eol))
2247 { 2287 {
2248 if (ch == C0_LF) 2288 if (ch == C0_LF)
2249 nlines++; 2289 nlines++;
2250 2290
2251 refresh_count++; 2291 refresh_count++;
… …
2323 } 2363 }
2324 } 2364 }
2325} 2365}
2326 2366
2327// read the next character 2367// read the next character
2328wchar_t 2368wchar_t ecb_hot
2329rxvt_term::next_char () NOTHROW 2369rxvt_term::next_char () noexcept
2330{ 2370{
2331 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2332 { 2372 {
2333 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2374 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2335 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2336 2376
2337 wchar_t wc; 2377 wchar_t wc;
2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2339 2379
… …
2345 } 2385 }
2346 2386
2347 if (len == (size_t)-1) 2387 if (len == (size_t)-1)
2348 { 2388 {
2349 mbstate.reset (); // reset now undefined conversion state 2389 mbstate.reset (); // reset now undefined conversion state
2390 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2391 // in which case we "erroneously" return the next byte which might be valid.
2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2351 } 2393 }
2352 2394
2353 // assume wchar == unicode 2395 // assume wchar == unicode
2354 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
… …
2357 2399
2358 return NOCHAR; 2400 return NOCHAR;
2359} 2401}
2360 2402
2361// read the next octet 2403// read the next octet
2362uint32_t 2404uint32_t ecb_hot
2363rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () noexcept
2364{ 2406{
2365 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2366 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2367 : NOCHAR; 2409 : NOCHAR;
2368} 2410}
2369 2411
2370static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2371 2413
2372/* rxvt_cmd_getc () - Return next input character */ 2414wchar_t ecb_hot
2373/* 2415rxvt_term::cmd_getc ()
2374 * Return the next input character after first passing any keyboard input
2375 * to the command.
2376 */
2377wchar_t
2378rxvt_term::cmd_getc () THROW ((class out_of_input))
2379{ 2416{
2380 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2381 2418
2382 if (c == NOCHAR) 2419 if (c == NOCHAR)
2383 throw out_of_input; 2420 throw out_of_input;
2384 2421
2385 return c; 2422 return c;
2386} 2423}
2387 2424
2388uint32_t 2425uint32_t ecb_hot
2389rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 ()
2390{ 2427{
2391 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2392 2429
2393 if (c == NOCHAR) 2430 if (c == NOCHAR)
2394 throw out_of_input; 2431 throw out_of_input;
… …
2397} 2434}
2398 2435
2399/*{{{ print pipe */ 2436/*{{{ print pipe */
2400/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2401#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2402FILE * 2439FILE * ecb_cold
2403rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2404{ 2441{
2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406 2443
2407 if (stream == NULL) 2444 if (stream == NULL)
2408 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2409 2446
2410 return stream; 2447 return stream;
2411} 2448}
2412 2449
2413int 2450int ecb_cold
2414rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2415{ 2452{
2416 fflush (stream); 2453 fflush (stream);
2417 return pclose (stream); 2454 return pclose (stream);
2418} 2455}
2419 2456
2420/* 2457/*
2421 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2422 */ 2459 */
2423void 2460void ecb_cold
2424rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2425{ 2462{
2426 FILE *fd = popen_printer (); 2463 FILE *fd = popen_printer ();
2427 2464
2428 if (!fd) 2465 if (!fd)
… …
2474 pclose_printer (fd); 2511 pclose_printer (fd);
2475} 2512}
2476#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2477/*}}} */ 2514/*}}} */
2478 2515
2479/* *INDENT-OFF* */
2480enum { 2516enum {
2481 C1_40 = 0x40, 2517 C1_40 = 0x40,
2482 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2518 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2483 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2519 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2484 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2485 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2486}; 2522};
2487/* *INDENT-ON* */
2488 2523
2489/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2490void 2525void ecb_hot
2491rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2492{ 2527{
2493 switch (ch) 2528 switch (ch)
2494 { 2529 {
2495 case C0_ESC: 2530 case C0_ESC:
… …
2525 scr_charset_choose (0); 2560 scr_charset_choose (0);
2526 break; 2561 break;
2527 2562
2528#ifdef EIGHT_BIT_CONTROLS 2563#ifdef EIGHT_BIT_CONTROLS
2529 // 8-bit controls 2564 // 8-bit controls
2530 case 0x90: /* DCS */ 2565 case 0x90: /* DCS */
2531 process_dcs_seq (); 2566 process_dcs_seq ();
2532 break; 2567 break;
2533 case 0x9b: /* CSI */ 2568 case 0x9b: /* CSI */
2534 process_csi_seq (); 2569 process_csi_seq ();
2535 break; 2570 break;
2536 case 0x9d: /* OSC */ 2571 case 0x9d: /* OSC */
2537 process_osc_seq (); 2572 process_osc_seq ();
2538 break; 2573 break;
2539#endif 2574#endif
2540 } 2575 }
2541} 2576}
2542/*}}} */ 2577/*}}} */
2543 2578
2544 2579
2545/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2546void 2581void ecb_cold
2547rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2548{ 2583{
2549 int row, col; 2584 int row, col;
2550 2585
2551 switch (ch) 2586 switch (ch)
… …
2585 break; 2620 break;
2586 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2588 break; 2623 break;
2589 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
2590 set_privmode (PrivMode_vt52, 0); 2625 priv_modes &= ~PrivMode_vt52;
2591 break; 2626 break;
2592 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
2593 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
2594 /* unimplemented */ 2629 /* unimplemented */
2595 break; 2630 break;
… …
2601} 2636}
2602/*}}} */ 2637/*}}} */
2603 2638
2604 2639
2605/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
2606void 2641void ecb_hot
2607rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
2608{ 2643{
2609 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
2610 2645
2611 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
2614 return; 2649 return;
2615 } 2650 }
2616 2651
2617 switch (ch) 2652 switch (ch)
2618 { 2653 {
2619 /* case 1: do_tek_mode (); break; */
2620 case '#': 2654 case '#':
2621 if (cmd_getc () == '8') 2655 if (cmd_getc () == '8')
2622 scr_E (); 2656 scr_E ();
2623 break; 2657 break;
2624 case '(': 2658 case '(':
… …
2647#if !ENABLE_MINIMAL 2681#if !ENABLE_MINIMAL
2648 case '9': 2682 case '9':
2649 scr_forwardindex (); 2683 scr_forwardindex ();
2650 break; 2684 break;
2651#endif 2685#endif
2686 // DECPAM/DECPNM
2652 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
2653 case '>': 2690 case '>':
2654 set_privmode (PrivMode_aplKP, ch == '='); 2691 priv_modes &= ~PrivMode_aplKP;
2655 break; 2692 break;
2656 2693
2657 case C1_40: 2694 case C1_40:
2658 cmd_getc (); 2695 cmd_getc ();
2659 break; 2696 break;
… …
2663 2700
2664 /* 8.3.87: NEXT LINE */ 2701 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2702 case C1_NEL: /* ESC E */
2666 { 2703 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2669 } 2706 }
2670 break; 2707 break;
2671 2708
2709#if 0 // disabled because embedded newlines can make exploits easier
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
2674 process_graphics (); 2712 // used by original rxvt for rob nations own graphics mode
2713 if (cmd_getc () == 'Q' && option (Opt_insecure))
2714 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2675 break; 2715 break;
2716#endif
2676 2717
2677 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2678 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2679 scr_set_tab (1); 2720 scr_set_tab (1);
2680 break; 2721 break;
… …
2683 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
2684 scr_index (DN); 2725 scr_index (DN);
2685 break; 2726 break;
2686 2727
2687 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
2688 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
2689 2730
2690 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
2691 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
2692 2733
2693 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
2694 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
2695 process_dcs_seq (); 2736 process_dcs_seq ();
2696 break; 2737 break;
… …
2729 } 2770 }
2730} 2771}
2731/*}}} */ 2772/*}}} */
2732 2773
2733/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2734/* *INDENT-OFF* */
2735enum { 2775enum {
2736 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2737 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2738 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2739 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2742 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2743 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2783 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2744 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2784 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2745}; 2785};
2746 2786
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2787#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2788 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2789 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2790#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2791 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2792
2753const unsigned char csi_defaults[] = 2793static const unsigned char csi_defaults[] =
2754 { 2794 {
2755 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2795 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2756 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2796 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2757 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2758 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2759 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2760 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2761 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2762 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2763 }; 2803 };
2764/* *INDENT-ON* */
2765 2804
2766void 2805void ecb_hot
2767rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2768{ 2807{
2769 unicode_t ch, priv, i; 2808 unicode_t ch, priv, prev_ch, i;
2770 unsigned int nargs, p; 2809 unsigned int nargs, p;
2771 int n, ndef; 2810 int n, ndef;
2772 int arg[ESC_ARGS] = { }; 2811 int arg[ESC_ARGS] = { };
2773 2812
2774 nargs = 0; 2813 nargs = 0;
… …
2780 /* '<' '=' '>' '?' '!' */ 2819 /* '<' '=' '>' '?' '!' */
2781 priv = ch; 2820 priv = ch;
2782 ch = cmd_getc (); 2821 ch = cmd_getc ();
2783 } 2822 }
2784 2823
2824 prev_ch = 0;
2785 /* read any numerical arguments */ 2825 /* read any numerical arguments */
2786 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
2787 { 2827 {
2788 if (isdigit (ch)) 2828 if (isdigit (ch))
2789 { 2829 {
… …
2799 n = -1; 2839 n = -1;
2800 } 2840 }
2801 else if (IS_CONTROL (ch)) 2841 else if (IS_CONTROL (ch))
2802 process_nonprinting (ch); 2842 process_nonprinting (ch);
2803 2843
2844 prev_ch = ch;
2804 ch = cmd_getc (); 2845 ch = cmd_getc ();
2805 } 2846 }
2806 2847
2807 if (ch > CSI_7F) 2848 if (ch > CSI_7F)
2808 return; 2849 return;
… …
2838 break; 2879 break;
2839 2880
2840 case '?': 2881 case '?':
2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2882 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2842 process_terminal_mode (ch, priv, nargs, arg); 2883 process_terminal_mode (ch, priv, nargs, arg);
2884 if (prev_ch == '$' && ch == 'p')
2885 process_terminal_mode (ch, priv, nargs, arg);
2843 break; 2886 break;
2844 2887
2845 case '!': 2888 case '!':
2846 if (ch == CSI_70) 2889 if (ch == CSI_70)
2847 { 2890 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2891 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2892 scr_soft_reset ();
2850 2893
2851 static const int pm_h[] = { 7, 25 }; 2894 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2895 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2853 2896
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2897 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2898 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2856 } 2899 }
2857 break; 2900 break;
2858 } 2901 }
2859 2902
2860 return; 2903 return;
… …
2878 } 2921 }
2879 break; 2922 break;
2880#endif 2923#endif
2881 2924
2882 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2925 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2883 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2926 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2884 arg[0] = -arg[0]; 2927 arg[0] = -arg[0];
2885 /* FALLTHROUGH */ 2928 /* FALLTHROUGH */
2886 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2929 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2887 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2930 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2888 scr_gotorc (arg[0], 0, RELATIVE); 2931 scr_gotorc (arg[0], 0, RELATIVE);
2889 break; 2932 break;
2890 2933
2891 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2934 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2892 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2935 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2893#ifdef ISO6429 2936#ifdef ISO6429
2894 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
2895#else /* emulate common DEC VTs */ 2938#else /* emulate common DEC VTs */
2896 arg[0] = arg[0] ? -arg[0] : -1; 2939 arg[0] = arg[0] ? -arg[0] : -1;
2897#endif 2940#endif
… …
2988 case 7: /* unofficial extension */ 3031 case 7: /* unofficial extension */
2989 if (option (Opt_insecure)) 3032 if (option (Opt_insecure))
2990 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3033 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2991 break; 3034 break;
2992 case 8: /* unofficial extension */ 3035 case 8: /* unofficial extension */
3036 {
3037 string_term st;
3038 st.v[0] = CHAR_ST;
3039 st.v[1] = '\0';
2993 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3040 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
2994 break; 3041 break;
3042 }
2995 } 3043 }
2996 break; 3044 break;
2997 3045
2998 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3046 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2999 switch (arg[0]) 3047 switch (arg[0])
… …
3042 scr_insert_mode (1); 3090 scr_insert_mode (1);
3043 else if (arg[0] == 20) 3091 else if (arg[0] == 20)
3044 priv_modes |= PrivMode_LFNL; 3092 priv_modes |= PrivMode_LFNL;
3045 break; 3093 break;
3046 3094
3095 case CSI_71: // DECSCUSR: set cursor style
3096 if (prev_ch == ' ')
3097 set_cursor_style (arg[0]);
3098 break;
3099
3047 /* 3100 /*
3048 * PRIVATE USE beyond this point. All CSI_7? sequences here 3101 * PRIVATE USE beyond this point. All CSI_7? sequences here
3049 */ 3102 */
3050 case CSI_72: /* DECSTBM: set top and bottom margins */ 3103 case CSI_72: /* DECSTBM: set top and bottom margins */
3051 if (nargs == 1) 3104 if (nargs == 1)
… …
3079 } 3132 }
3080} 3133}
3081/*}}} */ 3134/*}}} */
3082 3135
3083#if !ENABLE_MINIMAL 3136#if !ENABLE_MINIMAL
3084/* ARGSUSED */
3085void 3137void
3086rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3138rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3087{ 3139{
3088 int x, y; 3140 int x, y;
3089 XWindowAttributes wattr; 3141 XWindowAttributes wattr;
… …
3098 { 3150 {
3099 /* 3151 /*
3100 * commands 3152 * commands
3101 */ 3153 */
3102 case 1: /* deiconify window */ 3154 case 1: /* deiconify window */
3103 XMapWindow (dpy, parent[0]); 3155 XMapWindow (dpy, parent);
3104 break; 3156 break;
3105 case 2: /* iconify window */ 3157 case 2: /* iconify window */
3106 XIconifyWindow (dpy, parent[0], display->screen); 3158 XIconifyWindow (dpy, parent, display->screen);
3107 break; 3159 break;
3108 case 3: /* set position (pixels) */ 3160 case 3: /* set position (pixels) */
3109 XMoveWindow (dpy, parent[0], args[1], args[2]); 3161 XMoveWindow (dpy, parent, args[1], args[2]);
3110 break; 3162 break;
3111 case 4: /* set size (pixels) */ 3163 case 4: /* set size (pixels) */
3112 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3164 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3113 break; 3165 break;
3114 case 5: /* raise window */ 3166 case 5: /* raise window */
3115 XRaiseWindow (dpy, parent[0]); 3167 XRaiseWindow (dpy, parent);
3116 break; 3168 break;
3117 case 6: /* lower window */ 3169 case 6: /* lower window */
3118 XLowerWindow (dpy, parent[0]); 3170 XLowerWindow (dpy, parent);
3119 break; 3171 break;
3120 case 7: /* refresh window */ 3172 case 7: /* refresh window */
3121 scr_touch (true); 3173 scr_touch (true);
3122 break; 3174 break;
3123 case 8: /* set size (chars) */ 3175 case 8: /* set size (chars) */
… …
3126 break; 3178 break;
3127 3179
3128 //case 9: NYI, TODO, restore maximized window or maximize window 3180 //case 9: NYI, TODO, restore maximized window or maximize window
3129 default: 3181 default:
3130 if (args[0] >= 24) /* set height (chars) */ 3182 if (args[0] >= 24) /* set height (chars) */
3131 set_widthheight ((unsigned int)width, 3183 set_widthheight ((unsigned int)vt_width,
3132 (unsigned int) (args[1] * fheight)); 3184 (unsigned int) (args[1] * fheight));
3133 break; 3185 break;
3134 3186
3135 /* 3187 /*
3136 * reports - some output format copied from XTerm 3188 * reports - some output format copied from XTerm
3137 */ 3189 */
3138 case 11: /* report window state */ 3190 case 11: /* report window state */
3139 XGetWindowAttributes (dpy, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3140 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3192 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3141 break; 3193 break;
3142 case 13: /* report window position */ 3194 case 13: /* report window position */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3195 XGetWindowAttributes (dpy, parent, &wattr);
3144 XTranslateCoordinates (dpy, parent[0], wattr.root, 3196 XTranslateCoordinates (dpy, parent, wattr.root,
3145 -wattr.border_width, -wattr.border_width, 3197 -wattr.border_width, -wattr.border_width,
3146 &x, &y, &wdummy); 3198 &x, &y, &wdummy);
3147 tt_printf ("\033[3;%d;%dt", x, y); 3199 tt_printf ("\033[3;%d;%dt", x, y);
3148 break; 3200 break;
3149 case 14: /* report window size (pixels) */ 3201 case 14: /* report window size (pixels) */
3150 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3151 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3203 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3152 break; 3204 break;
3153 case 18: /* report text area size (chars) */ 3205 case 18: /* report text area size (chars) */
3154 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3206 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3155 break; 3207 break;
… …
3157 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3209 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3158 break; 3210 break;
3159 case 20: /* report icon label */ 3211 case 20: /* report icon label */
3160 { 3212 {
3161 char *s; 3213 char *s;
3162 XGetIconName (dpy, parent[0], &s); 3214 XGetIconName (dpy, parent, &s);
3163 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3215 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164 XFree (s); 3216 XFree (s);
3165 } 3217 }
3166 break; 3218 break;
3167 case 21: /* report window title */ 3219 case 21: /* report window title */
3168 { 3220 {
3169 char *s; 3221 char *s;
3170 XFetchName (dpy, parent[0], &s); 3222 XFetchName (dpy, parent, &s);
3171 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3223 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3172 XFree (s); 3224 XFree (s);
3173 } 3225 }
3174 break; 3226 break;
3175 } 3227 }
… …
3180/* 3232/*
3181 * get input up until STRING TERMINATOR (or BEL) 3233 * get input up until STRING TERMINATOR (or BEL)
3182 * ends_how is terminator used. returned input must be free()'d 3234 * ends_how is terminator used. returned input must be free()'d
3183 */ 3235 */
3184char * 3236char *
3185rxvt_term::get_to_st (unicode_t &ends_how) 3237rxvt_term::get_to_st (string_term &st)
3186{ 3238{
3187 unicode_t ch; 3239 unicode_t ch;
3188 bool seen_esc = false; 3240 bool seen_esc = false;
3189 unsigned int n = 0; 3241 unsigned int n = 0;
3190 wchar_t string[STRING_MAX]; 3242 wchar_t string[CBUFSIZ];
3191 3243
3192 while ((ch = cmd_getc ()) != NOCHAR) 3244 while ((ch = cmd_getc ()) != NOCHAR)
3193 { 3245 {
3194 if (seen_esc) 3246 if (seen_esc)
3195 { 3247 {
… …
3210 else if (ch < 0x20) 3262 else if (ch < 0x20)
3211 return NULL; /* other control character - exit */ 3263 return NULL; /* other control character - exit */
3212 3264
3213 seen_esc = false; 3265 seen_esc = false;
3214 3266
3215 if (n >= STRING_MAX - 1) 3267 if (n >= sizeof (string) - 1)
3216 // stop at some sane length 3268 // stop at some sane length
3217 return NULL; 3269 return NULL;
3218 3270
3219 string[n++] = ch; 3271 string[n++] = ch;
3220 } 3272 }
3221 3273
3222 string[n++] = '\0'; 3274 string[n++] = '\0';
3223 3275
3224 ends_how = (ch == 0x5c ? C0_ESC : ch); 3276 n = 0;
3277 if (ch == 0x5c)
3278 st.v[n++] = C0_ESC;
3279 st.v[n++] = ch;
3280 st.v[n] = '\0';
3225 3281
3226 return rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3227} 3283}
3228 3284
3229/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
… …
3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3287 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3232 */ 3288 */
3233void 3289void
3234rxvt_term::process_dcs_seq () 3290rxvt_term::process_dcs_seq ()
3235{ 3291{
3236 char *s;
3237 unicode_t eh;
3238
3239 /* 3292 /*
3240 * Not handled yet 3293 * Not handled yet
3241 */ 3294 */
3295
3296 string_term st;
3242 s = get_to_st (eh); 3297 char *s = get_to_st (st);
3243 if (s) 3298 if (s)
3244 free (s); 3299 free (s);
3245 3300
3246 return; 3301 return;
3247} 3302}
… …
3251 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3306 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3252 */ 3307 */
3253void 3308void
3254rxvt_term::process_osc_seq () 3309rxvt_term::process_osc_seq ()
3255{ 3310{
3256 unicode_t ch, eh;
3257 int arg; 3311 int arg;
3258 3312
3259 ch = cmd_getc (); 3313 unicode_t ch = cmd_getc ();
3260 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3261 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3262 3316
3263 if (ch == ';') 3317 if (ch == ';')
3264 { 3318 {
3319 string_term st;
3265 char *s = get_to_st (eh); 3320 char *s = get_to_st (st);
3266 3321
3267 if (s) 3322 if (s)
3268 { 3323 {
3269 process_xterm_seq (arg, s, eh); 3324 process_xterm_seq (arg, s, st);
3270 free (s); 3325 free (s);
3271 } 3326 }
3272 } 3327 }
3273} 3328}
3274 3329
3330static unsigned int
3331colorcube_index (unsigned int idx_r,
3332 unsigned int idx_g,
3333 unsigned int idx_b)
3334{
3335 assert (idx_r < Red_levels);
3336 assert (idx_g < Green_levels);
3337 assert (idx_b < Blue_levels);
3338
3339 return idx_r * Blue_levels * Green_levels +
3340 idx_g * Blue_levels +
3341 idx_b;
3342}
3343
3344/*
3345 * Find the nearest color slot in the hidden color cube,
3346 * adapt its value to the 32bit RGBA color.
3347 */
3348unsigned int
3349rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3350{
3351 r &= 0xff;
3352 g &= 0xff;
3353 b &= 0xff;
3354 a &= 0xff;
3355
3356 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3357
3358 /* we allow one of the 6 closest neighbouring colours */
3359 /* to replace the current color, if they not used recently */
3360 #if 0
3361 static const unsigned char dxyz[][3] = {
3362 0, 0, 0,
3363 0, 0, 4,
3364 0, 4, 4,
3365 4, 4, 0,
3366 4, 0, 4,
3367 0, 4, 0,
3368 4, 0, 0,
3369 };
3370 #else
3371 // silly compressed verlapping triplets version of above
3372 static const unsigned char dxyz[] = {
3373 0, 0, 0, 4, 4, 0, 4, 0, 0,
3374 };
3375 #endif
3376
3377 static const unsigned char color_level[8][32] = {
3378 // neighbour index
3379 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3380 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3381 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3382 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3383 // Red_levels/Green_levels/Blue_levels index
3384 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3385 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3386 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3387 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3388 };
3389
3390 unsigned int idx;
3391
3392 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3393 {
3394 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3395 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3396 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3397 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3398
3399 if (n == 0)
3400 idx = index;
3401
3402 if (rgb24_color[index] == color)
3403 {
3404 rgb24_seqno[index] = ++rgb24_sequence;
3405 return index + minTermCOLOR24;
3406 }
3407
3408 // minor issue: could update index 0 few more times
3409 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3410 {
3411 idx = index;
3412 goto update;
3413 }
3414
3415 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3416 // but also handles wrap around values well enough
3417 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3418 idx = index;
3419 }
3420
3421update:
3422 rgb24_color[idx] = color;
3423 rgb24_seqno[idx] = ++rgb24_sequence;
3424
3425 idx += minTermCOLOR24;
3426 pix_colors_focused [idx].free (this);
3427 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3428 update_fade_color (idx, false);
3429
3430 return idx;
3431}
3432
3275void 3433void
3276rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3434rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3277{ 3435{
3278 if (str[0] == '?' && !str[1]) 3436 if (str[0] == '?' && !str[1])
3279 { 3437 {
3280 rgba c; 3438 rgba c;
3281 pix_colors_focused[color].get (c); 3439 pix_colors_focused[color].get (c);
3440 char rgba_str[32];
3282 3441
3283#if XFT 3442#if XFT
3284 if (c.a != rgba::MAX_CC) 3443 if (c.a != rgba::MAX_CC)
3285 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3444 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3286 else 3445 else
3287#endif 3446#endif
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3447 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3448
3449 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3450 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3451 else
3452 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3289 } 3453 }
3290 else 3454 else
3291 set_window_color (color, str); 3455 set_window_color (color, str);
3292} 3456}
3293 3457
3294/* 3458/*
3295 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3459 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3296 */ 3460 */
3297void 3461void
3298rxvt_term::process_xterm_seq (int op, char *str, char resp) 3462rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3299{ 3463{
3300 int color; 3464 int color;
3301 char *buf, *name; 3465 char *buf, *name;
3302 bool query = str[0] == '?' && !str[1]; 3466 bool query = str[0] == '?' && !str[1];
3303 int saveop = op; 3467 int saveop = op;
… …
3330 unsigned long bytes_after; 3494 unsigned long bytes_after;
3331 unsigned char *value = 0; 3495 unsigned char *value = 0;
3332 const char *str = ""; 3496 const char *str = "";
3333 3497
3334 if (prop 3498 if (prop
3335 && XGetWindowProperty (dpy, parent[0], 3499 && XGetWindowProperty (dpy, parent,
3336 prop, 0, 1<<16, 0, AnyPropertyType, 3500 prop, 0, 1<<16, 0, AnyPropertyType,
3337 &actual_type, &actual_format, 3501 &actual_type, &actual_format,
3338 &nitems, &bytes_after, &value) == Success 3502 &nitems, &bytes_after, &value) == Success
3339 && actual_type != None 3503 && actual_type != None
3340 && actual_format == 8) 3504 && actual_format == 8)
3341 str = (const char *)(value); 3505 str = (const char *)(value);
3342 3506
3343 tt_printf ("\033]%d;%s%c", op, str, resp); 3507 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3344 3508
3345 XFree (value); 3509 XFree (value);
3346 } 3510 }
3347 else 3511 else
3348 { 3512 {
… …
3352 { 3516 {
3353 *eq = 0; 3517 *eq = 0;
3354 set_utf8_property (display->atom (str), eq + 1); 3518 set_utf8_property (display->atom (str), eq + 1);
3355 } 3519 }
3356 else 3520 else
3357 XDeleteProperty (dpy, parent[0], 3521 XDeleteProperty (dpy, parent,
3358 display->atom (str)); 3522 display->atom (str));
3359 } 3523 }
3360 break; 3524 break;
3361 3525
3362 case XTerm_Color: 3526 case XTerm_Color:
… …
3372 break; 3536 break;
3373 3537
3374 if ((buf = strchr (name, ';')) != NULL) 3538 if ((buf = strchr (name, ';')) != NULL)
3375 *buf++ = '\0'; 3539 *buf++ = '\0';
3376 3540
3377 process_color_seq (op, color, name, resp); 3541 process_color_seq (op, color, name, st);
3378 } 3542 }
3379 break; 3543 break;
3380 case Rxvt_restoreFG: 3544 case Rxvt_restoreFG:
3381 case XTerm_Color00: 3545 case XTerm_Color00:
3382 process_color_seq (op, Color_fg, str, resp); 3546 process_color_seq (op, Color_fg, str, st);
3383 break; 3547 break;
3384 case Rxvt_restoreBG: 3548 case Rxvt_restoreBG:
3385 case XTerm_Color01: 3549 case XTerm_Color01:
3386 process_color_seq (op, Color_bg, str, resp); 3550 process_color_seq (op, Color_bg, str, st);
3387 break; 3551 break;
3388#ifndef NO_CURSORCOLOR 3552#ifndef NO_CURSORCOLOR
3389 case XTerm_Color_cursor: 3553 case XTerm_Color_cursor:
3390 process_color_seq (op, Color_cursor, str, resp); 3554 process_color_seq (op, Color_cursor, str, st);
3391 break; 3555 break;
3392#endif 3556#endif
3393 case XTerm_Color_pointer_fg: 3557 case XTerm_Color_pointer_fg:
3394 process_color_seq (op, Color_pointer_fg, str, resp); 3558 process_color_seq (op, Color_pointer_fg, str, st);
3395 break; 3559 break;
3396 case XTerm_Color_pointer_bg: 3560 case XTerm_Color_pointer_bg:
3397 process_color_seq (op, Color_pointer_bg, str, resp); 3561 process_color_seq (op, Color_pointer_bg, str, st);
3398 break; 3562 break;
3399#ifdef OPTION_HC 3563#ifdef OPTION_HC
3400 case XTerm_Color_HC: 3564 case XTerm_Color_HC:
3401 process_color_seq (op, Color_HC, str, resp); 3565 process_color_seq (op, Color_HC, str, st);
3402 break; 3566 break;
3403 case XTerm_Color_HTC: 3567 case XTerm_Color_HTC:
3404 process_color_seq (op, Color_HTC, str, resp); 3568 process_color_seq (op, Color_HTC, str, st);
3405 break; 3569 break;
3406#endif 3570#endif
3407#ifndef NO_BOLD_UNDERLINE_REVERSE 3571#ifndef NO_BOLD_UNDERLINE_REVERSE
3408 case URxvt_Color_BD: 3572 case URxvt_Color_BD:
3409 process_color_seq (op, Color_BD, str, resp); 3573 process_color_seq (op, Color_BD, str, st);
3410 break; 3574 break;
3411 case URxvt_Color_UL: 3575 case URxvt_Color_UL:
3412 process_color_seq (op, Color_UL, str, resp); 3576 process_color_seq (op, Color_UL, str, st);
3413 break; 3577 break;
3414 case URxvt_Color_IT: 3578 case URxvt_Color_IT:
3415 process_color_seq (op, Color_IT, str, resp); 3579 process_color_seq (op, Color_IT, str, st);
3416 break; 3580 break;
3417#endif 3581#endif
3418 case URxvt_Color_border: 3582 case URxvt_Color_border:
3419 process_color_seq (op, Color_border, str, resp); 3583 process_color_seq (op, Color_border, str, st);
3420 break; 3584 break;
3421#if ENABLE_TRANSPARENCY
3422 case URxvt_Color_tint:
3423 process_color_seq (op, Color_tint, str, resp);
3424 {
3425 bool changed = false;
3426
3427 if (ISSET_PIXCOLOR (Color_tint))
3428 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3429 else
3430 changed = bgPixmap.unset_tint ();
3431
3432 if (changed)
3433 update_background ();
3434 }
3435
3436 break;
3437#endif
3438
3439#if BG_IMAGE_FROM_FILE
3440 case Rxvt_Pixmap:
3441 if (!strcmp (str, "?"))
3442 {
3443 char str[256];
3444
3445 sprintf (str, "[%dx%d+%d+%d]",
3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3448 process_xterm_seq (XTerm_title, str, CHAR_ST);
3449 }
3450 else
3451 {
3452 int changed = 0;
3453
3454 if (*str != ';')
3455 {
3456 /* reset to default scaling :*/
3457 bgPixmap.unset_geometry ();
3458 if (bgPixmap.set_file (str)) /* change pixmap */
3459 changed++;
3460 str = strchr (str, ';');
3461 if (str == NULL)
3462 bgPixmap.set_defaultGeometry ();
3463 }
3464
3465 while (str)
3466 {
3467 str++;
3468 if (bgPixmap.set_geometry (str))
3469 changed++;
3470 str = strchr (str, ';');
3471 }
3472
3473 if (changed)
3474 update_background ();
3475 }
3476 break;
3477#endif
3478 3585
3479 case XTerm_logfile: 3586 case XTerm_logfile:
3480 // TODO, when secure mode? 3587 // TODO, when secure mode?
3481 break; 3588 break;
3482 3589
… …
3499 case URxvt_boldFont: 3606 case URxvt_boldFont:
3500 case URxvt_italicFont: 3607 case URxvt_italicFont:
3501 case URxvt_boldItalicFont: 3608 case URxvt_boldItalicFont:
3502#endif 3609#endif
3503 if (query) 3610 if (query)
3504 tt_printf ("\33]%d;%-.250s%c", saveop, 3611 tt_printf ("\33]%d;%-.250s%s", saveop,
3505 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3612 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3506 ? fontset[op - URxvt_font]->fontdesc : "", 3613 ? fontset[op - URxvt_font]->fontdesc : "",
3507 resp); 3614 st.v);
3508 else 3615 else
3509 { 3616 {
3510 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3617 const char *&res = rs[Rs_font + (op - URxvt_font)];
3511 3618
3512 res = strdup (str); 3619 res = strdup (str);
… …
3515 } 3622 }
3516 break; 3623 break;
3517 3624
3518 case URxvt_version: 3625 case URxvt_version:
3519 if (query) 3626 if (query)
3520 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3627 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3521 op, 3628 op,
3522 rs[Rs_name], VERSION[0], VERSION[2], 3629 rs[Rs_name], VERSION[0], VERSION[2],
3523 resp); 3630 st.v);
3524 break; 3631 break;
3525 3632
3526#if !ENABLE_MINIMAL 3633#if !ENABLE_MINIMAL
3634 case URxvt_cellinfo:
3635 if (query)
3636 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3637 fwidth, fheight, fbase,
3638 st.v);
3639 break;
3640
3527 case URxvt_locale: 3641 case URxvt_locale:
3528 if (query) 3642 if (query)
3529 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3643 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3530 else 3644 else
3531 { 3645 {
3532 set_locale (str); 3646 set_locale (str);
3533 pty->set_utf8_mode (enc_utf8); 3647 pty->set_utf8_mode (enc_utf8);
3534 init_xlocale (); 3648 init_xlocale ();
… …
3549 break; 3663 break;
3550#endif 3664#endif
3551 3665
3552#if ENABLE_PERL 3666#if ENABLE_PERL
3553 case URxvt_perl: 3667 case URxvt_perl:
3554 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3668 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3555 break; 3669 break;
3556#endif 3670#endif
3557 } 3671 }
3558} 3672}
3559/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
… …
3566 * 's' = save 3680 * 's' = save
3567 * 'r' = restore 3681 * 'r' = restore
3568 * 't' = toggle 3682 * 't' = toggle
3569 * so no need for fancy checking 3683 * so no need for fancy checking
3570 */ 3684 */
3571int 3685int ecb_cold
3572rxvt_term::privcases (int mode, unsigned long bit) 3686rxvt_term::privcases (int mode, unsigned long bit)
3573{ 3687{
3574 int state; 3688 int state;
3575 3689
3576 if (mode == 's') 3690 if (mode == 's')
3577 { 3691 {
3578 SavedModes |= (priv_modes & bit); 3692 if (priv_modes & bit)
3693 SavedModes |= bit;
3694 else
3695 SavedModes &= ~bit;
3579 return -1; 3696 return -1;
3580 } 3697 }
3581 else 3698 else
3582 { 3699 {
3583 if (mode == 'r') 3700 if (mode == 'r')
3584 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3701 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3585 else 3702 else
3586 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3703 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3587 set_privmode (bit, state); 3704
3705 if (state)
3706 priv_modes |= bit;
3707 else
3708 priv_modes &= ~bit;
3588 } 3709 }
3589 3710
3590 return state; 3711 return state;
3591} 3712}
3592 3713
3593/* we're not using priv _yet_ */ 3714/* we're not using priv _yet_ */
3594void 3715void
3595rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3716rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3596{ 3717{
3597 unsigned int i, j; 3718 unsigned int i, j;
3598 int state; 3719 int state;
3599 3720
3600 static const struct 3721 static const struct
3601 { 3722 {
3602 const int argval; 3723 const int argval;
3603 const unsigned long bit; 3724 const unsigned long bit;
3604 } argtopriv[] = { 3725 } argtopriv[] = {
3605 { 1, PrivMode_aplCUR }, // DECCKM 3726 { 1, PrivMode_aplCUR }, // DECCKM
3606 { 2, PrivMode_vt52 }, 3727 { 2, PrivMode_vt52 }, // DECANM
3607 { 3, PrivMode_132 }, // DECCOLM 3728 { 3, PrivMode_132 }, // DECCOLM
3608 { 4, PrivMode_smoothScroll }, // DECSCLM 3729 { 4, PrivMode_smoothScroll }, // DECSCLM
3609 { 5, PrivMode_rVideo }, // DECSCNM 3730 { 5, PrivMode_rVideo }, // DECSCNM
3610 { 6, PrivMode_relOrigin }, // DECOM 3731 { 6, PrivMode_relOrigin }, // DECOM
3611 { 7, PrivMode_Autowrap }, // DECAWM 3732 { 7, PrivMode_Autowrap }, // DECAWM
3612 // 8, auto-repeat keys // DECARM 3733 // 8, auto-repeat keys // DECARM
3613 { 9, PrivMode_MouseX10 }, 3734 { 9, PrivMode_MouseX10 },
3735 { 12, PrivMode_BlinkingCursor },
3614 // 18 end FF to printer after print screen 3736 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region 3737 // 19 Print screen prints full screen/scroll region
3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3738 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3617#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
3618 { scrollBar_esc, PrivMode_scrollBar }, 3740 { scrollBar_esc, PrivMode_scrollBar },
3619#endif 3741#endif
3620 { 35, PrivMode_ShiftKeys }, // rxvt extension 3742 { 35, PrivMode_ShiftKeys }, // rxvt extension
3621 // 38, tektronix mode // DECTEK 3743 // 38, tektronix mode // DECTEK
3622 { 40, PrivMode_132OK }, 3744 { 40, PrivMode_132OK },
3623 // 41 xterm more fixes NYI 3745 // 41 xterm more fixes NYI
3624 // 45 margin bell NYI 3746 // 45 margin bell NYI
3625 // 46 start logging 3747 // 46 start logging
3626 { 47, PrivMode_Screen }, 3748 { 47, PrivMode_Screen },
3627 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3749 { 66, PrivMode_aplKP }, // DECNKM
3628#ifndef NO_BACKSPACE_KEY 3750#ifndef NO_BACKSPACE_KEY
3629 { 67, PrivMode_BackSpace }, // DECBKM 3751 { 67, PrivMode_BackSpace }, // DECBKM
3630#endif 3752#endif
3631 { 1000, PrivMode_MouseX11 }, 3753 { 1000, PrivMode_MouseX11 },
3632 { 1002, PrivMode_MouseBtnEvent }, 3754 { 1002, PrivMode_MouseBtnEvent },
3633 { 1003, PrivMode_MouseAnyEvent }, 3755 { 1003, PrivMode_MouseAnyEvent },
3756#if ENABLE_FRILLS
3757 { 1004, PrivMode_FocusEvent },
3758 { 1005, PrivMode_ExtMouseUTF8 },
3759 { 1006, PrivMode_ExtMouseSGR },
3760#endif
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3761 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 1011, PrivMode_Keypress }, // rxvt extension 3762 { 1011, PrivMode_Keypress }, // rxvt extension
3763#if ENABLE_FRILLS
3764 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3765#endif
3636 // 1035 enable modifiers for alt, numlock NYI 3766 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3767 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3768 // 1037 send DEL for keypad delete NYI
3639 { 1047, PrivMode_Screen }, 3769 { 1047, PrivMode_Screen },
3640 // 1048 save and restore cursor 3770 // 1048 save and restore cursor, implemented in code
3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3771 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3772 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3773#if ENABLE_FRILLS
3643 { 2004, PrivMode_BracketPaste }, 3774 { 2004, PrivMode_BracketPaste },
3775#endif
3644 }; 3776 };
3645 3777
3646 if (nargs == 0) 3778 if (nargs == 0)
3647 return; 3779 return;
3780
3781 // DECRQM
3782 if (mode == 'p')
3783 {
3784 int status = 0;
3785 if (nargs != 1)
3786 return;
3787
3788 for (j = 0; j < ecb_array_length (argtopriv); j++)
3789 if (argtopriv[j].argval == arg[0])
3790 {
3791 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3792 break;
3793 }
3794
3795 tt_printf ("\33[?%d;%d$y", arg[0], status);
3796 return;
3797 }
3648 3798
3649 /* make lo/hi boolean */ 3799 /* make lo/hi boolean */
3650 if (mode == 'l') 3800 if (mode == 'l')
3651 mode = 0; /* reset */ 3801 mode = 0; /* reset */
3652 else if (mode == 'h') 3802 else if (mode == 'h')
… …
3655 for (i = 0; i < nargs; i++) 3805 for (i = 0; i < nargs; i++)
3656 { 3806 {
3657 state = -1; 3807 state = -1;
3658 3808
3659 /* basic handling */ 3809 /* basic handling */
3660 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3810 for (j = 0; j < ecb_array_length (argtopriv); j++)
3661 if (argtopriv[j].argval == arg[i]) 3811 if (argtopriv[j].argval == arg[i])
3662 { 3812 {
3663 state = privcases (mode, argtopriv[j].bit); 3813 state = privcases (mode, argtopriv[j].bit);
3664 break; 3814 break;
3665 } 3815 }
… …
3691 case 2: /* VT52 mode */ 3841 case 2: /* VT52 mode */
3692 /* oddball mode. should be set regardless of set/reset 3842 /* oddball mode. should be set regardless of set/reset
3693 * parameter. Return from VT52 mode with an ESC < from 3843 * parameter. Return from VT52 mode with an ESC < from
3694 * within VT52 mode 3844 * within VT52 mode
3695 */ 3845 */
3696 set_privmode (PrivMode_vt52, 1); 3846 priv_modes |= PrivMode_vt52;
3697 break; 3847 break;
3698 case 3: /* 80/132 */ 3848 case 3: /* 80/132 */
3699 if (priv_modes & PrivMode_132OK) 3849 if (priv_modes & PrivMode_132OK)
3700 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3850 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3701 break; 3851 break;
… …
3716 if (state) /* orthogonal */ 3866 if (state) /* orthogonal */
3717 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3867 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3718 break; 3868 break;
3719#ifdef scrollBar_esc 3869#ifdef scrollBar_esc
3720 case scrollBar_esc: 3870 case scrollBar_esc:
3721 if (scrollBar.map (state)) 3871 scrollBar.map (state);
3722 {
3723 resize_all_windows (0, 0, 0); 3872 resize_all_windows (0, 0, 0);
3724 scr_touch (true); 3873 scr_touch (true);
3725 } 3874 break;
3875#endif
3876#ifdef CURSOR_BLINK
3877 case 12:
3878 cursor_blink_reset ();
3726 break; 3879 break;
3727#endif 3880#endif
3728 case 25: /* visible/invisible cursor */ 3881 case 25: /* visible/invisible cursor */
3729 scr_cursor_visible (state); 3882 scr_cursor_visible (state);
3730 break; 3883 break;
… …
3743 case 1003: 3896 case 1003:
3744 if (state) 3897 if (state)
3745 { 3898 {
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3899 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3900 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3901 mouse_row = mouse_col = 0;
3748 vt_emask_mouse = PointerMotionMask; 3902 vt_emask_mouse = PointerMotionMask;
3749 } 3903 }
3750 else 3904 else
3751 vt_emask_mouse = NoEventMask; 3905 vt_emask_mouse = NoEventMask;
3752 3906
… …
3784 } 3938 }
3785} 3939}
3786/*}}} */ 3940/*}}} */
3787 3941
3788/*{{{ process sgr sequences */ 3942/*{{{ process sgr sequences */
3789void 3943void ecb_hot
3790rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3944rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3791{ 3945{
3792 unsigned int i; 3946 unsigned int i;
3793 short rendset; 3947 short rendset;
3794 int rendstyle; 3948 int rendstyle;
… …
3836 //case 19: // ninth alt font 3990 //case 19: // ninth alt font
3837 //case 20: // gothic 3991 //case 20: // gothic
3838 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3992 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3839 rendset = 0, rendstyle = RS_Bold; 3993 rendset = 0, rendstyle = RS_Bold;
3840 break; 3994 break;
3841 case 22: // normal intensity 3995 case 22: // bold off (vt220)
3842 rendset = 0, rendstyle = RS_Bold; 3996 rendset = 0, rendstyle = RS_Bold;
3843 break; 3997 break;
3844 case 23: // disable italic 3998 case 23: // disable italic
3845 rendset = 0, rendstyle = RS_Italic; 3999 rendset = 0, rendstyle = RS_Italic;
3846 break; 4000 break;
3847 case 24: 4001 case 24: // underline off (vt220)
3848 rendset = 0, rendstyle = RS_Uline; 4002 rendset = 0, rendstyle = RS_Uline;
3849 break; 4003 break;
3850 case 25: 4004 case 25: // blink off (vt220)
3851 rendset = 0, rendstyle = RS_Blink; 4005 rendset = 0, rendstyle = RS_Blink;
3852 break; 4006 break;
3853 case 26: // variable spacing (iso 8613) 4007 case 26: // variable spacing (iso 8613)
3854 rendset = 0, rendstyle = RS_Blink; 4008 rendset = 0, rendstyle = RS_Blink;
3855 break; 4009 break;
3856 case 27: 4010 case 27: // reverse off (vt220)
3857 rendset = 0, rendstyle = RS_RVid; 4011 rendset = 0, rendstyle = RS_RVid;
3858 break; 4012 break;
3859 //case 28: // visible. NYI 4013 //case 28: // visible. NYI
3860 //case 29: // not crossed-out 4014 //case 29: // not crossed-out
3861 } 4015 }
… …
3876 case 35: 4030 case 35:
3877 case 36: 4031 case 36:
3878 case 37: 4032 case 37:
3879 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4033 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3880 break; 4034 break;
3881 case 38: // set fg color, ISO 8613-6
3882 if (nargs > i + 2 && arg[i + 1] == 5)
3883 {
3884 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3885 i += 2;
3886 }
3887 break;
3888 case 39: /* default fg */ 4035 case 39: /* default fg */
3889 scr_color (Color_fg, Color_fg); 4036 scr_color (Color_fg, Color_fg);
3890 break; 4037 break;
3891 4038
3892 case 40: 4039 case 40:
… …
3897 case 45: 4044 case 45:
3898 case 46: 4045 case 46:
3899 case 47: 4046 case 47:
3900 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4047 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3901 break; 4048 break;
3902 case 48: // set bg color, ISO 8613-6
3903 if (nargs > i + 2 && arg[i + 1] == 5)
3904 {
3905 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3906 i += 2;
3907 }
3908 break;
3909 case 49: /* default bg */ 4049 case 49: /* default bg */
3910 scr_color (Color_bg, Color_bg); 4050 scr_color (Color_bg, Color_bg);
4051 break;
4052
4053 case 38: // set fg color, ISO 8613-6
4054 case 48: // set bg color, ISO 8613-6
4055 {
4056 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4057 unsigned int idx;
4058
4059 if (nargs > i + 2 && arg[i + 1] == 5)
4060 {
4061 idx = minCOLOR + arg[i + 2];
4062 i += 2;
4063
4064 scr_color (idx, fgbg);
4065 }
4066 else if (nargs > i + 4 && arg[i + 1] == 2)
4067 {
4068 unsigned int r = arg[i + 2];
4069 unsigned int g = arg[i + 3];
4070 unsigned int b = arg[i + 4];
4071 unsigned int a = 0xff;
4072
4073 idx = map_rgb24_color (r, g, b, a);
4074
4075 i += 4;
4076
4077 scr_color (idx, fgbg);
4078 }
4079 }
3911 break; 4080 break;
3912 4081
3913 //case 50: // not variable spacing 4082 //case 50: // not variable spacing
3914 4083
3915#if !ENABLE_MINIMAL 4084#if !ENABLE_MINIMAL
… …
3935 break; 4104 break;
3936#endif 4105#endif
3937 } 4106 }
3938 } 4107 }
3939} 4108}
4109
4110void
4111rxvt_term::set_cursor_style (int style)
4112{
4113 if (!IN_RANGE_INC (style, 0, 6))
4114 return;
4115
4116 if (style == 0)
4117 style = 1;
4118
4119 cursor_type = (style - 1) / 2;
4120 set_option (Opt_cursorUnderline, cursor_type == 1);
4121
4122#ifdef CURSOR_BLINK
4123 set_option (Opt_cursorBlink, style & 1);
4124 cursor_blink_reset ();
4125#endif
4126
4127 want_refresh = 1;
4128}
3940/*}}} */ 4129/*}}} */
3941 4130
3942/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3943void
3944rxvt_term::process_graphics ()
3945{
3946 unicode_t ch, cmd = cmd_getc ();
3947
3948 if (cmd == 'Q')
3949 {
3950 /* query graphics */
3951 tt_printf ("\033G0\012"); /* no graphics */
3952 return;
3953 }
3954 /* swallow other graphics sequences until terminating ':' */
3955 do
3956 ch = cmd_getc ();
3957 while (ch != ':');
3958}
3959/*}}} */
3960
3961/* ------------------------------------------------------------------------- */ 4131/* ---------------------------------------------------------------------- */
4132/* Write data to the pty as typed by the user, pasted with the mouse,
4133 * or generated by us in response to a query ESC sequence.
4134 */
3962 4135
3963/* 4136/*
3964 * Send printf () formatted output to the command. 4137 * Send printf () formatted output to the command.
3965 * Only use for small amounts of data. 4138 * Only use for small amounts of data.
3966 */ 4139 */
… …
3974 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4147 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3975 va_end (arg_ptr); 4148 va_end (arg_ptr);
3976 tt_write (buf, strlen (buf)); 4149 tt_write (buf, strlen (buf));
3977} 4150}
3978 4151
3979/* ---------------------------------------------------------------------- */
3980/* Write data to the pty as typed by the user, pasted with the mouse, 4152/* Write data to the pty as typed by the user. */
3981 * or generated by us in response to a query ESC sequence. 4153void
3982 */ 4154rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3983const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4155{
4156 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4157 return;
4158
4159 if (option (Opt_scrollTtyKeypress))
4160 if (view_start)
4161 {
4162 view_start = 0;
4163 want_refresh = 1;
4164 }
4165
4166 tt_write_ (data, len);
4167}
3984 4168
3985void 4169void
3986rxvt_term::tt_write (const char *data, unsigned int len) 4170rxvt_term::tt_write (const char *data, unsigned int len)
3987{ 4171{
3988 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4172 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3989 return; 4173 return;
3990 4174
4175 tt_write_ (data, len);
4176}
4177
4178static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4179
4180void
4181rxvt_term::tt_write_ (const char *data, unsigned int len)
4182{
3991 if (pty->pty < 0) 4183 if (pty->pty < 0)
3992 return; 4184 return;
3993 4185
3994 if (v_buflen == 0) 4186 if (v_buflen == 0)
3995 { 4187 {
3996 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4188 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3997 4189
4190 max_it (written, 0);
4191
3998 if ((unsigned int)written == len) 4192 if (written == len)
3999 return; 4193 return;
4000 4194
4001 data += written; 4195 data += written;
4002 len -= written; 4196 len -= written;
4003 } 4197 }
4004 4198
4005 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4199 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4006 4200
4007 memcpy (v_buffer + v_buflen, data, len); 4201 memcpy (v_buffer + v_buflen, data, len);
4008 v_buflen += len; 4202 v_buflen += len;
4009 4203
4010 pty_ev.set (ev::READ | ev::WRITE); 4204 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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