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

Diff Legend

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