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.412 by ayin, Sun Feb 17 11:13:11 2008 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 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 170 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 171
173# if ENABLE_COMBINING 172# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
175 { 174 {
176 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
177 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
179 } 178 }
180 else 179 else
181# endif 180# endif
… …
184 183
185 alloc = 0; 184 alloc = 0;
186 chr = &ch2; 185 chr = &ch2;
187 len = 1; 186 len = 1;
188 } 187 }
188
189 char rowcol[40];
190 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 191
190 char attr[80]; // plenty 192 char attr[80]; // plenty
191 193
192 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",
193 (int)r, 195 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 199 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 200 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 201 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 202 r & RS_Careful ? " careful" : "");
201 203
204 int width = 0;
205 fname = rxvt_temp_buf<wchar_t *> (len);
206 for (int i = 0; i < len; i++)
207 {
208 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
209 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 210 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
211 }
203 212
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 213 max_it (width, strlen (attr));
206 214
207 if (y >= 0) 215 if (y >= 0)
208 { 216 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
210 x = 0; 218 x = 0;
211 } 219 }
212 220
213 scr_overlay_new (x, y, width, len + 2); 221 scr_overlay_new (x, y, width, len * 2 + 2);
222
223 scr_overlay_set (0, 0, rowcol);
214 224
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 225 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 226
217 for (int y = 0; y < len; y++) 227 for (int y = 0; y < len; y++)
218 { 228 {
219 char buf[9]; 229 char buf[9];
220 230
221 ch = *chr++; 231 ch = *chr++;
222 232
223 sprintf (buf, "%8x", ch); 233 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 234 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 235 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 236# if !UNICODE_3
227 if (ch >= 0x10000) 237 if (ch >= 0x10000)
228 ch = 0xfffd; 238 ch = 0xfffd;
229# endif 239# endif
230 scr_overlay_set (11, y, ch, r); 240 scr_overlay_set (11, y + 1, ch, r);
231 241
232 if (WCWIDTH (ch) >= 2) 242 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 243 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 244 }
235 245
236// { 246// {
237// char buf[4+4+3+1]; 247// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 248// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 249// scr_overlay_set (0, 0, buf);
240// } 250// }
241 scr_overlay_set (0, len , attr); 251 scr_overlay_set (0, len + 1, attr);
252 for (int i = 0; i < len; i++)
253 {
242 scr_overlay_set (0, len + 1, fname); 254 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 255 free (fname[i]);
256 }
245 257
246# if ENABLE_COMBINING 258# if ENABLE_COMBINING
247 if (alloc) 259 if (alloc)
248 delete [] alloc; 260 delete [] alloc;
249# endif 261# endif
250} 262}
251#endif 263#endif
252 264
253void 265void ecb_cold
254rxvt_term::commit_iso14755 () 266rxvt_term::commit_iso14755 ()
255{ 267{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 268 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 269
261 if (iso14755buf & ISO_14755_51) 270 if (iso14755buf & ISO_14755_51)
262 { 271 {
263 char mb[16]; 272 char mb[MB_LEN_MAX];
264 int len; 273 int len;
265 274
266 // allow verbatim 0-bytes and control-bytes to be entered 275 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 276 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 277 len = wctomb (mb, ch);
269 else 278 else
270 { 279 {
271 mb[0] = ch[0]; 280 mb[0] = ch;
272 len = 1; 281 len = 1;
273 } 282 }
274 283
275 if (len > 0) 284 if (len > 0)
276 tt_write (mb, len); 285 tt_write (mb, len);
… …
279 } 288 }
280 289
281 iso14755buf = 0; 290 iso14755buf = 0;
282} 291}
283 292
284static int 293static int ecb_cold
285hex_keyval (XKeyEvent &ev) 294hex_keyval (XKeyEvent &ev)
286{ 295{
287 // check wether this event corresponds to a hex digit 296 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 297 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 298 for (int index = 0; index < 8; index++)
290 { 299 {
291 KeySym k = XLookupKeysym (&ev, index); 300 KeySym k = XLookupKeysym (&ev, index);
292 301
… …
298 307
299 return -1; 308 return -1;
300} 309}
301#endif 310#endif
302 311
303static inline KeySym 312static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 313translate_keypad (KeySym keysym, bool kp)
305{ 314{
306#ifdef XK_KP_Home 315#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 316 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 317 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left 318 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up 319 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right 320 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down 321 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior 322 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next 323 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End 324 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin 325 XK_KP_5, // XK_KP_Begin
322 }; 326 };
323 327
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
334# endif 338# endif
335#endif 339#endif
336 return keysym; 340 return keysym;
337} 341}
338 342
339static inline int 343static inline int ecb_cold
340map_function_key (KeySym keysym) 344map_function_key (KeySym keysym)
341{ 345{
342 int param = 0; 346 int param = 0;
343 347
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 348 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
369 param = 3; 373 param = 3;
370 break; 374 break;
371 case XK_Select: 375 case XK_Select:
372 param = 4; 376 param = 4;
373 break; 377 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior: 378 case XK_Prior:
376 param = 5; 379 param = 5;
377 break; 380 break;
378 case XK_Next: 381 case XK_Next:
379 param = 6; 382 param = 6;
… …
382 param = 7; 385 param = 7;
383 break; 386 break;
384 case XK_End: 387 case XK_End:
385 param = 8; 388 param = 8;
386 break; 389 break;
387#endif
388 case XK_Help: 390 case XK_Help:
389 param = 28; 391 param = 28;
390 break; 392 break;
391 case XK_Menu: 393 case XK_Menu:
392 param = 29; 394 param = 29;
393 break; 395 break;
394 } 396 }
395 return param; 397 return param;
396} 398}
397 399
398void 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
399rxvt_term::key_press (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
400{ 411{
401 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
402 KeySym keysym; 413 KeySym keysym = NoSymbol;
403 int valid_keysym;
404 char kbuf[KBUFSZ]; 414 char rkbuf[KBUFSZ + 1];
415 char *kbuf = rkbuf + 1;
405 416
406#if ISO_14755 417#if ISO_14755
407 if (iso14755buf & ISO_14755_52) 418 if (iso14755buf & ISO_14755_52)
408 return; 419 return;
409#endif 420#endif
… …
416 */ 427 */
417 shft = ev.state & ShiftMask; 428 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 429 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 430 meta = ev.state & ModMetaMask;
420 431
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 432 kbuf[0] = 0;
428 433
429#ifdef USE_XIM 434#if USE_XIM
430 if (Input_Context) 435 if (Input_Context)
431 { 436 {
432 Status status_return; 437 Status status_return;
433 438
434#if 0 439#if 0
… …
472 } 477 }
473 } 478 }
474 else 479 else
475 len = 0; 480 len = 0;
476 } 481 }
477
478 valid_keysym = status_return == XLookupKeySym
479 || status_return == XLookupBoth;
480 } 482 }
481 else 483 else
482#endif 484#endif
483 { 485 {
484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
485 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
486 } 490 {
491 KeySym orig_keysym = keysym;
487 492
488 if (valid_keysym) 493 /* Shift + F1 - F10 generates F11 - F20 */
494 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
495 {
496 keysym += (XK_F11 - XK_F1);
497 shft = 0; /* turn off Shift */
498 }
499
500 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
501 {
502 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
503 unsigned int newlen = 1;
504
505 if (ev.state & ModNumLockMask)
506 kp = false;
507
508 keysym = translate_keypad (keysym, kp);
509
510 switch (keysym)
511 {
512#ifndef NO_BACKSPACE_KEY
513 case XK_BackSpace:
514 if (priv_modes & PrivMode_HaveBackSpace)
515 {
516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
517 ^ !!ctrl) ? '\b' : '\177';
518 kbuf[1] = '\0';
519 }
520 else
521 strcpy (kbuf, rs[Rs_backspace_key]);
522 break;
523#endif
524#ifndef NO_DELETE_KEY
525 case XK_Delete:
526 strcpy (kbuf, rs[Rs_delete_key]);
527 break;
528#endif
529 case XK_Tab:
530 if (shft)
531 strcpy (kbuf, "\033[Z");
532 else
533 {
534#ifdef CTRL_TAB_MAKES_META
535 if (ctrl)
536 meta = 1;
537#endif
538#ifdef MOD4_TAB_MAKES_META
539 if (ev.state & Mod4Mask)
540 meta = 1;
541#endif
542 newlen = 0;
543 }
544 break;
545
546 case XK_Up: /* "\033[A" */
547 case XK_Down: /* "\033[B" */
548 case XK_Right: /* "\033[C" */
549 case XK_Left: /* "\033[D" */
550 strcpy (kbuf, "\033[Z");
551 kbuf[2] = "DACB"[keysym - XK_Left];
552 /* do Shift first */
553 if (shft)
554 kbuf[2] = "dacb"[keysym - XK_Left];
555 else if (ctrl)
556 {
557 kbuf[1] = 'O';
558 kbuf[2] = "dacb"[keysym - XK_Left];
559 }
560 else if (priv_modes & PrivMode_aplCUR)
561 kbuf[1] = 'O';
562 break;
563
564 case XK_KP_Enter:
565 /* allow shift to override */
566 if (kp)
567 {
568 strcpy (kbuf, "\033OM");
569 break;
570 }
571
572 /* FALLTHROUGH */
573
574 case XK_Return:
575 if (priv_modes & PrivMode_LFNL)
576 {
577 kbuf[0] = '\015';
578 kbuf[1] = '\012';
579 kbuf[2] = '\0';
580 }
581 else
582 {
583 kbuf[0] = '\015';
584 kbuf[1] = '\0';
585 }
586 break;
587
588 case XK_KP_F1: /* "\033OP" */
589 case XK_KP_F2: /* "\033OQ" */
590 case XK_KP_F3: /* "\033OR" */
591 case XK_KP_F4: /* "\033OS" */
592 strcpy (kbuf, "\033OP");
593 kbuf[2] += (keysym - XK_KP_F1);
594 break;
595
596 case XK_KP_Multiply: /* "\033Oj" : "*" */
597 case XK_KP_Add: /* "\033Ok" : "+" */
598 case XK_KP_Separator: /* "\033Ol" : "," */
599 case XK_KP_Subtract: /* "\033Om" : "-" */
600 case XK_KP_Decimal: /* "\033On" : "." */
601 case XK_KP_Divide: /* "\033Oo" : "/" */
602 case XK_KP_0: /* "\033Op" : "0" */
603 case XK_KP_1: /* "\033Oq" : "1" */
604 case XK_KP_2: /* "\033Or" : "2" */
605 case XK_KP_3: /* "\033Os" : "3" */
606 case XK_KP_4: /* "\033Ot" : "4" */
607 case XK_KP_5: /* "\033Ou" : "5" */
608 case XK_KP_6: /* "\033Ov" : "6" */
609 case XK_KP_7: /* "\033Ow" : "7" */
610 case XK_KP_8: /* "\033Ox" : "8" */
611 case XK_KP_9: /* "\033Oy" : "9" */
612 /* allow shift to override */
613 if (kp)
614 {
615 strcpy (kbuf, "\033Oj");
616 kbuf[2] += (keysym - XK_KP_Multiply);
617 }
618 else
619 {
620 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
621 kbuf[1] = '\0';
622 }
623 break;
624
625 default:
626 {
627 int param = map_function_key (keysym);
628 if (param > 0)
629 sprintf (kbuf,"\033[%d~", param);
630 else
631 newlen = 0;
632 }
633 break;
634 }
635
636 if (newlen)
637 len = strlen (kbuf);
638
639 if (len > 0)
640 {
641 /*
642 * pass Shift/Control indicators for function keys ending with `~'
643 *
644 * eg,
645 * Prior = "ESC[5~"
646 * Shift+Prior = "ESC[5$"
647 * Ctrl+Prior = "ESC[5^"
648 * Ctrl+Shift+Prior = "ESC[5@"
649 */
650 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
651 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
652
653 /*
654 * Pass meta for all function keys, if 'meta' option set
655 */
656#ifdef META8_OPTION
657 if (meta && (meta_char == 0x80))
658 kbuf[len - 1] |= 0x80;
659#endif
660 }
661
662 }
663 else if (ctrl && keysym == XK_minus)
664 {
665 len = 1;
666 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
667 }
668 else if (keysym == XK_ISO_Left_Tab)
669 {
670 strcpy (kbuf, "\033[Z");
671 len = 3;
672 }
673 else
674 {
675#ifdef META8_OPTION
676 /* set 8-bit on */
677 if (meta && (meta_char == 0x80))
678 {
679 char *ch;
680
681 for (ch = kbuf; ch < kbuf + len; ch++)
682 *ch |= 0x80;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
489 { 706 {
490#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 709 return;
493#endif 710#endif
494 711
495 if (saveLines) 712 if (saveLines)
496 { 713 {
… …
505#ifdef PAGING_CONTEXT_LINES 722#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 723 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 724#else
508 lnsppg = nrow * 4 / 5; 725 lnsppg = nrow * 4 / 5;
509#endif 726#endif
727 max_it (lnsppg, 1);
728
510 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
511 { 730 {
512 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
513 return; 732 return;
514 } 733 }
515 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
516 { 735 {
517 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
518 return; 737 return;
519 } 738 }
520 } 739 }
521#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
522 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
523 { 742 {
524 if (keysym == XK_Up) 743 if (keysym == XK_Up)
525 { 744 {
526 scr_page (UP, 1); 745 scr_page (1);
527 return; 746 return;
528 } 747 }
529 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
530 { 749 {
531 scr_page (DN, 1); 750 scr_page (-1);
532 return; 751 return;
533 } 752 }
534 } 753 }
535#endif 754#endif
536#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
537 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
538 { 757 {
539 if (keysym == XK_Home) 758 if (keysym == XK_Home)
540 { 759 {
541 scr_move_to (0, 1); 760 scr_changeview (top_row);
542 return; 761 return;
543 } 762 }
544 else if (keysym == XK_End) 763 else if (keysym == XK_End)
545 { 764 {
546 scr_move_to (1, 1); 765 scr_changeview (0);
547 return; 766 return;
548 } 767 }
549 } 768 }
550#endif 769#endif
551 } 770 }
552 771
553 if (shft) 772 if (shft)
554 { 773 {
555 /* Shift + F1 - F10 generates F11 - F20 */
556 if (keysym >= XK_F1 && keysym <= XK_F10)
557 {
558 keysym += (XK_F11 - XK_F1);
559 shft = 0; /* turn off Shift */
560 }
561 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
562 { 775 {
563 switch (keysym) 776 switch (keysym)
564 { 777 {
565 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
566 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
567 selection_request (ev.time); 780 selection_request (ev.time);
568 return; 781 return;
569#if TODO 782#if TODO
570 /* rxvt extras */ 783 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 785 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 787 return;
577#endif 788#endif
578 } 789 }
579 } 790 }
580 } 791 }
581 792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
806 }
807
582#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 809 // ISO 14755 support
584 if (shft && ctrl) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 811 {
586 int hv; 812 int hv;
587 813
588 if (iso14755buf & ISO_14755_51 814 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 815 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 845 scr_overlay_off ();
620# endif 846# endif
621 iso14755buf = 0; 847 iso14755buf = 0;
622 } 848 }
623 } 849 }
850 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 851 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 852 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 853 if (!(iso14755buf & ISO_14755_STARTED))
627 { 854 {
628 iso14755buf |= ISO_14755_STARTED; 855 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 856# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 857 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
638 { 865 {
639 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
640 return; 867 return;
641 } 868 }
642#endif 869#endif
643
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
765 {
766 int param = map_function_key (keysym);
767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
771 }
772 break;
773 }
774
775 if (newlen)
776 len = strlen (kbuf);
777
778 /*
779 * Pass meta for all function keys, if 'meta' option set
780 */
781#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0)
783 kbuf[len - 1] |= 0x80;
784#endif
785
786 }
787 else if (ctrl && keysym == XK_minus)
788 {
789 len = 1;
790 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
791 }
792 else if (keysym == XK_ISO_Left_Tab)
793 {
794 strcpy (kbuf, "\033[Z");
795 len = 3;
796 }
797 else
798 {
799#ifdef META8_OPTION
800 /* set 8-bit on */
801 if (meta && (meta_char == 0x80))
802 {
803 char *ch;
804
805 for (ch = kbuf; ch < kbuf + len; ch++)
806 *ch |= 0x80;
807
808 meta = 0;
809 }
810#endif
811 /* nil */ ;
812 }
813 } 870 }
814
815 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
816 return;
817 871
818 if (len <= 0) 872 if (len <= 0)
819 return; /* not mapped */ 873 return; /* not mapped */
820 874
821 if (option (Opt_scrollTtyKeypress))
822 if (view_start)
823 {
824 view_start = 0;
825 want_refresh = 1;
826 }
827
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841
842 /* escape prefix */
843 if (meta
844#ifdef META8_OPTION
845 && meta_char == C0_ESC
846#endif
847 )
848 {
849 const char ch = C0_ESC;
850 tt_write (&ch, 1);
851 }
852
853 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
854} 876}
855 877
856void 878void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
858{ 880{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 882 KeySym keysym;
861 883
… …
881 commit_iso14755 (); 903 commit_iso14755 ();
882 904
883 return; 905 return;
884 } 906 }
885 907
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 909 if (i[0] == keysym)
888 { 910 {
889 iso14755buf = ISO_14755_51 | i[1]; 911 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 912 commit_iso14755 ();
891 913
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 951 mouse_slip_wheel_speed = 0;
930#endif 952#endif
931} 953}
932 954
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 955void
967rxvt_term::flush () 956rxvt_term::flush ()
968{ 957{
969 flush_ev.stop (); 958 flush_ev.stop ();
970 959
971#ifdef HAVE_BG_PIXMAP 960#ifdef HAVE_IMG
972 if (bgPixmap.check_clearChanged ()) 961 if (bg_flags & BG_NEEDS_REFRESH)
973 { 962 {
974// scr_clear (true); This needs to be researched further! 963 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 964 scr_touch (false);
976 } 965 }
977#endif 966#endif
978 967
979 if (want_refresh) 968 if (want_refresh)
… …
1015 } 1004 }
1016 while (row < end_row); 1005 while (row < end_row);
1017 } 1006 }
1018 1007
1019 scr_refresh (); 1008 scr_refresh ();
1020 scrollbar_show (1); 1009 scrollBar.show (1);
1021#ifdef USE_XIM 1010#if USE_XIM
1022 IMSendSpot (); 1011 im_send_spot ();
1023#endif 1012#endif
1024 } 1013 }
1025 1014
1026 display->flush (); 1015 display->flush ();
1027} 1016}
1028 1017
1029/* checks wether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1030void 1019void
1031rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1032{ 1021{
1033 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start ();
1035 1024
1036 display->flush (); 1025 display->flush ();
1037} 1026}
1038 1027
1039void 1028void
… …
1044 refresh_count = 0; 1033 refresh_count = 0;
1045 flush (); 1034 flush ();
1046} 1035}
1047 1036
1048#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
1049void 1056void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1058{
1052 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1060 want_refresh = 1;
… …
1072 1079
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1081void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1083{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1086 {
1080 want_refresh = 1; 1087 want_refresh = 1;
1081 refresh_check (); 1088 refresh_check ();
1082 } 1089 }
1083 else 1090 else
… …
1087 1094
1088#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1089void 1096void
1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1091{ 1098{
1092 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1093 { 1100 {
1094 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1095 want_refresh = 1; 1102 want_refresh = 1;
1096 refresh_check (); 1103 refresh_check ();
1097 } 1104 }
… …
1102 1109
1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1104void 1111void
1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1106{ 1113{
1107 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1114 if (scr_page (mouse_slip_wheel_speed))
1108 { 1115 {
1109 want_refresh = 1; 1116 want_refresh = 1;
1110 refresh_check (); 1117 refresh_check ();
1111 } 1118 }
1112 1119
… …
1127 { 1134 {
1128 // this should really be sched_yield(), but the linux guys thought 1135 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1136 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1137 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1138 // allowed by the sus... as is returning ENOSYS.
1139 // since the linux guys additionally thought that breaking the only
1140 // known workaround against their unusable sched_yield hack is cool,
1141 // we just nanosleep a bit and hope for the best.
1132 1142
1133 struct timespec ts = { 0, 0 }; 1143 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1144 nanosleep (&ts, 0);
1135 1145
1136 w.stop (); 1146 w.stop ();
1137 } 1147 }
1138 1148
… …
1141 { 1151 {
1142 } 1152 }
1143} event_handler; 1153} event_handler;
1144#endif 1154#endif
1145 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
1146bool 1189bool
1147rxvt_term::pty_fill () 1190rxvt_term::pty_fill ()
1148{ 1191{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1192 cmdbuf_reify ();
1150 1193
1151 if (CBUFSIZ == n) 1194 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1195
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1196 if (!avail)
1154 n = 0;
1155 } 1197 {
1156 1198 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1199 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1200 cmdbuf_endp = cmdbuf_ptr;
1201 avail = CBUFSIZ;
1202 }
1160 1203
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1204 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1205
1163 if (r > 0) 1206 if (r > 0)
1164 { 1207 {
1165 cmdbuf_endp += r; 1208 cmdbuf_endp += r;
1166 return true; 1209 return true;
… …
1188{ 1231{
1189 make_current (); 1232 make_current ();
1190 1233
1191 if (revents & ev::READ) 1234 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1235 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1236 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1237 cmd_parse ();
1195 break;
1196 1238
1197 if (revents & ev::WRITE) 1239 if (revents & ev::WRITE)
1198 pty_write (); 1240 pty_write ();
1199 1241
1200 refresh_check (); 1242 refresh_check ();
1201} 1243}
1202 1244
1203void 1245void ecb_cold
1204rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1205{ 1247{
1206 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1207 recolour_cursor (); 1249 recolor_cursor ();
1208 1250
1209#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1210 hidden_pointer = 0; 1252 hidden_pointer = 0;
1211 1253
1212 if (option (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1213 pointer_ev.start (pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1214#endif 1256#endif
1215} 1257}
1216 1258
1217#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1218void 1260void ecb_cold
1219rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1220{ 1262{
1221 if (!option (Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1222 return; 1264 return;
1223 1265
… …
1225 XFlush (dpy); 1267 XFlush (dpy);
1226 1268
1227 hidden_pointer = 1; 1269 hidden_pointer = 1;
1228} 1270}
1229 1271
1230void 1272void ecb_cold
1231rxvt_term::pointer_cb (ev::timer &w, int revents) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1232{ 1274{
1233 make_current (); 1275 make_current ();
1234 1276
1235 pointer_blank (); 1277 pointer_blank ();
… …
1237#endif 1279#endif
1238 1280
1239void 1281void
1240rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1241{ 1283{
1242 int button_number, key_state = 0; 1284 int button_number, state = 0;
1243 int x, y; 1285 int x, y;
1244 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1245 1287
1246 x = Pixel2Col (ev.x); 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1247 y = Pixel2Row (ev.y); 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1290
1248 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1249 { 1292 {
1250 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1251 return; 1294 return;
1295
1252 mouse_row = x; 1296 mouse_row = x;
1253 mouse_col = y; 1297 mouse_col = y;
1254 code += 32; 1298 state += 32;
1255 } 1299 }
1256 1300
1257 if (MEvent.button == AnyButton) 1301 if (MEvent.button == AnyButton)
1258 button_number = 3; 1302 button_number = 3;
1259 else 1303 else
1260 { 1304 {
1261 button_number = MEvent.button - Button1; 1305 button_number = MEvent.button - Button1;
1262 /* 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;
1263 if (button_number >= 3) 1310 else if (button_number >= 3)
1264 button_number += (64 - 3); 1311 button_number += 64 - 3;
1265 } 1312 }
1266 1313
1267 if (priv_modes & PrivMode_MouseX10) 1314 if (priv_modes & PrivMode_MouseX10)
1268 { 1315 {
1269 /* 1316 /*
1270 * do not report ButtonRelease 1317 * do not report ButtonRelease
1271 * no state info allowed 1318 * no state info allowed
1272 */ 1319 */
1273 key_state = 0; 1320 if (release)
1274 if (button_number == 3)
1275 return; 1321 return;
1276 } 1322 }
1277 else 1323 else
1278 { 1324 {
1279 /* XTerm mouse reporting needs these values: 1325 /* XTerm mouse reporting needs these values:
… …
1281 * 8 = Meta 1327 * 8 = Meta
1282 * 16 = Control 1328 * 16 = Control
1283 * plus will add in our own Double-Click reporting 1329 * plus will add in our own Double-Click reporting
1284 * 32 = Double Click 1330 * 32 = Double Click
1285 */ 1331 */
1286 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1332 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1287 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1288 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
1289#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
1290 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 state += ((MEvent.clicks > 1) ? 32 : 0);
1291#endif 1337#endif
1292 } 1338 }
1339
1340 int code = 32 + (release ? 3 : button_number) + state;
1293 1341
1294#if DEBUG_MOUSEREPORT 1342#if DEBUG_MOUSEREPORT
1295 fprintf (stderr, "Mouse ["); 1343 fprintf (stderr, "Mouse [");
1296 if (key_state & 16) 1344 if (state & 16)
1297 fputc ('C', stderr); 1345 fputc ('C', stderr);
1298 if (key_state & 4) 1346 if (state & 4)
1299 fputc ('S', stderr); 1347 fputc ('S', stderr);
1300 if (key_state & 8) 1348 if (state & 8)
1301 fputc ('A', stderr); 1349 fputc ('A', stderr);
1302 if (key_state & 32) 1350 if (state & 32)
1303 fputc ('2', stderr); 1351 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1353 button_number,
1306 x + 1, 1354 x,
1307 y + 1); 1355 y);
1308#endif 1356#endif
1309 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
1310 tt_printf ("\033[M%c%c%c", 1384 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1385 code,
1312 (32 + x + 1), 1386 32 + x,
1313 (32 + y + 1)); 1387 32 + y);
1314} 1388}
1315 1389
1316/*{{{ process an X event */ 1390/*{{{ process an X event */
1317void 1391void ecb_hot
1318rxvt_term::x_cb (XEvent &ev) 1392rxvt_term::x_cb (XEvent &ev)
1319{ 1393{
1320 make_current (); 1394 make_current ();
1321 1395
1322 dLocal (Display *, dpy); 1396 dLocal (Display *, dpy);
… …
1420 && ev.xfocus.mode != NotifyGrab) 1494 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1495 focus_out ();
1422 break; 1496 break;
1423 1497
1424 case ConfigureNotify: 1498 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1499 if (ev.xconfigure.window == parent)
1429 { 1500 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1501 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 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 }
1432 1525
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1526 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1527 {
1435 seen_resize = 1; 1528 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1529 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1530 }
1438 else
1439 {
1440#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif
1449 }
1450 1531
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1532 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1533 }
1453 break; 1534 break;
1454 1535
1455 case PropertyNotify: 1536 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1537 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1538 break;
1462 1539
1463 case SelectionClear: 1540 case SelectionClear:
1464 selection_clear (); 1541 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1542 break;
1471 1543
1472 case SelectionRequest: 1544 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1545 selection_send (ev.xselectionrequest);
1474 break; 1546 break;
1475 1547
1476 case MapNotify: 1548 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1493 mapped = 1; 1549 mapped = 1;
1494#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1551 text_blink_ev.start ();
1496#endif 1552#endif
1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1553 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1510 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1511 { 1567 {
1512 do 1568 do
1513 { 1569 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1572 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1574
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1576
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1578 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1581 }
1526 1582
1527 want_refresh = 1; 1583 want_refresh = 1;
1528 } 1584 }
1529 else 1585 else
… …
1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1592 ;
1537 1593
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1595 {
1540 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1541 scrollbar_show (0); 1597 scrollBar.show (0);
1542 } 1598 }
1543 } 1599 }
1544 break; 1600 break;
1545 1601
1546 case MotionNotify: 1602 case MotionNotify:
1547#ifdef POINTER_BLANK 1603#ifdef POINTER_BLANK
1548 if (hidden_pointer) 1604 if (hidden_pointer)
1549 pointer_unblank (); 1605 pointer_unblank ();
1550#endif 1606#endif
1607 if (!bypass_keystate
1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1608 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1552 || priv_modes & PrivMode_MouseAnyEvent) 1609 || priv_modes & PrivMode_MouseAnyEvent))
1553 mouse_report (ev.xbutton); 1610 mouse_report (ev.xbutton);
1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1611 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1555 break; 1612 break;
1556 1613
1557 if (ev.xany.window == vt) 1614 if (ev.xany.window == vt)
… …
1569 &unused_root_x, &unused_root_y, 1626 &unused_root_x, &unused_root_y,
1570 &ev.xbutton.x, &ev.xbutton.y, 1627 &ev.xbutton.x, &ev.xbutton.y,
1571 &ev.xbutton.state); 1628 &ev.xbutton.state);
1572#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1573 /* deal with a `jumpy' mouse */ 1630 /* deal with a `jumpy' mouse */
1574 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1631 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1632#endif
1575 { 1633 {
1576#endif
1577#if ISO_14755 1634#if ISO_14755
1578 // 5.4 1635 // 5.4
1579 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1636 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1580 { 1637 {
1581 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1638 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1587 1644
1588#ifdef SELECTION_SCROLLING 1645#ifdef SELECTION_SCROLLING
1589 if (ev.xbutton.y < int_bwidth 1646 if (ev.xbutton.y < int_bwidth
1590 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1647 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1591 { 1648 {
1649 page_dirn scroll_selection_dir;
1592 int dist; 1650 int dist;
1593 1651
1594 /* don't clobber the current delay if we are 1652 /* don't clobber the current delay if we are
1595 * already in the middle of scrolling. 1653 * already in the middle of scrolling.
1596 */ 1654 */
… …
1611 dist = int_bwidth - ev.xbutton.y; 1669 dist = int_bwidth - ev.xbutton.y;
1612 } 1670 }
1613 else 1671 else
1614 { 1672 {
1615 scroll_selection_dir = DN; 1673 scroll_selection_dir = DN;
1616 dist = ev.xbutton.y - (int_bwidth + height); 1674 dist = ev.xbutton.y - (int_bwidth + vt_height);
1617 } 1675 }
1618 1676
1619 scroll_selection_lines = Pixel2Height (dist) 1677 scroll_selection_lines = Pixel2Height (dist)
1620 / SELECTION_SCROLL_LINE_SPEEDUP 1678 / SELECTION_SCROLL_LINE_SPEEDUP
1621 + 1; 1679 + 1;
1622 min_it (scroll_selection_lines, 1680 min_it (scroll_selection_lines,
1623 SELECTION_SCROLL_MAX_LINES); 1681 SELECTION_SCROLL_MAX_LINES);
1682 scroll_selection_lines *= scroll_selection_dir;
1624 } 1683 }
1625 else 1684 else
1626 { 1685 {
1627 /* we are within the text window, so we 1686 /* we are within the text window, so we
1628 * shouldn't be scrolling 1687 * shouldn't be scrolling
1629 */ 1688 */
1630 sel_scroll_ev.stop(); 1689 sel_scroll_ev.stop();
1631 } 1690 }
1632#endif 1691#endif
1633#ifdef MOUSE_THRESHOLD
1634 } 1692 }
1635#endif
1636 } 1693 }
1637 } 1694 }
1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1695 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1696 {
1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1697 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1698 MotionNotify, &ev))
1642 ; 1699 ;
1643 1700
1644 XQueryPointer (dpy, scrollBar.win, 1701 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1702 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1703 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1704 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1705 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1706 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1707 scrollBar.size ());
1651 want_refresh = 1; 1708 want_refresh = 1;
1652 scrollbar_show (1); 1709 scrollBar.show (1);
1653 } 1710 }
1654 break; 1711 break;
1655 } 1712 }
1656 1713
1657#if defined(CURSOR_BLINK) 1714#if defined(CURSOR_BLINK)
1658 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1715 if (ev.type == KeyPress)
1659 {
1660 if (hidden_cursor)
1661 {
1662 hidden_cursor = 0;
1663 want_refresh = 1;
1664 }
1665
1666 cursor_blink_ev.again (); 1716 cursor_blink_reset ();
1667 }
1668#endif 1717#endif
1669 1718
1670#if defined(POINTER_BLANK) 1719#if defined(POINTER_BLANK)
1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1720 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1672 { 1721 {
… …
1682#endif 1731#endif
1683 1732
1684 refresh_check (); 1733 refresh_check ();
1685} 1734}
1686 1735
1687void 1736#if ENABLE_FRILLS
1737void ecb_cold
1738rxvt_term::set_urgency (bool enable)
1739{
1740 if (enable == urgency_hint)
1741 return;
1742
1743 if (XWMHints *h = XGetWMHints (dpy, parent))
1744 {
1745 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1746 XSetWMHints (dpy, parent, h);
1747 urgency_hint = enable;
1748 XFree (h);
1749 }
1750}
1751#endif
1752
1753void ecb_cold
1688rxvt_term::focus_in () 1754rxvt_term::focus_in ()
1689{ 1755{
1690 if (!focus) 1756 if (!focus)
1691 { 1757 {
1692 focus = 1; 1758 focus = 1;
1693 want_refresh = 1; 1759 want_refresh = 1;
1694 1760
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696
1697#if USE_XIM 1761#if USE_XIM
1698 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1699 { 1763 {
1700 IMSetPosition (); 1764 im_set_position ();
1701 XSetICFocus (Input_Context); 1765 XSetICFocus (Input_Context);
1702 } 1766 }
1703#endif 1767#endif
1704#if CURSOR_BLINK 1768#if CURSOR_BLINK
1705 if (option (Opt_cursorBlink)) 1769 if (option (Opt_cursorBlink))
… …
1707#endif 1771#endif
1708#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1709 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1710 { 1774 {
1711 pix_colors = pix_colors_focused; 1775 pix_colors = pix_colors_focused;
1712 scr_recolour (); 1776 scr_recolor ();
1713 } 1777 }
1714#endif 1778#endif
1715#if ENABLE_FRILLS 1779#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1780 if (option (Opt_urgentOnBell))
1717 { 1781 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif
1725 }
1726}
1727 1782
1728void 1783 if (priv_modes & PrivMode_FocusEvent)
1784 tt_printf ("\x1b[I");
1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1788 }
1789}
1790
1791void ecb_cold
1729rxvt_term::focus_out () 1792rxvt_term::focus_out ()
1730{ 1793{
1731 if (focus) 1794 if (focus)
1732 { 1795 {
1733 focus = 0; 1796 focus = 0;
1734 want_refresh = 1; 1797 want_refresh = 1;
1735 1798
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1799#if ENABLE_FRILLS
1800 if (option (Opt_urgentOnBell))
1801 set_urgency (0);
1737 1802
1803 if (priv_modes & PrivMode_FocusEvent)
1804 tt_printf ("\x1b[O");
1805#endif
1738#if ENABLE_FRILLS || ISO_14755 1806#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1807 if (iso14755buf)
1740 { 1808 {
1741 iso14755buf = 0; 1809 iso14755buf = 0;
1742# if ISO_14755 1810# if ISO_14755
… …
1756#endif 1824#endif
1757#if OFF_FOCUS_FADING 1825#if OFF_FOCUS_FADING
1758 if (rs[Rs_fade]) 1826 if (rs[Rs_fade])
1759 { 1827 {
1760 pix_colors = pix_colors_unfocused; 1828 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1829 scr_recolor ();
1762 } 1830 }
1763#endif 1831#endif
1764 }
1765}
1766 1832
1767void 1833 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1834 }
1835}
1836
1837void ecb_cold
1768rxvt_term::update_fade_color (unsigned int idx) 1838rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1769{ 1839{
1770#if OFF_FOCUS_FADING 1840#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1841 if (rs[Rs_fade])
1772 { 1842 {
1843 if (!first_time)
1844 pix_colors_focused [idx].free (this);
1845
1773 rgba c; 1846 rgba c;
1774 pix_colors [Color_fade].get (c); 1847 pix_colors [Color_fade].get (c);
1775 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);
1776 } 1849 }
1777#endif 1850#endif
1778} 1851}
1779 1852
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL 1853#if ENABLE_PERL
1781void 1854void ecb_hot
1782rxvt_term::rootwin_cb (XEvent &ev) 1855rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1856{
1784 make_current (); 1857 make_current ();
1785 1858
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1859 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1860 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return; 1861 return;
1789 1862
1790# if ENABLE_TRANSPARENCY
1791 switch (ev.type) 1863 switch (ev.type)
1792 { 1864 {
1793 case PropertyNotify: 1865 case PropertyNotify:
1794 /* 1866 /*
1795 * 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,
1796 * 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.
1797 */ 1869 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1870 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1871 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1872 {
1801 bgPixmap.set_root_pixmap (); 1873 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1802 update_background ();
1803 } 1874 }
1804 1875
1805 break; 1876 break;
1806 } 1877 }
1807# endif
1808 1878
1809 refresh_check (); 1879 refresh_check ();
1810} 1880}
1811#endif 1881#endif
1812 1882
… …
1835 iso14755_54 (ev.x, ev.y); 1905 iso14755_54 (ev.x, ev.y);
1836 return; 1906 return;
1837 } 1907 }
1838#endif 1908#endif
1839 1909
1840 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1910 clickintime = ev.time - MEvent.time < multiClickTime;
1841 1911
1842 if (reportmode) 1912 if (reportmode)
1843 { 1913 {
1844 /* mouse report from vt window */ 1914 /* mouse report from vt window */
1845 /* save the xbutton state (for ButtonRelease) */ 1915 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1916 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1917#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1918 if (ev.button == MEvent.button && clickintime)
1849 { 1919 {
1850 /* same button, within alloted time */ 1920 /* same button, within allowed time */
1851 MEvent.clicks++; 1921 MEvent.clicks++;
1852 1922
1853 if (MEvent.clicks > 1) 1923 if (MEvent.clicks > 1)
1854 { 1924 {
1855 /* only report double clicks */ 1925 /* only report double clicks */
… …
1936 if (scrollBar.upButton (ev.y)) 2006 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */ 2007 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y)) 2008 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */ 2009 direction = DN; /* down */
1940 2010
1941 scrollBar.state = STATE_IDLE; 2011 scrollBar.state = SB_STATE_IDLE;
1942 /* 2012 /*
1943 * Rxvt-style scrollbar: 2013 * Rxvt-style scrollbar:
1944 * move up if mouse is above slider 2014 * move up if mouse is above slider
1945 * move dn if mouse is below slider 2015 * move dn if mouse is below slider
1946 * 2016 *
… …
1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2055 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1986#endif 2056#endif
1987 if (scr_page (direction, 1)) 2057 if (scr_page (direction, 1))
1988 { 2058 {
1989 if (direction == UP) 2059 if (direction == UP)
1990 scrollBar.state = STATE_UP; 2060 scrollBar.state = SB_STATE_UP;
1991 else 2061 else
1992 scrollBar.state = STATE_DOWN; 2062 scrollBar.state = SB_STATE_DOWN;
1993 } 2063 }
1994 } 2064 }
1995 else 2065 else
1996 switch (ev.button) 2066 switch (ev.button)
1997 { 2067 {
1998 case Button2: 2068 case Button2:
1999 switch (scrollBar.align) 2069 switch (scrollBar.align)
2000 { 2070 {
2001 case R_SB_ALIGN_TOP: 2071 case SB_ALIGN_TOP:
2002 csrO = 0; 2072 csrO = 0;
2003 break; 2073 break;
2004 case R_SB_ALIGN_CENTRE: 2074 case SB_ALIGN_CENTRE:
2005 csrO = (scrollBar.bot - scrollBar.top) / 2; 2075 csrO = (scrollBar.bot - scrollBar.top) / 2;
2006 break; 2076 break;
2007 case R_SB_ALIGN_BOTTOM: 2077 case SB_ALIGN_BOTTOM:
2008 csrO = scrollBar.bot - scrollBar.top; 2078 csrO = scrollBar.bot - scrollBar.top;
2009 break; 2079 break;
2010 } 2080 }
2011 2081
2012 if (scrollBar.style == R_SB_XTERM 2082 if (scrollBar.style == SB_STYLE_XTERM
2013 || scrollbar_above_slider (ev.y) 2083 || scrollBar.above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2084 || scrollBar.below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2085 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2016 2086
2017 scrollBar.state = STATE_MOTION; 2087 scrollBar.state = SB_STATE_MOTION;
2018 break; 2088 break;
2019 2089
2020 case Button1: 2090 case Button1:
2021 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2091 if (scrollBar.align == SB_ALIGN_CENTRE)
2022 csrO = ev.y - scrollBar.top; 2092 csrO = ev.y - scrollBar.top;
2023 /* FALLTHROUGH */ 2093 /* FALLTHROUGH */
2024 2094
2025 case Button3: 2095 case Button3:
2026 if (scrollBar.style != R_SB_XTERM) 2096 if (scrollBar.style != SB_STYLE_XTERM)
2027 { 2097 {
2028 if (scrollbar_above_slider (ev.y)) 2098 if (scrollBar.above_slider (ev.y))
2029# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
2030 scr_page (UP, nrow - 1); 2100 scr_page (UP, nrow - 1);
2031# else 2101# else
2032 scr_page (UP, nrow / 4); 2102 scr_page (UP, nrow / 4);
2033# endif 2103# endif
2034 else if (scrollbar_below_slider (ev.y)) 2104 else if (scrollBar.below_slider (ev.y))
2035# ifdef RXVT_SCROLL_FULL 2105# ifdef RXVT_SCROLL_FULL
2036 scr_page (DN, nrow - 1); 2106 scr_page (DN, nrow - 1);
2037# else 2107# else
2038 scr_page (DN, nrow / 4); 2108 scr_page (DN, nrow / 4);
2039# endif 2109# endif
2040 else 2110 else
2041 scrollBar.state = STATE_MOTION; 2111 scrollBar.state = SB_STATE_MOTION;
2042 } 2112 }
2043 else 2113 else
2044 { 2114 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2115 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2116 (nrow
2047 * scrollbar_position (ev.y) 2117 * scrollBar.position (ev.y)
2048 / scrollbar_size ())); 2118 / scrollBar.size ()));
2049 } 2119 }
2050 2120
2051 break; 2121 break;
2052 } 2122 }
2053 } 2123 }
… …
2063 2133
2064 csrO = 0; /* reset csr Offset */ 2134 csrO = 0; /* reset csr Offset */
2065 if (!bypass_keystate) 2135 if (!bypass_keystate)
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2136 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2137
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2138 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2069 { 2139 {
2070 scrollBar.state = STATE_IDLE; 2140 scrollBar.state = SB_STATE_IDLE;
2071 scrollbar_show (0); 2141 scrollBar.show (0);
2072 } 2142 }
2073 2143
2074#ifdef SELECTION_SCROLLING 2144#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2145 sel_scroll_ev.stop();
2076#endif 2146#endif
… …
2088 2158
2089 if (reportmode) 2159 if (reportmode)
2090 { 2160 {
2091 /* mouse report from vt window */ 2161 /* mouse report from vt window */
2092 /* don't report release of wheel "buttons" */ 2162 /* don't report release of wheel "buttons" */
2093 if (ev.button >= 4) 2163 if (ev.button >= 4 && ev.button <= 7)
2094 return; 2164 return;
2095#ifdef MOUSE_REPORT_DOUBLECLICK 2165#ifdef MOUSE_REPORT_DOUBLECLICK
2096 /* only report the release of 'slow' single clicks */ 2166 /* only report the release of 'slow' single clicks */
2097 if (MEvent.button != AnyButton 2167 if (MEvent.button != AnyButton
2098 && (ev.button != MEvent.button 2168 && (ev.button != MEvent.button
2099 || (ev.time - MEvent.time 2169 || (ev.time - MEvent.time
2100 > MULTICLICK_TIME / 2))) 2170 > multiClickTime / 2)))
2101 { 2171 {
2102 MEvent.clicks = 0; 2172 MEvent.clicks = 0;
2103 MEvent.button = AnyButton; 2173 MEvent.button = ev.button;
2104 mouse_report (ev); 2174 mouse_report (ev);
2105 } 2175 }
2106#else /* MOUSE_REPORT_DOUBLECLICK */ 2176#else /* MOUSE_REPORT_DOUBLECLICK */
2177 MEvent.button = ev.button;
2178 mouse_report (ev);
2107 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2108 mouse_report (ev);
2109#endif /* MOUSE_REPORT_DOUBLECLICK */ 2180#endif /* MOUSE_REPORT_DOUBLECLICK */
2110 return; 2181 return;
2111 } 2182 }
2112 2183
2113 /* 2184 /*
… …
2125 case Button3: 2196 case Button3:
2126 selection_make (ev.time); 2197 selection_make (ev.time);
2127 break; 2198 break;
2128 2199
2129 case Button2: 2200 case Button2:
2130 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?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2202 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2203 break;
2133 2204
2134#ifdef MOUSE_WHEEL 2205#ifdef MOUSE_WHEEL
2135 case Button4: 2206 case Button4:
2136 case Button5: 2207 case Button5:
2137 { 2208 {
2138 int i; 2209 int lines;
2139 page_dirn v; 2210 page_dirn dirn;
2140 2211
2141 v = ev.button == Button4 ? UP : DN; 2212 dirn = ev.button == Button4 ? UP : DN;
2142 2213
2143 if (ev.state & ShiftMask) 2214 if (ev.state & ShiftMask)
2144 i = 1; 2215 lines = 1;
2145 else if (option (Opt_mouseWheelScrollPage)) 2216 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2217 lines = nrow - 1;
2147 else 2218 else
2148 i = 5; 2219 lines = 5;
2149 2220
2150# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2151 if (ev.state & ControlMask) 2222 if (ev.state & ControlMask)
2152 { 2223 {
2153 mouse_slip_wheel_speed += v ? -1 : 1; 2224 mouse_slip_wheel_speed += dirn;
2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2225 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2156 2226
2157 if (!slip_wheel_ev.is_active ()) 2227 if (!slip_wheel_ev.is_active ())
2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2228 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2159 } 2229 }
2160 else 2230 else
2161# endif 2231# endif
2162 { 2232 {
2163 scr_page (v, i); 2233 scr_page (dirn, lines);
2164 scrollbar_show (1); 2234 scrollBar.show (1);
2165 } 2235 }
2166 } 2236 }
2167 break; 2237 break;
2168#endif 2238#endif
2169 } 2239 }
2170 } 2240 }
2171} 2241}
2172 2242
2173/*}}} */ 2243/*}}} */
2174 2244
2175bool 2245void ecb_hot
2176rxvt_term::cmd_parse () 2246rxvt_term::cmd_parse ()
2177{ 2247{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2248 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2249 char *seq_begin; // remember start of esc-sequence here
2181 2250
2182 for (;;) 2251 for (;;)
2183 { 2252 {
2184 if (ch == NOCHAR) 2253 if (ecb_unlikely (ch == NOCHAR))
2185 { 2254 {
2186 seq_begin = cmdbuf_ptr; 2255 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2256 ch = next_char ();
2188 2257
2189 if (ch == NOCHAR) 2258 if (ch == NOCHAR)
2190 break; 2259 break;
2191 } 2260 }
2192 2261
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2262 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2263 {
2195 if (!seen_input) 2264 if (ecb_unlikely (!seen_input))
2196 { 2265 {
2197 seen_input = 1; 2266 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2267 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2268 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2269 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2282 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2283 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2284
2216 for (;;) 2285 for (;;)
2217 { 2286 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2287 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2288 break;
2220 2289
2221 *str++ = ch; 2290 *str++ = ch;
2222 2291
2223 if (ch == C0_LF || str >= eol) 2292 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2293 {
2225 if (ch == C0_LF) 2294 if (ch == C0_LF)
2226 nlines++; 2295 nlines++;
2227 2296
2228 refresh_count++; 2297 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2346 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2347 * if skipScroll is enabled.
2279 */ 2348 */
2280 if (refreshnow) 2349 if (refreshnow)
2281 { 2350 {
2282 flag = true;
2283 scr_refresh (); 2351 scr_refresh ();
2284 want_refresh = 1; 2352 want_refresh = 1;
2285 } 2353 }
2286
2287 } 2354 }
2288 else 2355 else
2289 { 2356 {
2290 try 2357 try
2291 { 2358 {
… …
2299 } 2366 }
2300 2367
2301 ch = NOCHAR; 2368 ch = NOCHAR;
2302 } 2369 }
2303 } 2370 }
2304
2305 return flag;
2306} 2371}
2307 2372
2308// read the next character 2373// read the next character
2309wchar_t 2374wchar_t ecb_hot
2310rxvt_term::next_char () NOTHROW 2375rxvt_term::next_char () noexcept
2311{ 2376{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2377 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2378 {
2314 // assume 7-bit to be ascii ALWAYS 2379 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2380 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2316 return *cmdbuf_ptr++; 2381 return *cmdbuf_ptr++;
2317 2382
2318 wchar_t wc; 2383 wchar_t wc;
2319 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);
2320 2385
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2389 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2390 break;
2326 } 2391 }
2327 2392
2328 if (len == (size_t)-1) 2393 if (len == (size_t)-1)
2394 {
2395 mbstate.reset (); // reset now undefined conversion state
2396 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2397 // in which case we "erroneously" return the next byte which might be valid.
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2398 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 }
2330 2400
2331 // assume wchar == unicode 2401 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2402 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2403 return wc & UNICODE_MASK;
2334 } 2404 }
2335 2405
2336 return NOCHAR; 2406 return NOCHAR;
2337} 2407}
2338 2408
2339// read the next octet 2409// read the next octet
2340uint32_t 2410uint32_t ecb_hot
2341rxvt_term::next_octet () NOTHROW 2411rxvt_term::next_octet () noexcept
2342{ 2412{
2343 return cmdbuf_ptr < cmdbuf_endp 2413 return cmdbuf_ptr < cmdbuf_endp
2344 ? (unsigned char)*cmdbuf_ptr++ 2414 ? (unsigned char)*cmdbuf_ptr++
2345 : NOCHAR; 2415 : NOCHAR;
2346} 2416}
2347 2417
2348static class out_of_input out_of_input; 2418static class out_of_input out_of_input;
2349 2419
2350/* rxvt_cmd_getc () - Return next input character */ 2420wchar_t ecb_hot
2351/* 2421rxvt_term::cmd_getc ()
2352 * Return the next input character after first passing any keyboard input
2353 * to the command.
2354 */
2355wchar_t
2356rxvt_term::cmd_getc () THROW ((class out_of_input))
2357{ 2422{
2358 wchar_t c = next_char (); 2423 wchar_t c = next_char ();
2359 2424
2360 if (c == NOCHAR) 2425 if (c == NOCHAR)
2361 throw out_of_input; 2426 throw out_of_input;
2362 2427
2363 return c; 2428 return c;
2364} 2429}
2365 2430
2366uint32_t 2431uint32_t ecb_hot
2367rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2432rxvt_term::cmd_get8 ()
2368{ 2433{
2369 uint32_t c = next_octet (); 2434 uint32_t c = next_octet ();
2370 2435
2371 if (c == NOCHAR) 2436 if (c == NOCHAR)
2372 throw out_of_input; 2437 throw out_of_input;
… …
2375} 2440}
2376 2441
2377/*{{{ print pipe */ 2442/*{{{ print pipe */
2378/*----------------------------------------------------------------------*/ 2443/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2444#ifdef PRINTPIPE
2380FILE * 2445FILE * ecb_cold
2381rxvt_term::popen_printer () 2446rxvt_term::popen_printer ()
2382{ 2447{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2448 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2449
2385 if (stream == NULL) 2450 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2451 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2452
2388 return stream; 2453 return stream;
2389} 2454}
2390 2455
2391int 2456int ecb_cold
2392rxvt_term::pclose_printer (FILE *stream) 2457rxvt_term::pclose_printer (FILE *stream)
2393{ 2458{
2394 fflush (stream); 2459 fflush (stream);
2395 return pclose (stream); 2460 return pclose (stream);
2396} 2461}
2397 2462
2398/* 2463/*
2399 * simulate attached vt100 printer 2464 * simulate attached vt100 printer
2400 */ 2465 */
2401void 2466void ecb_cold
2402rxvt_term::process_print_pipe () 2467rxvt_term::process_print_pipe ()
2403{ 2468{
2404 int done; 2469 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2470
2407 if ((fd = popen_printer ()) == NULL) 2471 if (!fd)
2408 return; 2472 return;
2409 2473
2410 /* 2474 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2475 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2476 * is received.
2413 */ 2477 */
2414 for (done = 0; !done;) 2478 for (int done = 0; !done; )
2415 { 2479 {
2416 unsigned char buf[8]; 2480 unsigned char buf[8];
2417 unicode_t ch; 2481 unicode_t ch;
2418 unsigned int i, len; 2482 unsigned int i, len;
2419 2483
… …
2453 pclose_printer (fd); 2517 pclose_printer (fd);
2454} 2518}
2455#endif /* PRINTPIPE */ 2519#endif /* PRINTPIPE */
2456/*}}} */ 2520/*}}} */
2457 2521
2458/* *INDENT-OFF* */
2459enum { 2522enum {
2460 C1_40 = 0x40, 2523 C1_40 = 0x40,
2461 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,
2462 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,
2463 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,
2464 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,
2465}; 2528};
2466/* *INDENT-ON* */
2467 2529
2468/*{{{ process non-printing single characters */ 2530/*{{{ process non-printing single characters */
2469void 2531void ecb_hot
2470rxvt_term::process_nonprinting (unicode_t ch) 2532rxvt_term::process_nonprinting (unicode_t ch)
2471{ 2533{
2472 switch (ch) 2534 switch (ch)
2473 { 2535 {
2474 case C0_ESC: 2536 case C0_ESC:
… …
2504 scr_charset_choose (0); 2566 scr_charset_choose (0);
2505 break; 2567 break;
2506 2568
2507#ifdef EIGHT_BIT_CONTROLS 2569#ifdef EIGHT_BIT_CONTROLS
2508 // 8-bit controls 2570 // 8-bit controls
2509 case 0x90: /* DCS */ 2571 case 0x90: /* DCS */
2510 process_dcs_seq (); 2572 process_dcs_seq ();
2511 break; 2573 break;
2512 case 0x9b: /* CSI */ 2574 case 0x9b: /* CSI */
2513 process_csi_seq (); 2575 process_csi_seq ();
2514 break; 2576 break;
2515 case 0x9d: /* OSC */ 2577 case 0x9d: /* OSC */
2516 process_osc_seq (); 2578 process_osc_seq ();
2517 break; 2579 break;
2518#endif 2580#endif
2519 } 2581 }
2520} 2582}
2521/*}}} */ 2583/*}}} */
2522 2584
2523 2585
2524/*{{{ process VT52 escape sequences */ 2586/*{{{ process VT52 escape sequences */
2525void 2587void ecb_cold
2526rxvt_term::process_escape_vt52 (unicode_t ch) 2588rxvt_term::process_escape_vt52 (unicode_t ch)
2527{ 2589{
2528 int row, col; 2590 int row, col;
2529 2591
2530 switch (ch) 2592 switch (ch)
… …
2564 break; 2626 break;
2565 case 'Z': /* identify the terminal type */ 2627 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2628 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2629 break;
2568 case '<': /* turn off VT52 mode */ 2630 case '<': /* turn off VT52 mode */
2569 set_privmode (PrivMode_vt52, 0); 2631 priv_modes &= ~PrivMode_vt52;
2570 break; 2632 break;
2571 case 'F': /* use special graphics character set */ 2633 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2634 case 'G': /* use regular character set */
2573 /* unimplemented */ 2635 /* unimplemented */
2574 break; 2636 break;
… …
2580} 2642}
2581/*}}} */ 2643/*}}} */
2582 2644
2583 2645
2584/*{{{ process escape sequences */ 2646/*{{{ process escape sequences */
2585void 2647void ecb_hot
2586rxvt_term::process_escape_seq () 2648rxvt_term::process_escape_seq ()
2587{ 2649{
2588 unicode_t ch = cmd_getc (); 2650 unicode_t ch = cmd_getc ();
2589 2651
2590 if (priv_modes & PrivMode_vt52) 2652 if (priv_modes & PrivMode_vt52)
… …
2593 return; 2655 return;
2594 } 2656 }
2595 2657
2596 switch (ch) 2658 switch (ch)
2597 { 2659 {
2598 /* case 1: do_tek_mode (); break; */
2599 case '#': 2660 case '#':
2600 if (cmd_getc () == '8') 2661 if (cmd_getc () == '8')
2601 scr_E (); 2662 scr_E ();
2602 break; 2663 break;
2603 case '(': 2664 case '(':
… …
2626#if !ENABLE_MINIMAL 2687#if !ENABLE_MINIMAL
2627 case '9': 2688 case '9':
2628 scr_forwardindex (); 2689 scr_forwardindex ();
2629 break; 2690 break;
2630#endif 2691#endif
2692 // DECPAM/DECPNM
2631 case '=': 2693 case '=':
2694 priv_modes |= PrivMode_aplKP;
2695 break;
2632 case '>': 2696 case '>':
2633 set_privmode (PrivMode_aplKP, ch == '='); 2697 priv_modes &= ~PrivMode_aplKP;
2634 break; 2698 break;
2635 2699
2636 case C1_40: 2700 case C1_40:
2637 cmd_getc (); 2701 cmd_getc ();
2638 break; 2702 break;
… …
2642 2706
2643 /* 8.3.87: NEXT LINE */ 2707 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2708 case C1_NEL: /* ESC E */
2645 { 2709 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2711 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2648 } 2712 }
2649 break; 2713 break;
2650 2714
2715#if 0 // disabled because embedded newlines can make exploits easier
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2716 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2717 case C1_ESA: /* ESC G */
2653 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 */
2654 break; 2721 break;
2722#endif
2655 2723
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2724 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2725 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2726 scr_set_tab (1);
2659 break; 2727 break;
… …
2662 case C1_RI: /* ESC M */ 2730 case C1_RI: /* ESC M */
2663 scr_index (DN); 2731 scr_index (DN);
2664 break; 2732 break;
2665 2733
2666 /* 8.3.142: SINGLE-SHIFT TWO */ 2734 /* 8.3.142: SINGLE-SHIFT TWO */
2667 /*case C1_SS2: scr_single_shift (2); break; */ 2735 /* case C1_SS2: break; */
2668 2736
2669 /* 8.3.143: SINGLE-SHIFT THREE */ 2737 /* 8.3.143: SINGLE-SHIFT THREE */
2670 /*case C1_SS3: scr_single_shift (3); break; */ 2738 /* case C1_SS3: break; */
2671 2739
2672 /* 8.3.27: DEVICE CONTROL STRING */ 2740 /* 8.3.27: DEVICE CONTROL STRING */
2673 case C1_DCS: /* ESC P */ 2741 case C1_DCS: /* ESC P */
2674 process_dcs_seq (); 2742 process_dcs_seq ();
2675 break; 2743 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2745 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2746 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2747 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2748 break; /* steal obsolete ESC [ c */
2681 2749
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2750 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2751 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2752 process_csi_seq ();
2685 break; 2753 break;
2686 2754
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2755 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2756 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2757 process_osc_seq ();
2690 break; 2758 break;
2691 2759
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2760 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2761 case 'c':
2694 mbstate.reset (); 2762 mbstate.reset ();
2695 scr_poweron (); 2763 scr_poweron ();
2696 scrollbar_show (1); 2764 scrollBar.show (1);
2697 break; 2765 break;
2698 2766
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2767 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2768 case 'n':
2701 scr_charset_choose (2); 2769 scr_charset_choose (2);
… …
2708 } 2776 }
2709} 2777}
2710/*}}} */ 2778/*}}} */
2711 2779
2712/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2780/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2713/* *INDENT-OFF* */
2714enum { 2781enum {
2715 CSI_ICH = 0x40, 2782 CSI_ICH = 0x40,
2716 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,
2717 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 ,
2718 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,
… …
2721 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,
2722 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 ,
2723 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
2724}; 2791};
2725 2792
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2793#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2794 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2795 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2796#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2797 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2798
2732const unsigned char csi_defaults[] = 2799static const unsigned char csi_defaults[] =
2733 { 2800 {
2734 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, */
2735 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, */
2736 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, */
2737 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, [, \, ], ^, _, */
2738 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, */
2739 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, */
2740 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, */
2741 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, {, |, }, ~, */
2742 }; 2809 };
2743/* *INDENT-ON* */
2744 2810
2745void 2811void ecb_hot
2746rxvt_term::process_csi_seq () 2812rxvt_term::process_csi_seq ()
2747{ 2813{
2748 unicode_t ch, priv, i; 2814 unicode_t ch, priv, prev_ch, i;
2749 unsigned int nargs, p; 2815 unsigned int nargs, p;
2750 int n, ndef; 2816 int n, ndef;
2751 int arg[ESC_ARGS] = { }; 2817 int arg[ESC_ARGS] = { };
2752 2818
2753 nargs = 0; 2819 nargs = 0;
2754 2820
2755 priv = 0; 2821 priv = 0;
2756 ch = cmd_getc (); 2822 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2823 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2824 {
2759 /* '<' '=' '>' '?' */ 2825 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2826 priv = ch;
2761 ch = cmd_getc (); 2827 ch = cmd_getc ();
2762 } 2828 }
2763 2829
2830 prev_ch = 0;
2764 /* read any numerical arguments */ 2831 /* read any numerical arguments */
2765 for (n = -1; ch < CSI_ICH; ) 2832 for (n = -1; ch < CSI_ICH; )
2766 { 2833 {
2767 if (isdigit (ch)) 2834 if (isdigit (ch))
2768 { 2835 {
… …
2778 n = -1; 2845 n = -1;
2779 } 2846 }
2780 else if (IS_CONTROL (ch)) 2847 else if (IS_CONTROL (ch))
2781 process_nonprinting (ch); 2848 process_nonprinting (ch);
2782 2849
2850 prev_ch = ch;
2783 ch = cmd_getc (); 2851 ch = cmd_getc ();
2784 } 2852 }
2785 2853
2786 if (ch > CSI_7F) 2854 if (ch > CSI_7F)
2787 return; 2855 return;
… …
2817 break; 2885 break;
2818 2886
2819 case '?': 2887 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2888 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 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);
2822 break; 2892 break;
2893
2894 case '!':
2895 if (ch == CSI_70)
2896 {
2897 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2898 scr_soft_reset ();
2899
2900 static const int pm_h[] = { 7, 25 };
2901 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2902
2903 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2904 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2823 } 2905 }
2906 break;
2907 }
2908
2824 return; 2909 return;
2825 } 2910 }
2826 2911
2827 switch (ch) 2912 switch (ch)
2828 { 2913 {
… …
2842 } 2927 }
2843 break; 2928 break;
2844#endif 2929#endif
2845 2930
2846 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2931 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2847 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2932 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2848 arg[0] = -arg[0]; 2933 arg[0] = -arg[0];
2849 /* FALLTHROUGH */ 2934 /* FALLTHROUGH */
2850 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2935 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2851 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2936 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2852 scr_gotorc (arg[0], 0, RELATIVE); 2937 scr_gotorc (arg[0], 0, RELATIVE);
2853 break; 2938 break;
2854 2939
2855 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2940 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2856 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2941 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2857#ifdef ISO6429 2942#ifdef ISO6429
2858 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2859#else /* emulate common DEC VTs */ 2944#else /* emulate common DEC VTs */
2860 arg[0] = arg[0] ? -arg[0] : -1; 2945 arg[0] = arg[0] ? -arg[0] : -1;
2861#endif 2946#endif
… …
2952 case 7: /* unofficial extension */ 3037 case 7: /* unofficial extension */
2953 if (option (Opt_insecure)) 3038 if (option (Opt_insecure))
2954 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3039 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2955 break; 3040 break;
2956 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';
2957 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3046 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
2958 break; 3047 break;
3048 }
2959 } 3049 }
2960 break; 3050 break;
2961 3051
2962 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3052 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2963 switch (arg[0]) 3053 switch (arg[0])
… …
3006 scr_insert_mode (1); 3096 scr_insert_mode (1);
3007 else if (arg[0] == 20) 3097 else if (arg[0] == 20)
3008 priv_modes |= PrivMode_LFNL; 3098 priv_modes |= PrivMode_LFNL;
3009 break; 3099 break;
3010 3100
3101 case CSI_71: // DECSCUSR: set cursor style
3102 if (prev_ch == ' ')
3103 set_cursor_style (arg[0]);
3104 break;
3105
3011 /* 3106 /*
3012 * PRIVATE USE beyond this point. All CSI_7? sequences here 3107 * PRIVATE USE beyond this point. All CSI_7? sequences here
3013 */ 3108 */
3014 case CSI_72: /* DECSTBM: set top and bottom margins */ 3109 case CSI_72: /* DECSTBM: set top and bottom margins */
3015 if (nargs == 1) 3110 if (nargs == 1)
… …
3043 } 3138 }
3044} 3139}
3045/*}}} */ 3140/*}}} */
3046 3141
3047#if !ENABLE_MINIMAL 3142#if !ENABLE_MINIMAL
3048/* ARGSUSED */
3049void 3143void
3050rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3144rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3051{ 3145{
3052 int x, y; 3146 int x, y;
3053 XWindowAttributes wattr; 3147 XWindowAttributes wattr;
… …
3062 { 3156 {
3063 /* 3157 /*
3064 * commands 3158 * commands
3065 */ 3159 */
3066 case 1: /* deiconify window */ 3160 case 1: /* deiconify window */
3067 XMapWindow (dpy, parent[0]); 3161 XMapWindow (dpy, parent);
3068 break; 3162 break;
3069 case 2: /* iconify window */ 3163 case 2: /* iconify window */
3070 XIconifyWindow (dpy, parent[0], display->screen); 3164 XIconifyWindow (dpy, parent, display->screen);
3071 break; 3165 break;
3072 case 3: /* set position (pixels) */ 3166 case 3: /* set position (pixels) */
3073 XMoveWindow (dpy, parent[0], args[1], args[2]); 3167 XMoveWindow (dpy, parent, args[1], args[2]);
3074 break; 3168 break;
3075 case 4: /* set size (pixels) */ 3169 case 4: /* set size (pixels) */
3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3170 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3077 break; 3171 break;
3078 case 5: /* raise window */ 3172 case 5: /* raise window */
3079 XRaiseWindow (dpy, parent[0]); 3173 XRaiseWindow (dpy, parent);
3080 break; 3174 break;
3081 case 6: /* lower window */ 3175 case 6: /* lower window */
3082 XLowerWindow (dpy, parent[0]); 3176 XLowerWindow (dpy, parent);
3083 break; 3177 break;
3084 case 7: /* refresh window */ 3178 case 7: /* refresh window */
3085 scr_touch (true); 3179 scr_touch (true);
3086 break; 3180 break;
3087 case 8: /* set size (chars) */ 3181 case 8: /* set size (chars) */
… …
3090 break; 3184 break;
3091 3185
3092 //case 9: NYI, TODO, restore maximized window or maximize window 3186 //case 9: NYI, TODO, restore maximized window or maximize window
3093 default: 3187 default:
3094 if (args[0] >= 24) /* set height (chars) */ 3188 if (args[0] >= 24) /* set height (chars) */
3095 set_widthheight ((unsigned int)width, 3189 set_widthheight ((unsigned int)vt_width,
3096 (unsigned int) (args[1] * fheight)); 3190 (unsigned int) (args[1] * fheight));
3097 break; 3191 break;
3098 3192
3099 /* 3193 /*
3100 * reports - some output format copied from XTerm 3194 * reports - some output format copied from XTerm
3101 */ 3195 */
3102 case 11: /* report window state */ 3196 case 11: /* report window state */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3197 XGetWindowAttributes (dpy, parent, &wattr);
3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3198 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3105 break; 3199 break;
3106 case 13: /* report window position */ 3200 case 13: /* report window position */
3107 XGetWindowAttributes (dpy, parent[0], &wattr); 3201 XGetWindowAttributes (dpy, parent, &wattr);
3108 XTranslateCoordinates (dpy, parent[0], wattr.root, 3202 XTranslateCoordinates (dpy, parent, wattr.root,
3109 -wattr.border_width, -wattr.border_width, 3203 -wattr.border_width, -wattr.border_width,
3110 &x, &y, &wdummy); 3204 &x, &y, &wdummy);
3111 tt_printf ("\033[3;%d;%dt", x, y); 3205 tt_printf ("\033[3;%d;%dt", x, y);
3112 break; 3206 break;
3113 case 14: /* report window size (pixels) */ 3207 case 14: /* report window size (pixels) */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3209 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3116 break; 3210 break;
3117 case 18: /* report text area size (chars) */ 3211 case 18: /* report text area size (chars) */
3118 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3212 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3119 break; 3213 break;
… …
3121 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3215 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3122 break; 3216 break;
3123 case 20: /* report icon label */ 3217 case 20: /* report icon label */
3124 { 3218 {
3125 char *s; 3219 char *s;
3126 XGetIconName (dpy, parent[0], &s); 3220 XGetIconName (dpy, parent, &s);
3127 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 */
3128 XFree (s); 3222 XFree (s);
3129 } 3223 }
3130 break; 3224 break;
3131 case 21: /* report window title */ 3225 case 21: /* report window title */
3132 { 3226 {
3133 char *s; 3227 char *s;
3134 XFetchName (dpy, parent[0], &s); 3228 XFetchName (dpy, parent, &s);
3135 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 */
3136 XFree (s); 3230 XFree (s);
3137 } 3231 }
3138 break; 3232 break;
3139 } 3233 }
… …
3144/* 3238/*
3145 * get input up until STRING TERMINATOR (or BEL) 3239 * get input up until STRING TERMINATOR (or BEL)
3146 * ends_how is terminator used. returned input must be free()'d 3240 * ends_how is terminator used. returned input must be free()'d
3147 */ 3241 */
3148char * 3242char *
3149rxvt_term::get_to_st (unicode_t &ends_how) 3243rxvt_term::get_to_st (string_term &st)
3150{ 3244{
3151 unicode_t ch; 3245 unicode_t ch;
3152 bool seen_esc = false; 3246 bool seen_esc = false;
3153 unsigned int n = 0; 3247 unsigned int n = 0;
3154 wchar_t string[STRING_MAX]; 3248 wchar_t string[CBUFSIZ];
3155 3249
3156 while ((ch = cmd_getc ()) != NOCHAR) 3250 while ((ch = cmd_getc ()) != NOCHAR)
3157 { 3251 {
3158 if (seen_esc) 3252 if (seen_esc)
3159 { 3253 {
… …
3174 else if (ch < 0x20) 3268 else if (ch < 0x20)
3175 return NULL; /* other control character - exit */ 3269 return NULL; /* other control character - exit */
3176 3270
3177 seen_esc = false; 3271 seen_esc = false;
3178 3272
3179 if (n >= STRING_MAX - 1) 3273 if (n >= sizeof (string) - 1)
3180 // stop at some sane length 3274 // stop at some sane length
3181 return NULL; 3275 return NULL;
3182 3276
3183 string[n++] = ch; 3277 string[n++] = ch;
3184 } 3278 }
3185 3279
3186 string[n++] = '\0'; 3280 string[n++] = '\0';
3187 3281
3188 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';
3189 3287
3190 return rxvt_wcstombs (string); 3288 return rxvt_wcstombs (string);
3191} 3289}
3192 3290
3193/*----------------------------------------------------------------------*/ 3291/*----------------------------------------------------------------------*/
… …
3195 * 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)'
3196 */ 3294 */
3197void 3295void
3198rxvt_term::process_dcs_seq () 3296rxvt_term::process_dcs_seq ()
3199{ 3297{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3298 /*
3204 * Not handled yet 3299 * Not handled yet
3205 */ 3300 */
3301
3302 string_term st;
3206 s = get_to_st (eh); 3303 char *s = get_to_st (st);
3207 if (s) 3304 if (s)
3208 free (s); 3305 free (s);
3209 3306
3210 return; 3307 return;
3211} 3308}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3312 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3313 */
3217void 3314void
3218rxvt_term::process_osc_seq () 3315rxvt_term::process_osc_seq ()
3219{ 3316{
3220 unicode_t ch, eh;
3221 int arg; 3317 int arg;
3222 3318
3223 ch = cmd_getc (); 3319 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3320 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3321 arg = arg * 10 + (ch - '0');
3226 3322
3227 if (ch == ';') 3323 if (ch == ';')
3228 { 3324 {
3325 string_term st;
3229 char *s = get_to_st (eh); 3326 char *s = get_to_st (st);
3230 3327
3231 if (s) 3328 if (s)
3232 { 3329 {
3233 process_xterm_seq (arg, s, eh); 3330 process_xterm_seq (arg, s, st);
3234 free (s); 3331 free (s);
3235 } 3332 }
3236 } 3333 }
3237} 3334}
3238 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
3239void 3439void
3240rxvt_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)
3241{ 3441{
3242 if (str[0] == '?' && !str[1]) 3442 if (str[0] == '?' && !str[1])
3243 { 3443 {
3244 rgba c; 3444 rgba c;
3245 pix_colors_focused[color].get (c); 3445 pix_colors_focused[color].get (c);
3446 char rgba_str[32];
3246 3447
3247#if XFT 3448#if XFT
3248 if (c.a != rgba::MAX_CC) 3449 if (c.a != rgba::MAX_CC)
3249 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);
3250 else 3451 else
3251#endif 3452#endif
3252 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);
3253 } 3459 }
3254 else 3460 else
3255 set_window_color (color, str); 3461 set_window_color (color, str);
3256} 3462}
3257 3463
3258/* 3464/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3465 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3466 */
3261void 3467void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3468rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3263{ 3469{
3264 int color; 3470 int color;
3265 char *buf, *name; 3471 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3472 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3473 int saveop = op;
… …
3294 unsigned long bytes_after; 3500 unsigned long bytes_after;
3295 unsigned char *value = 0; 3501 unsigned char *value = 0;
3296 const char *str = ""; 3502 const char *str = "";
3297 3503
3298 if (prop 3504 if (prop
3299 && XGetWindowProperty (dpy, parent[0], 3505 && XGetWindowProperty (dpy, parent,
3300 prop, 0, 1<<16, 0, AnyPropertyType, 3506 prop, 0, 1<<16, 0, AnyPropertyType,
3301 &actual_type, &actual_format, 3507 &actual_type, &actual_format,
3302 &nitems, &bytes_after, &value) == Success 3508 &nitems, &bytes_after, &value) == Success
3303 && actual_type != None 3509 && actual_type != None
3304 && actual_format == 8) 3510 && actual_format == 8)
3305 str = (const char *)(value); 3511 str = (const char *)(value);
3306 3512
3307 tt_printf ("\033]%d;%s%c", op, str, resp); 3513 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3308 3514
3309 XFree (value); 3515 XFree (value);
3310 } 3516 }
3311 else 3517 else
3312 { 3518 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3519 char *eq = strchr (str, '=');
3314 3520
3315 if (eq) 3521 if (eq)
3316 { 3522 {
3317 *eq = 0; 3523 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3524 set_utf8_property (display->atom (str), eq + 1);
3319 } 3525 }
3320 else 3526 else
3321 XDeleteProperty (dpy, parent[0], 3527 XDeleteProperty (dpy, parent,
3322 display->atom (str)); 3528 display->atom (str));
3323 } 3529 }
3324 break; 3530 break;
3325 3531
3326 case XTerm_Color: 3532 case XTerm_Color:
… …
3336 break; 3542 break;
3337 3543
3338 if ((buf = strchr (name, ';')) != NULL) 3544 if ((buf = strchr (name, ';')) != NULL)
3339 *buf++ = '\0'; 3545 *buf++ = '\0';
3340 3546
3341 process_color_seq (op, color, name, resp); 3547 process_color_seq (op, color, name, st);
3342 } 3548 }
3343 break; 3549 break;
3344 case Rxvt_restoreFG: 3550 case Rxvt_restoreFG:
3345 case XTerm_Color00: 3551 case XTerm_Color00:
3346 process_color_seq (op, Color_fg, str, resp); 3552 process_color_seq (op, Color_fg, str, st);
3347 break; 3553 break;
3348 case Rxvt_restoreBG: 3554 case Rxvt_restoreBG:
3349 case XTerm_Color01: 3555 case XTerm_Color01:
3350 process_color_seq (op, Color_bg, str, resp); 3556 process_color_seq (op, Color_bg, str, st);
3351 break; 3557 break;
3352#ifndef NO_CURSORCOLOR 3558#ifndef NO_CURSORCOLOR
3353 case XTerm_Color_cursor: 3559 case XTerm_Color_cursor:
3354 process_color_seq (op, Color_cursor, str, resp); 3560 process_color_seq (op, Color_cursor, str, st);
3355 break; 3561 break;
3356#endif 3562#endif
3357 case XTerm_Color_pointer_fg: 3563 case XTerm_Color_pointer_fg:
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3564 process_color_seq (op, Color_pointer_fg, str, st);
3359 break; 3565 break;
3360 case XTerm_Color_pointer_bg: 3566 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3567 process_color_seq (op, Color_pointer_bg, str, st);
3362 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
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3577#ifndef NO_BOLD_UNDERLINE_REVERSE
3364 case XTerm_Color_RV:
3365 process_color_seq (op, Color_RV, str, resp);
3366 break;
3367 case Rxvt_Color_BD:
3368 case URxvt_Color_BD: 3578 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3579 process_color_seq (op, Color_BD, str, st);
3370 break; 3580 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3581 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3582 process_color_seq (op, Color_UL, str, st);
3374 break; 3583 break;
3375 case URxvt_Color_IT: 3584 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3585 process_color_seq (op, Color_IT, str, st);
3377 break; 3586 break;
3378#endif 3587#endif
3379#if ENABLE_TRANSPARENCY
3380 case URxvt_Color_tint: 3588 case URxvt_Color_border:
3381 process_color_seq (op, Color_tint, str, resp); 3589 process_color_seq (op, Color_border, str, st);
3382 {
3383 bool changed = false;
3384
3385 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3389
3390 if (changed)
3391 update_background ();
3392 }
3393
3394 break; 3590 break;
3395#endif
3396
3397#if BG_IMAGE_FROM_FILE
3398 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?"))
3400 {
3401 char str[256];
3402
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 }
3408 else
3409 {
3410 int changed = 0;
3411
3412 if (*str != ';')
3413 {
3414 /* reset to default scaling :*/
3415 bgPixmap.unset_geometry ();
3416 if (bgPixmap.set_file (str)) /* change pixmap */
3417 changed++;
3418 str = strchr (str, ';');
3419 if (str == NULL)
3420 bgPixmap.set_defaultGeometry ();
3421 }
3422
3423 while (str)
3424 {
3425 str++;
3426 if (bgPixmap.set_geometry (str))
3427 changed++;
3428 str = strchr (str, ';');
3429 }
3430
3431 if (changed)
3432 update_background ();
3433 }
3434 break;
3435#endif
3436 3591
3437 case XTerm_logfile: 3592 case XTerm_logfile:
3438 // TODO, when secure mode? 3593 // TODO, when secure mode?
3439 break; 3594 break;
3440 3595
… …
3457 case URxvt_boldFont: 3612 case URxvt_boldFont:
3458 case URxvt_italicFont: 3613 case URxvt_italicFont:
3459 case URxvt_boldItalicFont: 3614 case URxvt_boldItalicFont:
3460#endif 3615#endif
3461 if (query) 3616 if (query)
3462 tt_printf ("\33]%d;%-.250s%c", saveop, 3617 tt_printf ("\33]%d;%-.250s%s", saveop,
3463 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3618 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3464 ? fontset[op - URxvt_font]->fontdesc : "", 3619 ? fontset[op - URxvt_font]->fontdesc : "",
3465 resp); 3620 st.v);
3466 else 3621 else
3467 { 3622 {
3468 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3623 const char *&res = rs[Rs_font + (op - URxvt_font)];
3469 3624
3470 res = strdup (str); 3625 res = strdup (str);
… …
3473 } 3628 }
3474 break; 3629 break;
3475 3630
3476 case URxvt_version: 3631 case URxvt_version:
3477 if (query) 3632 if (query)
3478 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3633 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3479 op, 3634 op,
3480 rs[Rs_name], VERSION[0], VERSION[2], 3635 rs[Rs_name], VERSION[0], VERSION[2],
3481 resp); 3636 st.v);
3482 break; 3637 break;
3483 3638
3484#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
3485 case URxvt_locale: 3647 case URxvt_locale:
3486 if (query) 3648 if (query)
3487 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);
3488 else 3650 else
3489 { 3651 {
3490 set_locale (str); 3652 set_locale (str);
3491 pty->set_utf8_mode (enc_utf8); 3653 pty->set_utf8_mode (enc_utf8);
3492 init_xlocale (); 3654 init_xlocale ();
… …
3507 break; 3669 break;
3508#endif 3670#endif
3509 3671
3510#if ENABLE_PERL 3672#if ENABLE_PERL
3511 case URxvt_perl: 3673 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3674 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3513 ; // no responses yet
3514 break; 3675 break;
3515#endif 3676#endif
3516 } 3677 }
3517} 3678}
3518/*----------------------------------------------------------------------*/ 3679/*----------------------------------------------------------------------*/
… …
3525 * 's' = save 3686 * 's' = save
3526 * 'r' = restore 3687 * 'r' = restore
3527 * 't' = toggle 3688 * 't' = toggle
3528 * so no need for fancy checking 3689 * so no need for fancy checking
3529 */ 3690 */
3530int 3691int ecb_cold
3531rxvt_term::privcases (int mode, unsigned long bit) 3692rxvt_term::privcases (int mode, unsigned long bit)
3532{ 3693{
3533 int state; 3694 int state;
3534 3695
3535 if (mode == 's') 3696 if (mode == 's')
3536 { 3697 {
3537 SavedModes |= (priv_modes & bit); 3698 if (priv_modes & bit)
3699 SavedModes |= bit;
3700 else
3701 SavedModes &= ~bit;
3538 return -1; 3702 return -1;
3539 } 3703 }
3540 else 3704 else
3541 { 3705 {
3542 if (mode == 'r') 3706 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3707 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3708 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3709 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 set_privmode (bit, state); 3710
3711 if (state)
3712 priv_modes |= bit;
3713 else
3714 priv_modes &= ~bit;
3547 } 3715 }
3548 3716
3549 return state; 3717 return state;
3550} 3718}
3551 3719
3552/* we're not using priv _yet_ */ 3720/* we're not using priv _yet_ */
3553void 3721void
3554rxvt_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)
3555{ 3723{
3556 unsigned int i, j; 3724 unsigned int i, j;
3557 int state; 3725 int state;
3558 3726
3559 static const struct 3727 static const struct
3560 { 3728 {
3561 const int argval; 3729 const int argval;
3562 const unsigned long bit; 3730 const unsigned long bit;
3563 } argtopriv[] = { 3731 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3732 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3733 { 2, PrivMode_vt52 }, // DECANM
3566 { 3, PrivMode_132 }, 3734 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3735 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3736 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3737 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3738 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3739 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3740 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related
3574 { 25, PrivMode_VisibleCursor }, 3741 { 12, PrivMode_BlinkingCursor },
3742 // 18 end FF to printer after print screen
3743 // 19 Print screen prints full screen/scroll region
3744 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3746 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3747#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3748 { 35, PrivMode_ShiftKeys }, // rxvt extension
3749 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3750 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3751 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3752 // 45 margin bell NYI
3582 // 46 start logging 3753 // 46 start logging
3583 { 47, PrivMode_Screen }, 3754 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3755 { 66, PrivMode_aplKP }, // DECNKM
3585#ifndef NO_BACKSPACE_KEY 3756#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3757 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3758#endif
3588 { 1000, PrivMode_MouseX11 }, 3759 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3760 { 1002, PrivMode_MouseBtnEvent },
3590 { 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
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3767 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 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
3593 // 1035 enable modifiers for alt, numlock NYI 3772 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3773 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3774 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3775 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3776 // 1048 save and restore cursor, implemented in code
3598 { 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 */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3778 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3779#if ENABLE_FRILLS
3600 { 2004, PrivMode_BracketPaste }, 3780 { 2004, PrivMode_BracketPaste },
3781#endif
3601 }; 3782 };
3602 3783
3603 if (nargs == 0) 3784 if (nargs == 0)
3604 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 }
3605 3804
3606 /* make lo/hi boolean */ 3805 /* make lo/hi boolean */
3607 if (mode == 'l') 3806 if (mode == 'l')
3608 mode = 0; /* reset */ 3807 mode = 0; /* reset */
3609 else if (mode == 'h') 3808 else if (mode == 'h')
… …
3612 for (i = 0; i < nargs; i++) 3811 for (i = 0; i < nargs; i++)
3613 { 3812 {
3614 state = -1; 3813 state = -1;
3615 3814
3616 /* basic handling */ 3815 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3816 for (j = 0; j < ecb_array_length (argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3817 if (argtopriv[j].argval == arg[i])
3619 { 3818 {
3620 state = privcases (mode, argtopriv[j].bit); 3819 state = privcases (mode, argtopriv[j].bit);
3621 break; 3820 break;
3622 } 3821 }
… …
3630 3829
3631 scr_touch (true); 3830 scr_touch (true);
3632 break; 3831 break;
3633#endif 3832#endif
3634 case 1048: /* alternative cursor save */ 3833 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3834 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3835 if (mode == 0)
3638 scr_cursor (RESTORE); 3836 scr_cursor (RESTORE);
3639 else if (mode == 1) 3837 else if (mode == 1)
3640 scr_cursor (SAVE); 3838 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3847 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3848 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3849 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3850 * within VT52 mode
3653 */ 3851 */
3654 set_privmode (PrivMode_vt52, 1); 3852 priv_modes |= PrivMode_vt52;
3655 break; 3853 break;
3656 case 3: /* 80/132 */ 3854 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3855 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3856 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3857 break;
3663 case 4: /* smooth scrolling */ 3858 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3859 set_option (Opt_jumpScroll, !state);
3665 break; 3860 break;
3666 case 5: /* reverse video */ 3861 case 5: /* reverse video */
… …
3677 if (state) /* orthogonal */ 3872 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3873 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3874 break;
3680#ifdef scrollBar_esc 3875#ifdef scrollBar_esc
3681 case scrollBar_esc: 3876 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3877 scrollBar.map (state);
3683 {
3684 resize_all_windows (0, 0, 0); 3878 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3879 scr_touch (true);
3686 } 3880 break;
3881#endif
3882#ifdef CURSOR_BLINK
3883 case 12:
3884 cursor_blink_reset ();
3687 break; 3885 break;
3688#endif 3886#endif
3689 case 25: /* visible/invisible cursor */ 3887 case 25: /* visible/invisible cursor */
3690 scr_cursor_visible (state); 3888 scr_cursor_visible (state);
3691 break; 3889 break;
… …
3704 case 1003: 3902 case 1003:
3705 if (state) 3903 if (state)
3706 { 3904 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3905 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 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;
3709 vt_emask_mouse = PointerMotionMask; 3908 vt_emask_mouse = PointerMotionMask;
3710 } 3909 }
3711 else 3910 else
3712 vt_emask_mouse = NoEventMask; 3911 vt_emask_mouse = NoEventMask;
3912
3713 vt_select_input (); 3913 vt_select_input ();
3714 break; 3914 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3915 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3916 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3917 break;
3718 case 1011: /* scroll to bottom on key press */ 3918 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3919 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3920 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3921 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3922 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3923 if (!state)
3724 scr_erase_screen (2); 3924 scr_erase_screen (2);
3925
3725 scr_change_screen (state); 3926 scr_change_screen (state);
3726 break; 3927 break;
3727 case 1049: /* secondary screen w/ clearing first */ 3928 case 1049: /* secondary screen w/ clearing first */
3929 if (option (Opt_secondaryScreen))
3930 if (state)
3931 scr_cursor (SAVE);
3932
3728 scr_change_screen (state); 3933 scr_change_screen (state);
3934
3729 if (option (Opt_secondaryScreen)) 3935 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3936 if (state)
3731 scr_erase_screen (2); 3937 scr_erase_screen (2);
3938 else
3939 scr_cursor (RESTORE);
3732 break; 3940 break;
3733 default: 3941 default:
3734 break; 3942 break;
3735 } 3943 }
3736 } 3944 }
3737} 3945}
3738/*}}} */ 3946/*}}} */
3739 3947
3740/*{{{ process sgr sequences */ 3948/*{{{ process sgr sequences */
3741void 3949void ecb_hot
3742rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3950rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3743{ 3951{
3744 unsigned int i; 3952 unsigned int i;
3745 short rendset; 3953 short rendset;
3746 int rendstyle; 3954 int rendstyle;
… …
3788 //case 19: // ninth alt font 3996 //case 19: // ninth alt font
3789 //case 20: // gothic 3997 //case 20: // gothic
3790 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3998 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3791 rendset = 0, rendstyle = RS_Bold; 3999 rendset = 0, rendstyle = RS_Bold;
3792 break; 4000 break;
3793 case 22: // normal intensity 4001 case 22: // bold off (vt220)
3794 rendset = 0, rendstyle = RS_Bold; 4002 rendset = 0, rendstyle = RS_Bold;
3795 break; 4003 break;
3796 case 23: // disable italic 4004 case 23: // disable italic
3797 rendset = 0, rendstyle = RS_Italic; 4005 rendset = 0, rendstyle = RS_Italic;
3798 break; 4006 break;
3799 case 24: 4007 case 24: // underline off (vt220)
3800 rendset = 0, rendstyle = RS_Uline; 4008 rendset = 0, rendstyle = RS_Uline;
3801 break; 4009 break;
3802 case 25: 4010 case 25: // blink off (vt220)
3803 rendset = 0, rendstyle = RS_Blink; 4011 rendset = 0, rendstyle = RS_Blink;
3804 break; 4012 break;
3805 case 26: // variable spacing (iso 8613) 4013 case 26: // variable spacing (iso 8613)
3806 rendset = 0, rendstyle = RS_Blink; 4014 rendset = 0, rendstyle = RS_Blink;
3807 break; 4015 break;
3808 case 27: 4016 case 27: // reverse off (vt220)
3809 rendset = 0, rendstyle = RS_RVid; 4017 rendset = 0, rendstyle = RS_RVid;
3810 break; 4018 break;
3811 //case 28: // visible. NYI 4019 //case 28: // visible. NYI
3812 //case 29: // not crossed-out 4020 //case 29: // not crossed-out
3813 } 4021 }
… …
3828 case 35: 4036 case 35:
3829 case 36: 4037 case 36:
3830 case 37: 4038 case 37:
3831 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4039 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3832 break; 4040 break;
3833 case 38: // set fg color, ISO 8613-6
3834 if (nargs > i + 2 && arg[i + 1] == 5)
3835 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3837 i += 2;
3838 }
3839 break;
3840 case 39: /* default fg */ 4041 case 39: /* default fg */
3841 scr_color (Color_fg, Color_fg); 4042 scr_color (Color_fg, Color_fg);
3842 break; 4043 break;
3843 4044
3844 case 40: 4045 case 40:
… …
3849 case 45: 4050 case 45:
3850 case 46: 4051 case 46:
3851 case 47: 4052 case 47:
3852 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4053 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3853 break; 4054 break;
3854 case 48: // set bg color, ISO 8613-6
3855 if (nargs > i + 2 && arg[i + 1] == 5)
3856 {
3857 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3858 i += 2;
3859 }
3860 break;
3861 case 49: /* default bg */ 4055 case 49: /* default bg */
3862 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 }
3863 break; 4086 break;
3864 4087
3865 //case 50: // not variable spacing 4088 //case 50: // not variable spacing
3866 4089
3867#if !ENABLE_MINIMAL 4090#if !ENABLE_MINIMAL
… …
3887 break; 4110 break;
3888#endif 4111#endif
3889 } 4112 }
3890 } 4113 }
3891} 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}
3892/*}}} */ 4135/*}}} */
3893 4136
3894/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3895void
3896rxvt_term::process_graphics ()
3897{
3898 unicode_t ch, cmd = cmd_getc ();
3899
3900 if (cmd == 'Q')
3901 {
3902 /* query graphics */
3903 tt_printf ("\033G0\012"); /* no graphics */
3904 return;
3905 }
3906 /* swallow other graphics sequences until terminating ':' */
3907 do
3908 ch = cmd_getc ();
3909 while (ch != ':');
3910}
3911/*}}} */
3912
3913/* ------------------------------------------------------------------------- */ 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 */
3914 4141
3915/* 4142/*
3916 * Send printf () formatted output to the command. 4143 * Send printf () formatted output to the command.
3917 * Only use for small amounts of data. 4144 * Only use for small amounts of data.
3918 */ 4145 */
… …
3926 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4153 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3927 va_end (arg_ptr); 4154 va_end (arg_ptr);
3928 tt_write (buf, strlen (buf)); 4155 tt_write (buf, strlen (buf));
3929} 4156}
3930 4157
3931/* ---------------------------------------------------------------------- */
3932/* 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. */
3933 * or generated by us in response to a query ESC sequence. 4159void
3934 */ 4160rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3935const 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}
3936 4174
3937void 4175void
3938rxvt_term::tt_write (const char *data, unsigned int len) 4176rxvt_term::tt_write (const char *data, unsigned int len)
3939{ 4177{
3940 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)))
3941 return; 4179 return;
3942 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{
3943 if (pty->pty < 0) 4189 if (pty->pty < 0)
3944 return; 4190 return;
3945 4191
3946 if (v_buflen == 0) 4192 if (v_buflen == 0)
3947 { 4193 {
3948 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));
3949 4195
4196 max_it (written, 0);
4197
3950 if ((unsigned int)written == len) 4198 if (written == len)
3951 return; 4199 return;
3952 4200
3953 data += written; 4201 data += written;
3954 len -= written; 4202 len -= written;
3955 } 4203 }
3956 4204
3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4205 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3958 4206
3959 memcpy (v_buffer + v_buflen, data, len); 4207 memcpy (v_buffer + v_buflen, data, len);
3960 v_buflen += len; 4208 v_buflen += len;
3961 4209
3962 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