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.394 by ayin, Sat Jan 19 15:00:49 2008 UTC vs.
Revision 1.600 by sf-exg, Sun Feb 19 08:48:42 2023 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch);
177 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
179 } 176 }
180 else 177 else
181# endif 178# endif
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322 XK_KP_1, // XK_KP_End
323 XK_KP_5, // XK_KP_Begin
324 };
325
326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
327 {
328 unsigned int index = keysym - XK_KP_Home;
329 keysym = kp ? keypadtrans[index] : XK_Home + index;
330 }
331 else if (keysym == XK_KP_Insert)
332 keysym = kp ? XK_KP_0 : XK_Insert;
333# ifndef NO_DELETE_KEY
334 else if (keysym == XK_KP_Delete)
335 keysym = kp ? XK_KP_Decimal : XK_Delete;
336# endif
337#endif
338 return keysym;
339}
340
341static inline int ecb_cold
342map_function_key (KeySym keysym)
343{
344 int param = 0;
345
346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
347 {
348 param = 11 + keysym - XK_F1;
349 if (keysym >= XK_F17)
350 param += 4;
351 else if (keysym >= XK_F15)
352 param += 3;
353 else if (keysym >= XK_F11)
354 param += 2;
355 else if (keysym >= XK_F6)
356 param += 1;
357 }
358 else
359 switch (keysym)
360 {
361 case XK_Find:
362 param = 1;
363 break;
364 case XK_Insert:
365 param = 2;
366 break;
367#ifdef DXK_Remove
368 case DXK_Remove:
369#endif
370 case XK_Execute:
371 param = 3;
372 break;
373 case XK_Select:
374 param = 4;
375 break;
376 case XK_Prior:
377 param = 5;
378 break;
379 case XK_Next:
380 param = 6;
381 break;
382 case XK_Home:
383 param = 7;
384 break;
385 case XK_End:
386 param = 8;
387 break;
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
305{ 409{
306 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
307 unsigned int newlen; 411 KeySym keysym = NoSymbol;
308 KeySym keysym;
309 int valid_keysym;
310 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
311 414
312#if ISO_14755 415#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
314 return; 417 return;
315#endif 418#endif
… …
322 */ 425 */
323 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
326 429
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 430 kbuf[0] = 0;
334 431
335#ifdef USE_XIM 432#if USE_XIM
336 if (Input_Context) 433 if (Input_Context)
337 { 434 {
338 Status status_return; 435 Status status_return;
339 436
340#if 0 437#if 0
… …
378 } 475 }
379 } 476 }
380 else 477 else
381 len = 0; 478 len = 0;
382 } 479 }
383
384 valid_keysym = status_return == XLookupKeySym
385 || status_return == XLookupBoth;
386 } 480 }
387 else 481 else
388#endif 482#endif
389 { 483 {
390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
391 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
392 } 488 {
489 KeySym orig_keysym = keysym;
393 490
394 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
395 { 704 {
396#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 707 return;
399#endif 708#endif
400 709
401 if (saveLines) 710 if (saveLines)
402 { 711 {
… …
411#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 722#else
414 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
415#endif 724#endif
725 max_it (lnsppg, 1);
726
416 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
417 { 728 {
418 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
419 return; 730 return;
420 } 731 }
421 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
422 { 733 {
423 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
424 return; 735 return;
425 } 736 }
426 } 737 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
429 { 740 {
430 if (keysym == XK_Up) 741 if (keysym == XK_Up)
431 { 742 {
432 scr_page (UP, 1); 743 scr_page (1);
433 return; 744 return;
434 } 745 }
435 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
436 { 747 {
437 scr_page (DN, 1); 748 scr_page (-1);
438 return; 749 return;
439 } 750 }
440 } 751 }
441#endif 752#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
444 { 755 {
445 if (keysym == XK_Home) 756 if (keysym == XK_Home)
446 { 757 {
447 scr_move_to (0, 1); 758 scr_changeview (top_row);
448 return; 759 return;
449 } 760 }
450 else if (keysym == XK_End) 761 else if (keysym == XK_End)
451 { 762 {
452 scr_move_to (1, 1); 763 scr_changeview (0);
453 return; 764 return;
454 } 765 }
455 } 766 }
456#endif 767#endif
457 } 768 }
458 769
459 if (shft) 770 if (shft)
460 { 771 {
461 /* Shift + F1 - F10 generates F11 - F20 */
462 if (keysym >= XK_F1 && keysym <= XK_F10)
463 {
464 keysym += (XK_F11 - XK_F1);
465 shft = 0; /* turn off Shift */
466 }
467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
468 { 773 {
469 switch (keysym) 774 switch (keysym)
470 { 775 {
471 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
472 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
473 selection_request (ev.time); 778 selection_request (ev.time);
474 return; 779 return;
475#if TODO 780#if TODO
476 /* rxvt extras */ 781 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 783 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 785 return;
483#endif 786#endif
484 } 787 }
485 } 788 }
486 } 789 }
487 790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
804 }
805
488#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 807 // ISO 14755 support
490 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 809 {
492 int hv; 810 int hv;
493 811
494 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 843 scr_overlay_off ();
526# endif 844# endif
527 iso14755buf = 0; 845 iso14755buf = 0;
528 } 846 }
529 } 847 }
848 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
533 { 852 {
534 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 854# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
544 { 863 {
545 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
546 return; 865 return;
547 } 866 }
548#endif 867#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 }
795
796 /*
797 * Pass meta for all function keys, if 'meta' option set
798 */
799#ifdef META8_OPTION
800 if (meta && (meta_char == 0x80) && len > 0)
801 kbuf[len - 1] |= 0x80;
802#endif
803
804 }
805 else if (ctrl && keysym == XK_minus)
806 {
807 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 }
810 else if (keysym == XK_ISO_Left_Tab)
811 {
812 strcpy (kbuf, "\033[Z");
813 len = 3;
814 }
815 else
816 {
817#ifdef META8_OPTION
818 /* set 8-bit on */
819 if (meta && (meta_char == 0x80))
820 {
821 char *ch;
822
823 for (ch = kbuf; ch < kbuf + len; ch++)
824 *ch |= 0x80;
825
826 meta = 0;
827 }
828#endif
829 /* nil */ ;
830 }
831 } 868 }
832
833 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
834 return;
835 869
836 if (len <= 0) 870 if (len <= 0)
837 return; /* not mapped */ 871 return; /* not mapped */
838 872
839 if (option (Opt_scrollTtyKeypress))
840 if (view_start)
841 {
842 view_start = 0;
843 want_refresh = 1;
844 }
845
846 /*
847 * these modifications only affect the static keybuffer
848 * pass Shift/Control indicators for function keys ending with `~'
849 *
850 * eg,
851 * Prior = "ESC[5~"
852 * Shift+Prior = "ESC[5$"
853 * Ctrl+Prior = "ESC[5^"
854 * Ctrl+Shift+Prior = "ESC[5@"
855 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
856 */
857 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
858 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
859
860 /* escape prefix */
861 if (meta
862#ifdef META8_OPTION
863 && meta_char == C0_ESC
864#endif
865 )
866 {
867 const char ch = C0_ESC;
868 tt_write (&ch, 1);
869 }
870
871 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
872} 874}
873 875
874void 876void ecb_cold
875rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
876{ 878{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym; 880 KeySym keysym;
879 881
… …
899 commit_iso14755 (); 901 commit_iso14755 ();
900 902
901 return; 903 return;
902 } 904 }
903 905
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
905 if (i[0] == keysym) 907 if (i[0] == keysym)
906 { 908 {
907 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 (); 910 commit_iso14755 ();
909 911
… …
946 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
948#endif 950#endif
949} 951}
950 952
951#if defined (KEYSYM_RESOURCE)
952unsigned int
953rxvt_term::cmd_write (const char *str, unsigned int count)
954{
955 unsigned int n, s;
956
957 n = cmdbuf_ptr - cmdbuf_base;
958 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
959
960 if (n > 0 && s < count)
961 {
962 memmove (cmdbuf_base, cmdbuf_ptr,
963 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
964 cmdbuf_ptr = cmdbuf_base;
965 cmdbuf_endp -= n;
966 s += n;
967 }
968
969 if (count > s)
970 {
971 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
972 count = s;
973 }
974
975 for (; count--;)
976 *cmdbuf_endp++ = *str++;
977
978 cmd_parse ();
979
980 return 0;
981}
982#endif
983
984void 953void
985rxvt_term::flush () 954rxvt_term::flush ()
986{ 955{
987 flush_ev.stop (); 956 flush_ev.stop ();
988 957
989#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
990 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
991 { 960 {
992// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
993 scr_touch (false); 962 scr_touch (false);
994 } 963 }
995#endif 964#endif
996 965
997 if (want_refresh) 966 if (want_refresh)
… …
1033 } 1002 }
1034 while (row < end_row); 1003 while (row < end_row);
1035 } 1004 }
1036 1005
1037 scr_refresh (); 1006 scr_refresh ();
1038 scrollbar_show (1); 1007 scrollBar.show (1);
1039#ifdef USE_XIM 1008#if USE_XIM
1040 IMSendSpot (); 1009 im_send_spot ();
1041#endif 1010#endif
1042 } 1011 }
1043 1012
1044 display->flush (); 1013 display->flush ();
1045} 1014}
1046 1015
1047/* checks wether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1048void 1017void
1049rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1050{ 1019{
1051 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start ();
1053 1022
1054 display->flush (); 1023 display->flush ();
1055} 1024}
1056 1025
1057void 1026void
… …
1062 refresh_count = 0; 1031 refresh_count = 0;
1063 flush (); 1032 flush ();
1064} 1033}
1065 1034
1066#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1067void 1054void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1056{
1070 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1058 want_refresh = 1;
… …
1090 1077
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1079void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1081{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1097 { 1084 {
1098 want_refresh = 1; 1085 want_refresh = 1;
1099 refresh_check (); 1086 refresh_check ();
1100 } 1087 }
1101 else 1088 else
… …
1105 1092
1106#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1107void 1094void
1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1109{ 1096{
1110 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1111 { 1098 {
1112 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1113 want_refresh = 1; 1100 want_refresh = 1;
1114 refresh_check (); 1101 refresh_check ();
1115 } 1102 }
… …
1120 1107
1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1122void 1109void
1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1124{ 1111{
1125 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1126 { 1113 {
1127 want_refresh = 1; 1114 want_refresh = 1;
1128 refresh_check (); 1115 refresh_check ();
1129 } 1116 }
1130 1117
… …
1145 { 1132 {
1146 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1148 // ones with high nice levels is a useful thing to do. It surely is is 1135 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1150 1140
1151 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1153 1143
1154 w.stop (); 1144 w.stop ();
1155 } 1145 }
1156 1146
… …
1159 { 1149 {
1160 } 1150 }
1161} event_handler; 1151} event_handler;
1162#endif 1152#endif
1163 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1164bool 1187bool
1165rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1166{ 1189{
1167 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1168 1191
1169 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1170 { 1193
1171 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1172 n = 0;
1173 } 1195 {
1174 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1176 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1177 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1178 1201
1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1180 1203
1181 if (r > 0) 1204 if (r > 0)
1182 { 1205 {
1183 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1184 return true; 1207 return true;
… …
1206{ 1229{
1207 make_current (); 1230 make_current ();
1208 1231
1209 if (revents & ev::READ) 1232 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1235 cmd_parse ();
1213 break;
1214 1236
1215 if (revents & ev::WRITE) 1237 if (revents & ev::WRITE)
1216 pty_write (); 1238 pty_write ();
1217 1239
1218 refresh_check (); 1240 refresh_check ();
1219} 1241}
1220 1242
1221void 1243void ecb_cold
1222rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1223{ 1245{
1224 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1225 recolour_cursor (); 1247 recolor_cursor ();
1226 1248
1227#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1228 hidden_pointer = 0; 1250 hidden_pointer = 0;
1229 1251
1230 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1231 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1232#endif 1254#endif
1233} 1255}
1234 1256
1235#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1236void 1258void ecb_cold
1237rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1238{ 1260{
1239 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1240 return; 1262 return;
1241 1263
… …
1243 XFlush (dpy); 1265 XFlush (dpy);
1244 1266
1245 hidden_pointer = 1; 1267 hidden_pointer = 1;
1246} 1268}
1247 1269
1248void 1270void ecb_cold
1249rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1250{ 1272{
1251 make_current (); 1273 make_current ();
1252 1274
1253 pointer_blank (); 1275 pointer_blank ();
… …
1255#endif 1277#endif
1256 1278
1257void 1279void
1258rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1259{ 1281{
1260 int button_number, key_state = 0; 1282 int button_number, state = 0;
1261 int x, y; 1283 int x, y;
1262 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1263 1285
1264 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1265 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1288
1266 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1267 { 1290 {
1268 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1269 return; 1292 return;
1293
1270 mouse_row = x; 1294 mouse_row = x;
1271 mouse_col = y; 1295 mouse_col = y;
1272 code += 32; 1296 state += 32;
1273 }
1274
1275 if (MEvent.button == AnyButton)
1276 button_number = 3;
1277 else
1278 { 1297 }
1298
1279 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1280 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1281 if (button_number >= 3) 1301 if (button_number >= 3)
1282 button_number += (64 - 3); 1302 button_number += 64 - 3;
1283 }
1284 1303
1285 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1286 { 1305 {
1287 /* 1306 /*
1288 * do not report ButtonRelease 1307 * do not report ButtonRelease
1289 * no state info allowed 1308 * no state info allowed
1290 */ 1309 */
1291 key_state = 0; 1310 if (release)
1292 if (button_number == 3)
1293 return; 1311 return;
1294 } 1312 }
1295 else 1313 else
1296 { 1314 {
1297 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1299 * 8 = Meta 1317 * 8 = Meta
1300 * 16 = Control 1318 * 16 = Control
1301 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1302 * 32 = Double Click 1320 * 32 = Double Click
1303 */ 1321 */
1304 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1305 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1306 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1307#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1308 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1309#endif 1327#endif
1310 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1311 1331
1312#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1313 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1314 if (key_state & 16) 1334 if (state & 16)
1315 fputc ('C', stderr); 1335 fputc ('C', stderr);
1316 if (key_state & 4) 1336 if (state & 4)
1317 fputc ('S', stderr); 1337 fputc ('S', stderr);
1318 if (key_state & 8) 1338 if (state & 8)
1319 fputc ('A', stderr); 1339 fputc ('A', stderr);
1320 if (key_state & 32) 1340 if (state & 32)
1321 fputc ('2', stderr); 1341 fputc ('2', stderr);
1322 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1323 button_number, 1343 button_number,
1324 x + 1, 1344 x,
1325 y + 1); 1345 y);
1326#endif 1346#endif
1327 1347
1348#if ENABLE_FRILLS
1349 if (priv_modes & PrivMode_ExtMouseSGR)
1350 tt_printf ("\033[<%d;%d;%d%c",
1351 button_number + state,
1352 x,
1353 y,
1354 release ? 'm' : 'M');
1355 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1356 tt_printf ("\033[%d;%d;%dM",
1357 code,
1358 x,
1359 y);
1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1361 tt_printf ("\033[M%c%lc%lc",
1362 code,
1363 wint_t (32 + x),
1364 wint_t (32 + y));
1365 else
1366#endif
1328 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1329 (code + button_number + key_state), 1368 code,
1330 (32 + x + 1), 1369 32 + x,
1331 (32 + y + 1)); 1370 32 + y);
1332} 1371}
1333 1372
1334/*{{{ process an X event */ 1373/*{{{ process an X event */
1335void 1374void ecb_hot
1336rxvt_term::x_cb (XEvent &ev) 1375rxvt_term::x_cb (XEvent &ev)
1337{ 1376{
1338 make_current (); 1377 make_current ();
1339 1378
1340 dLocal (Display *, dpy); 1379 dLocal (Display *, dpy);
… …
1438 && ev.xfocus.mode != NotifyGrab) 1477 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1478 focus_out ();
1440 break; 1479 break;
1441 1480
1442 case ConfigureNotify: 1481 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1446 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent)
1447 { 1483 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1485 ;
1486
1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1488
1489 if (want_position_change)
1490 {
1491 int x, y;
1492
1493 if (ev.xconfigure.send_event)
1494 {
1495 x = ev.xconfigure.x;
1496 y = ev.xconfigure.y;
1497 }
1498 else
1499 get_window_origin (x, y);
1500
1501 if (x != parent_x || y != parent_y)
1502 {
1503 parent_x = x;
1504 parent_y = y;
1505 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1506 }
1507 }
1450 1508
1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1452 { 1510 {
1453 seen_resize = 1; 1511 seen_resize = 1;
1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1455 } 1513 }
1456 else
1457 {
1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif
1467 }
1468 1514
1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 } 1516 }
1471 break; 1517 break;
1472 1518
1473 case PropertyNotify: 1519 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1520 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1476 && ev.xproperty.state == PropertyNewValue)
1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1478
1479 break; 1521 break;
1480 1522
1481 case SelectionClear: 1523 case SelectionClear:
1482 selection_clear (); 1524 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483 break;
1484
1485 case SelectionNotify:
1486 if (selection_wait == Sel_normal)
1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1488 break; 1525 break;
1489 1526
1490 case SelectionRequest: 1527 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1492 break; 1529 break;
1493 1530
1494 case MapNotify: 1531 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1511 mapped = 1; 1532 mapped = 1;
1512#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1513 text_blink_ev.start (); 1534 text_blink_ev.start ();
1514#endif 1535#endif
1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1528 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1529 { 1550 {
1530 do 1551 do
1531 { 1552 {
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1534 } 1555 }
1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1557
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1559
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 { 1561 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1564 }
1544 1565
1545 want_refresh = 1; 1566 want_refresh = 1;
1546 } 1567 }
1547 else 1568 else
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1575 ;
1555 1576
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1577 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1578 {
1558 scrollBar.setIdle (); 1579 scrollBar.state = SB_STATE_IDLE;
1559 scrollbar_show (0); 1580 scrollBar.show (0);
1560 } 1581 }
1561 } 1582 }
1562 break; 1583 break;
1563 1584
1564 case MotionNotify: 1585 case MotionNotify:
1565#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1566 if (hidden_pointer) 1587 if (hidden_pointer)
1567 pointer_unblank (); 1588 pointer_unblank ();
1568#endif 1589#endif
1590 if (!bypass_keystate
1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1591 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1570 || priv_modes & PrivMode_MouseAnyEvent) 1592 || priv_modes & PrivMode_MouseAnyEvent))
1571 mouse_report (ev.xbutton); 1593 mouse_report (ev.xbutton);
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1595 break;
1574 1596
1575 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
… …
1587 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1611 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
1591 /* deal with a `jumpy' mouse */ 1613 /* deal with a `jumpy' mouse */
1592 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1614 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1615#endif
1593 { 1616 {
1594#endif
1595#if ISO_14755 1617#if ISO_14755
1596 // 5.4 1618 // 5.4
1597 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 { 1620 {
1599 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1605 1627
1606#ifdef SELECTION_SCROLLING 1628#ifdef SELECTION_SCROLLING
1607 if (ev.xbutton.y < int_bwidth 1629 if (ev.xbutton.y < int_bwidth
1608 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1630 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1609 { 1631 {
1632 page_dirn scroll_selection_dir;
1610 int dist; 1633 int dist;
1611 1634
1612 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1613 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1614 */ 1637 */
… …
1629 dist = int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1630 } 1653 }
1631 else 1654 else
1632 { 1655 {
1633 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1634 dist = ev.xbutton.y - (int_bwidth + height); 1657 dist = ev.xbutton.y - (int_bwidth + vt_height);
1635 } 1658 }
1636 1659
1637 scroll_selection_lines = Pixel2Height (dist) 1660 scroll_selection_lines = Pixel2Height (dist)
1638 / SELECTION_SCROLL_LINE_SPEEDUP 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1639 + 1; 1662 + 1;
1640 min_it (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1641 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1665 scroll_selection_lines *= scroll_selection_dir;
1642 } 1666 }
1643 else 1667 else
1644 { 1668 {
1645 /* we are within the text window, so we 1669 /* we are within the text window, so we
1646 * shouldn't be scrolling 1670 * shouldn't be scrolling
1647 */ 1671 */
1648 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1649 } 1673 }
1650#endif 1674#endif
1651#ifdef MOUSE_THRESHOLD
1652 } 1675 }
1653#endif
1654 } 1676 }
1655 } 1677 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1678 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1679 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1680 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1681 MotionNotify, &ev))
1660 ; 1682 ;
1661 1683
1662 XQueryPointer (dpy, scrollBar.win, 1684 XQueryPointer (dpy, scrollBar.win,
1663 &unused_root, &unused_child, 1685 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1686 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1687 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1688 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1689 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1690 scrollBar.size ());
1669 want_refresh = 1; 1691 want_refresh = 1;
1670 scrollbar_show (1); 1692 scrollBar.show (1);
1671 } 1693 }
1672 break; 1694 break;
1673 } 1695 }
1674 1696
1675#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.again (); 1699 cursor_blink_reset ();
1685 }
1686#endif 1700#endif
1687 1701
1688#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 { 1704 {
… …
1700#endif 1714#endif
1701 1715
1702 refresh_check (); 1716 refresh_check ();
1703} 1717}
1704 1718
1705void 1719#if ENABLE_FRILLS
1720void ecb_cold
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable;
1731 XFree (h);
1732 }
1733}
1734#endif
1735
1736void ecb_cold
1706rxvt_term::focus_in () 1737rxvt_term::focus_in ()
1707{ 1738{
1708 if (!focus) 1739 if (!focus)
1709 { 1740 {
1710 focus = 1; 1741 focus = 1;
1711 want_refresh = 1; 1742 want_refresh = 1;
1712 1743
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714
1715#if USE_XIM 1744#if USE_XIM
1716 if (Input_Context != NULL) 1745 if (Input_Context != NULL)
1717 { 1746 {
1718 IMSetPosition (); 1747 im_set_position ();
1719 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1720 } 1749 }
1721#endif 1750#endif
1722#if CURSOR_BLINK 1751#if CURSOR_BLINK
1723 if (option (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
… …
1725#endif 1754#endif
1726#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1728 { 1757 {
1729 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
1730 scr_recolour (); 1759 scr_recolor ();
1731 } 1760 }
1732#endif 1761#endif
1733#if ENABLE_FRILLS 1762#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1763 if (option (Opt_urgentOnBell))
1735 { 1764 set_urgency (0);
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif
1743 }
1744}
1745 1765
1746void 1766 if (priv_modes & PrivMode_FocusEvent)
1767 tt_printf ("\x1b[I");
1768#endif
1769
1770 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1771 }
1772}
1773
1774void ecb_cold
1747rxvt_term::focus_out () 1775rxvt_term::focus_out ()
1748{ 1776{
1749 if (focus) 1777 if (focus)
1750 { 1778 {
1751 focus = 0; 1779 focus = 0;
1752 want_refresh = 1; 1780 want_refresh = 1;
1753 1781
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1782#if ENABLE_FRILLS
1783 if (option (Opt_urgentOnBell))
1784 set_urgency (0);
1755 1785
1786 if (priv_modes & PrivMode_FocusEvent)
1787 tt_printf ("\x1b[O");
1788#endif
1756#if ENABLE_FRILLS || ISO_14755 1789#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1790 if (iso14755buf)
1758 { 1791 {
1759 iso14755buf = 0; 1792 iso14755buf = 0;
1760# if ISO_14755 1793# if ISO_14755
… …
1774#endif 1807#endif
1775#if OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
1777 { 1810 {
1778 pix_colors = pix_colors_unfocused; 1811 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1812 scr_recolor ();
1780 } 1813 }
1781#endif 1814#endif
1782 }
1783}
1784 1815
1785void 1816 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1817 }
1818}
1819
1820void ecb_cold
1786rxvt_term::update_fade_color (unsigned int idx) 1821rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1787{ 1822{
1788#if OFF_FOCUS_FADING 1823#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade]) 1824 if (rs[Rs_fade])
1790 { 1825 {
1826 if (!first_time)
1827 pix_colors_focused [idx].free (this);
1828
1791 rgba c; 1829 rgba c;
1792 pix_colors [Color_fade].get (c); 1830 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 } 1832 }
1795#endif 1833#endif
1796} 1834}
1797 1835
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL 1836#if ENABLE_PERL
1799void 1837void ecb_hot
1800rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1801{ 1839{
1802 make_current (); 1840 make_current ();
1803 1841
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return; 1844 return;
1807 1845
1808# if ENABLE_TRANSPARENCY
1809 switch (ev.type) 1846 switch (ev.type)
1810 { 1847 {
1811 case PropertyNotify: 1848 case PropertyNotify:
1812 /* 1849 /*
1813 * if user used some Esetroot compatible prog to set the root bg, 1850 * if user used some Esetroot compatible prog to set the root bg,
1814 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1815 */ 1852 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1855 {
1819 bgPixmap.set_root_pixmap (); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1820 update_background ();
1821 } 1857 }
1822 1858
1823 break; 1859 break;
1824 } 1860 }
1825# endif
1826 1861
1827 refresh_check (); 1862 refresh_check ();
1828} 1863}
1829#endif 1864#endif
1830 1865
… …
1853 iso14755_54 (ev.x, ev.y); 1888 iso14755_54 (ev.x, ev.y);
1854 return; 1889 return;
1855 } 1890 }
1856#endif 1891#endif
1857 1892
1858 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1893 clickintime = ev.time - MEvent.time < multiClickTime;
1859 1894
1860 if (reportmode) 1895 if (reportmode)
1861 { 1896 {
1862 /* mouse report from vt window */ 1897 /* mouse report from vt window */
1863 /* save the xbutton state (for ButtonRelease) */ 1898 /* save the xbutton state (for ButtonRelease) */
1864 MEvent.state = ev.state; 1899 MEvent.state = ev.state;
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1900#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1901 if (ev.button == MEvent.button && clickintime)
1867 { 1902 {
1868 /* same button, within alloted time */ 1903 /* same button, within allowed time */
1869 MEvent.clicks++; 1904 MEvent.clicks++;
1870 1905
1871 if (MEvent.clicks > 1) 1906 if (MEvent.clicks > 1)
1872 { 1907 {
1873 /* only report double clicks */ 1908 /* only report double clicks */
… …
1947 /* 1982 /*
1948 * Scrollbar window processing of button press 1983 * Scrollbar window processing of button press
1949 */ 1984 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1985 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1986 {
1952 scrollBar.setIdle (); 1987 page_dirn direction = NO_DIR;
1988
1989 if (scrollBar.upButton (ev.y))
1990 direction = UP; /* up */
1991 else if (scrollBar.dnButton (ev.y))
1992 direction = DN; /* down */
1993
1994 scrollBar.state = SB_STATE_IDLE;
1953 /* 1995 /*
1954 * Rxvt-style scrollbar: 1996 * Rxvt-style scrollbar:
1955 * move up if mouse is above slider 1997 * move up if mouse is above slider
1956 * move dn if mouse is below slider 1998 * move dn if mouse is below slider
1957 * 1999 *
… …
1966 /* 2008 /*
1967 * Mouse report disabled scrollbar: 2009 * Mouse report disabled scrollbar:
1968 * arrow buttons - send up/down 2010 * arrow buttons - send up/down
1969 * click on scrollbar - send pageup/down 2011 * click on scrollbar - send pageup/down
1970 */ 2012 */
1971 if ((scrollBar.style == R_SB_NEXT 2013 if (direction == UP)
1972 && scrollbarnext_upButton (ev.y))
1973 || (scrollBar.style == R_SB_RXVT
1974 && scrollbarrxvt_upButton (ev.y)))
1975 tt_printf ("\033[A"); 2014 tt_printf ("\033[A");
1976 else if ((scrollBar.style == R_SB_NEXT 2015 else if (direction == DN)
1977 && scrollbarnext_dnButton (ev.y))
1978 || (scrollBar.style == R_SB_RXVT
1979 && scrollbarrxvt_dnButton (ev.y)))
1980 tt_printf ("\033[B"); 2016 tt_printf ("\033[B");
1981 else 2017 else
1982 switch (ev.button) 2018 switch (ev.button)
1983 { 2019 {
1984 case Button2: 2020 case Button2:
… …
1992 break; 2028 break;
1993 } 2029 }
1994 } 2030 }
1995 else 2031 else
1996#endif /* NO_SCROLLBAR_REPORT */ 2032#endif /* NO_SCROLLBAR_REPORT */
1997
1998 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 { 2033 {
2003 if (scrollbarnext_upButton (ev.y)) 2034 if (direction != NO_DIR)
2004 upordown = -1; /* up */
2005 else if (scrollbarnext_dnButton (ev.y))
2006 upordown = 1; /* down */
2007 }
2008 else if (scrollBar.style == R_SB_RXVT)
2009 {
2010 if (scrollbarrxvt_upButton (ev.y))
2011 upordown = -1; /* up */
2012 else if (scrollbarrxvt_dnButton (ev.y))
2013 upordown = 1; /* down */
2014 }
2015
2016 if (upordown)
2017 { 2035 {
2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2036#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ()) 2037 if (!cont_scroll_ev.is_active ())
2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2038 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021#endif 2039#endif
2022 if (scr_page (upordown < 0 ? UP : DN, 1)) 2040 if (scr_page (direction, 1))
2023 { 2041 {
2024 if (upordown < 0) 2042 if (direction == UP)
2025 scrollBar.setUp (); 2043 scrollBar.state = SB_STATE_UP;
2026 else 2044 else
2027 scrollBar.setDn (); 2045 scrollBar.state = SB_STATE_DOWN;
2028 } 2046 }
2029 } 2047 }
2030 else 2048 else
2031 switch (ev.button) 2049 switch (ev.button)
2032 { 2050 {
2033 case Button2: 2051 case Button2:
2034 switch (scrollBar.align) 2052 switch (scrollBar.align)
2035 { 2053 {
2036 case R_SB_ALIGN_TOP: 2054 case SB_ALIGN_TOP:
2037 csrO = 0; 2055 csrO = 0;
2038 break; 2056 break;
2039 case R_SB_ALIGN_CENTRE: 2057 case SB_ALIGN_CENTRE:
2040 csrO = (scrollBar.bot - scrollBar.top) / 2; 2058 csrO = (scrollBar.bot - scrollBar.top) / 2;
2041 break; 2059 break;
2042 case R_SB_ALIGN_BOTTOM: 2060 case SB_ALIGN_BOTTOM:
2043 csrO = scrollBar.bot - scrollBar.top; 2061 csrO = scrollBar.bot - scrollBar.top;
2044 break; 2062 break;
2045 } 2063 }
2046 2064
2047 if (scrollBar.style == R_SB_XTERM 2065 if (scrollBar.style == SB_STYLE_XTERM
2048 || scrollbar_above_slider (ev.y) 2066 || scrollBar.above_slider (ev.y)
2049 || scrollbar_below_slider (ev.y)) 2067 || scrollBar.below_slider (ev.y))
2050 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2068 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2051 2069
2052 scrollBar.setMotion (); 2070 scrollBar.state = SB_STATE_MOTION;
2053 break; 2071 break;
2054 2072
2055 case Button1: 2073 case Button1:
2056 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2074 if (scrollBar.align == SB_ALIGN_CENTRE)
2057 csrO = ev.y - scrollBar.top; 2075 csrO = ev.y - scrollBar.top;
2058 /* FALLTHROUGH */ 2076 /* FALLTHROUGH */
2059 2077
2060 case Button3: 2078 case Button3:
2061 if (scrollBar.style != R_SB_XTERM) 2079 if (scrollBar.style != SB_STYLE_XTERM)
2062 { 2080 {
2063 if (scrollbar_above_slider (ev.y)) 2081 if (scrollBar.above_slider (ev.y))
2064# ifdef RXVT_SCROLL_FULL 2082# ifdef RXVT_SCROLL_FULL
2065 scr_page (UP, nrow - 1); 2083 scr_page (UP, nrow - 1);
2066# else 2084# else
2067 scr_page (UP, nrow / 4); 2085 scr_page (UP, nrow / 4);
2068# endif 2086# endif
2069 else if (scrollbar_below_slider (ev.y)) 2087 else if (scrollBar.below_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2071 scr_page (DN, nrow - 1); 2089 scr_page (DN, nrow - 1);
2072# else 2090# else
2073 scr_page (DN, nrow / 4); 2091 scr_page (DN, nrow / 4);
2074# endif 2092# endif
2075 else 2093 else
2076 scrollBar.setMotion (); 2094 scrollBar.state = SB_STATE_MOTION;
2077 } 2095 }
2078 else 2096 else
2079 { 2097 {
2080 scr_page ((ev.button == Button1 ? DN : UP), 2098 scr_page ((ev.button == Button1 ? DN : UP),
2081 (nrow 2099 (nrow
2082 * scrollbar_position (ev.y) 2100 * scrollBar.position (ev.y)
2083 / scrollbar_size ())); 2101 / scrollBar.size ()));
2084 } 2102 }
2085 2103
2086 break; 2104 break;
2087 } 2105 }
2088 } 2106 }
… …
2098 2116
2099 csrO = 0; /* reset csr Offset */ 2117 csrO = 0; /* reset csr Offset */
2100 if (!bypass_keystate) 2118 if (!bypass_keystate)
2101 reportmode = !! (priv_modes & PrivMode_mouse_report); 2119 reportmode = !! (priv_modes & PrivMode_mouse_report);
2102 2120
2103 if (scrollbar_isUpDn ()) 2121 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2104 { 2122 {
2105 scrollBar.setIdle (); 2123 scrollBar.state = SB_STATE_IDLE;
2106 scrollbar_show (0); 2124 scrollBar.show (0);
2107 } 2125 }
2108 2126
2109#ifdef SELECTION_SCROLLING 2127#ifdef SELECTION_SCROLLING
2110 sel_scroll_ev.stop(); 2128 sel_scroll_ev.stop();
2111#endif 2129#endif
… …
2130#ifdef MOUSE_REPORT_DOUBLECLICK 2148#ifdef MOUSE_REPORT_DOUBLECLICK
2131 /* only report the release of 'slow' single clicks */ 2149 /* only report the release of 'slow' single clicks */
2132 if (MEvent.button != AnyButton 2150 if (MEvent.button != AnyButton
2133 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2134 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2135 > MULTICLICK_TIME / 2))) 2153 > multiClickTime / 2)))
2136 { 2154 {
2137 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2138 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2139 mouse_report (ev); 2157 mouse_report (ev);
2140 } 2158 }
2141#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2142 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2143 mouse_report (ev); 2161 mouse_report (ev);
2144#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2145 return; 2163 return;
2146 } 2164 }
2147 2165
… …
2160 case Button3: 2178 case Button3:
2161 selection_make (ev.time); 2179 selection_make (ev.time);
2162 break; 2180 break;
2163 2181
2164 case Button2: 2182 case Button2:
2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2183 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2184 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2167 break; 2185 break;
2168 2186
2169#ifdef MOUSE_WHEEL 2187#ifdef MOUSE_WHEEL
2170 case Button4: 2188 case Button4:
2171 case Button5: 2189 case Button5:
2172 { 2190 {
2173 int i; 2191 int lines;
2174 page_dirn v; 2192 page_dirn dirn;
2175 2193
2176 v = ev.button == Button4 ? UP : DN; 2194 dirn = ev.button == Button4 ? UP : DN;
2177 2195
2178 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
2179 i = 1; 2197 lines = 1;
2180 else if (option (Opt_mouseWheelScrollPage)) 2198 else if (option (Opt_mouseWheelScrollPage))
2181 i = nrow - 1; 2199 lines = nrow - 1;
2182 else 2200 else
2183 i = 5; 2201 lines = 5;
2184 2202
2185# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
2186 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
2187 { 2205 {
2188 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += dirn;
2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2207 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2191 2208
2192 if (!slip_wheel_ev.is_active ()) 2209 if (!slip_wheel_ev.is_active ())
2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2210 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2194 } 2211 }
2195 else 2212 else
2196# endif 2213# endif
2197 { 2214 {
2198 scr_page (v, i); 2215 scr_page (dirn, lines);
2199 scrollbar_show (1); 2216 scrollBar.show (1);
2200 } 2217 }
2201 } 2218 }
2202 break; 2219 break;
2203#endif 2220#endif
2204 } 2221 }
2205 } 2222 }
2206} 2223}
2207 2224
2208/*}}} */ 2225/*}}} */
2209 2226
2210bool 2227void ecb_hot
2211rxvt_term::cmd_parse () 2228rxvt_term::cmd_parse ()
2212{ 2229{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2230 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2231 char *seq_begin; // remember start of esc-sequence here
2216 2232
2217 for (;;) 2233 for (;;)
2218 { 2234 {
2219 if (ch == NOCHAR) 2235 if (ecb_unlikely (ch == NOCHAR))
2220 { 2236 {
2221 seq_begin = cmdbuf_ptr; 2237 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2238 ch = next_char ();
2223 2239
2224 if (ch == NOCHAR) 2240 if (ch == NOCHAR)
2225 break; 2241 break;
2226 } 2242 }
2227 2243
2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2244 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2229 { 2245 {
2230 if (!seen_input) 2246 if (ecb_unlikely (!seen_input))
2231 { 2247 {
2232 seen_input = 1; 2248 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2249 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2250 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2251 // some window managers resize the window early, and these programs
… …
2248 wchar_t *str = buf; 2264 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2265 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2266
2251 for (;;) 2267 for (;;)
2252 { 2268 {
2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2269 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254 break; 2270 break;
2255 2271
2256 *str++ = ch; 2272 *str++ = ch;
2257 2273
2258 if (ch == C0_LF || str >= eol) 2274 if (ecb_unlikely (ch == C0_LF || str >= eol))
2259 { 2275 {
2260 if (ch == C0_LF) 2276 if (ch == C0_LF)
2261 nlines++; 2277 nlines++;
2262 2278
2263 refresh_count++; 2279 refresh_count++;
… …
2312 * What the heck we'll cheat and only refresh less than every page-full. 2328 * What the heck we'll cheat and only refresh less than every page-full.
2313 * if skipScroll is enabled. 2329 * if skipScroll is enabled.
2314 */ 2330 */
2315 if (refreshnow) 2331 if (refreshnow)
2316 { 2332 {
2317 flag = true;
2318 scr_refresh (); 2333 scr_refresh ();
2319 want_refresh = 1; 2334 want_refresh = 1;
2320 } 2335 }
2321
2322 } 2336 }
2323 else 2337 else
2324 { 2338 {
2325 try 2339 try
2326 { 2340 {
… …
2334 } 2348 }
2335 2349
2336 ch = NOCHAR; 2350 ch = NOCHAR;
2337 } 2351 }
2338 } 2352 }
2339
2340 return flag;
2341} 2353}
2342 2354
2343// read the next character 2355// read the next character
2344wchar_t 2356wchar_t ecb_hot
2345rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () noexcept
2346{ 2358{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2360 {
2349 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2351 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2352 2364
2353 wchar_t wc; 2365 wchar_t wc;
2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355 2367
… …
2359 cmdbuf_ptr = cmdbuf_endp; 2371 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2372 break;
2361 } 2373 }
2362 2374
2363 if (len == (size_t)-1) 2375 if (len == (size_t)-1)
2376 {
2377 mbstate.reset (); // reset now undefined conversion state
2378 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2379 // in which case we "erroneously" return the next byte which might be valid.
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2380 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2381 }
2365 2382
2366 // assume wchar == unicode 2383 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2384 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2385 return wc & UNICODE_MASK;
2369 } 2386 }
2370 2387
2371 return NOCHAR; 2388 return NOCHAR;
2372} 2389}
2373 2390
2374// read the next octet 2391// read the next octet
2375uint32_t 2392uint32_t ecb_hot
2376rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () noexcept
2377{ 2394{
2378 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR; 2397 : NOCHAR;
2381} 2398}
2382 2399
2383static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2384 2401
2385/* rxvt_cmd_getc () - Return next input character */ 2402wchar_t ecb_hot
2386/* 2403rxvt_term::cmd_getc ()
2387 * Return the next input character after first passing any keyboard input
2388 * to the command.
2389 */
2390wchar_t
2391rxvt_term::cmd_getc () THROW ((class out_of_input))
2392{ 2404{
2393 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2394 2406
2395 if (c == NOCHAR) 2407 if (c == NOCHAR)
2396 throw out_of_input; 2408 throw out_of_input;
2397 2409
2398 return c; 2410 return c;
2399} 2411}
2400 2412
2401uint32_t 2413uint32_t ecb_hot
2402rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 ()
2403{ 2415{
2404 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2405 2417
2406 if (c == NOCHAR) 2418 if (c == NOCHAR)
2407 throw out_of_input; 2419 throw out_of_input;
… …
2410} 2422}
2411 2423
2412/*{{{ print pipe */ 2424/*{{{ print pipe */
2413/*----------------------------------------------------------------------*/ 2425/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2426#ifdef PRINTPIPE
2415FILE * 2427FILE * ecb_cold
2416rxvt_term::popen_printer () 2428rxvt_term::popen_printer ()
2417{ 2429{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2430 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2431
2420 if (stream == NULL) 2432 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2433 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2434
2423 return stream; 2435 return stream;
2424} 2436}
2425 2437
2426int 2438int ecb_cold
2427rxvt_term::pclose_printer (FILE *stream) 2439rxvt_term::pclose_printer (FILE *stream)
2428{ 2440{
2429 fflush (stream); 2441 fflush (stream);
2430 return pclose (stream); 2442 return pclose (stream);
2431} 2443}
2432 2444
2433/* 2445/*
2434 * simulate attached vt100 printer 2446 * simulate attached vt100 printer
2435 */ 2447 */
2436void 2448void ecb_cold
2437rxvt_term::process_print_pipe () 2449rxvt_term::process_print_pipe ()
2438{ 2450{
2439 int done; 2451 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2452
2442 if ((fd = popen_printer ()) == NULL) 2453 if (!fd)
2443 return; 2454 return;
2444 2455
2445 /* 2456 /*
2446 * Send all input to the printer until either ESC[4i or ESC[?4i 2457 * Send all input to the printer until either ESC[4i or ESC[?4i
2447 * is received. 2458 * is received.
2448 */ 2459 */
2449 for (done = 0; !done;) 2460 for (int done = 0; !done; )
2450 { 2461 {
2451 unsigned char buf[8]; 2462 unsigned char buf[8];
2452 unicode_t ch; 2463 unicode_t ch;
2453 unsigned int i, len; 2464 unsigned int i, len;
2454 2465
… …
2488 pclose_printer (fd); 2499 pclose_printer (fd);
2489} 2500}
2490#endif /* PRINTPIPE */ 2501#endif /* PRINTPIPE */
2491/*}}} */ 2502/*}}} */
2492 2503
2493/* *INDENT-OFF* */
2494enum { 2504enum {
2495 C1_40 = 0x40, 2505 C1_40 = 0x40,
2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2506 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2507 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2508 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2509 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2500}; 2510};
2501/* *INDENT-ON* */
2502 2511
2503/*{{{ process non-printing single characters */ 2512/*{{{ process non-printing single characters */
2504void 2513void ecb_hot
2505rxvt_term::process_nonprinting (unicode_t ch) 2514rxvt_term::process_nonprinting (unicode_t ch)
2506{ 2515{
2507 switch (ch) 2516 switch (ch)
2508 { 2517 {
2509 case C0_ESC: 2518 case C0_ESC:
… …
2539 scr_charset_choose (0); 2548 scr_charset_choose (0);
2540 break; 2549 break;
2541 2550
2542#ifdef EIGHT_BIT_CONTROLS 2551#ifdef EIGHT_BIT_CONTROLS
2543 // 8-bit controls 2552 // 8-bit controls
2544 case 0x90: /* DCS */ 2553 case 0x90: /* DCS */
2545 process_dcs_seq (); 2554 process_dcs_seq ();
2546 break; 2555 break;
2547 case 0x9b: /* CSI */ 2556 case 0x9b: /* CSI */
2548 process_csi_seq (); 2557 process_csi_seq ();
2549 break; 2558 break;
2550 case 0x9d: /* OSC */ 2559 case 0x9d: /* OSC */
2551 process_osc_seq (); 2560 process_osc_seq ();
2552 break; 2561 break;
2553#endif 2562#endif
2554 } 2563 }
2555} 2564}
2556/*}}} */ 2565/*}}} */
2557 2566
2558 2567
2559/*{{{ process VT52 escape sequences */ 2568/*{{{ process VT52 escape sequences */
2560void 2569void ecb_cold
2561rxvt_term::process_escape_vt52 (unicode_t ch) 2570rxvt_term::process_escape_vt52 (unicode_t ch)
2562{ 2571{
2563 int row, col; 2572 int row, col;
2564 2573
2565 switch (ch) 2574 switch (ch)
… …
2599 break; 2608 break;
2600 case 'Z': /* identify the terminal type */ 2609 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2610 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2611 break;
2603 case '<': /* turn off VT52 mode */ 2612 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2613 priv_modes &= ~PrivMode_vt52;
2605 break; 2614 break;
2606 case 'F': /* use special graphics character set */ 2615 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2616 case 'G': /* use regular character set */
2608 /* unimplemented */ 2617 /* unimplemented */
2609 break; 2618 break;
… …
2615} 2624}
2616/*}}} */ 2625/*}}} */
2617 2626
2618 2627
2619/*{{{ process escape sequences */ 2628/*{{{ process escape sequences */
2620void 2629void ecb_hot
2621rxvt_term::process_escape_seq () 2630rxvt_term::process_escape_seq ()
2622{ 2631{
2623 unicode_t ch = cmd_getc (); 2632 unicode_t ch = cmd_getc ();
2624 2633
2625 if (priv_modes & PrivMode_vt52) 2634 if (priv_modes & PrivMode_vt52)
… …
2628 return; 2637 return;
2629 } 2638 }
2630 2639
2631 switch (ch) 2640 switch (ch)
2632 { 2641 {
2633 /* case 1: do_tek_mode (); break; */
2634 case '#': 2642 case '#':
2635 if (cmd_getc () == '8') 2643 if (cmd_getc () == '8')
2636 scr_E (); 2644 scr_E ();
2637 break; 2645 break;
2638 case '(': 2646 case '(':
… …
2661#if !ENABLE_MINIMAL 2669#if !ENABLE_MINIMAL
2662 case '9': 2670 case '9':
2663 scr_forwardindex (); 2671 scr_forwardindex ();
2664 break; 2672 break;
2665#endif 2673#endif
2674 // DECPAM/DECPNM
2666 case '=': 2675 case '=':
2676 priv_modes |= PrivMode_aplKP;
2677 break;
2667 case '>': 2678 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2679 priv_modes &= ~PrivMode_aplKP;
2669 break; 2680 break;
2670 2681
2671 case C1_40: 2682 case C1_40:
2672 cmd_getc (); 2683 cmd_getc ();
2673 break; 2684 break;
… …
2677 2688
2678 /* 8.3.87: NEXT LINE */ 2689 /* 8.3.87: NEXT LINE */
2679 case C1_NEL: /* ESC E */ 2690 case C1_NEL: /* ESC E */
2680 { 2691 {
2681 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2683 } 2694 }
2684 break; 2695 break;
2685 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2686 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2687 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2688 process_graphics (); 2700 // used by original rxvt for rob nations own graphics mode
2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2689 break; 2703 break;
2704#endif
2690 2705
2691 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2692 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2693 scr_set_tab (1); 2708 scr_set_tab (1);
2694 break; 2709 break;
… …
2697 case C1_RI: /* ESC M */ 2712 case C1_RI: /* ESC M */
2698 scr_index (DN); 2713 scr_index (DN);
2699 break; 2714 break;
2700 2715
2701 /* 8.3.142: SINGLE-SHIFT TWO */ 2716 /* 8.3.142: SINGLE-SHIFT TWO */
2702 /*case C1_SS2: scr_single_shift (2); break; */ 2717 /* case C1_SS2: break; */
2703 2718
2704 /* 8.3.143: SINGLE-SHIFT THREE */ 2719 /* 8.3.143: SINGLE-SHIFT THREE */
2705 /*case C1_SS3: scr_single_shift (3); break; */ 2720 /* case C1_SS3: break; */
2706 2721
2707 /* 8.3.27: DEVICE CONTROL STRING */ 2722 /* 8.3.27: DEVICE CONTROL STRING */
2708 case C1_DCS: /* ESC P */ 2723 case C1_DCS: /* ESC P */
2709 process_dcs_seq (); 2724 process_dcs_seq ();
2710 break; 2725 break;
… …
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2727 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2728 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2729 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2730 break; /* steal obsolete ESC [ c */
2716 2731
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2732 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2733 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2734 process_csi_seq ();
2720 break; 2735 break;
2721 2736
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2737 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2738 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2739 process_osc_seq ();
2725 break; 2740 break;
2726 2741
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2742 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2743 case 'c':
2729 mbstate.reset (); 2744 mbstate.reset ();
2730 scr_poweron (); 2745 scr_poweron ();
2731 scrollbar_show (1); 2746 scrollBar.show (1);
2732 break; 2747 break;
2733 2748
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2749 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2750 case 'n':
2736 scr_charset_choose (2); 2751 scr_charset_choose (2);
… …
2743 } 2758 }
2744} 2759}
2745/*}}} */ 2760/*}}} */
2746 2761
2747/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2762/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2748/* *INDENT-OFF* */
2749enum { 2763enum {
2750 CSI_ICH = 0x40, 2764 CSI_ICH = 0x40,
2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2765 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2766 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2767 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2770 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2771 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2772 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2759}; 2773};
2760 2774
2761#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2775#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2776 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2777 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2764#define get_byte_array_bit(array, bit) \ 2778#define get_byte_array_bit(array, bit) \
2765 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2779 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2766 2780
2767const unsigned char csi_defaults[] = 2781static const unsigned char csi_defaults[] =
2768 { 2782 {
2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2783 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2784 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2785 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2786 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2787 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2788 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2789 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2790 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2777 }; 2791 };
2778/* *INDENT-ON* */
2779 2792
2780void 2793void ecb_hot
2781rxvt_term::process_csi_seq () 2794rxvt_term::process_csi_seq ()
2782{ 2795{
2783 unicode_t ch, priv, i; 2796 unicode_t ch, priv, prev_ch, i;
2784 unsigned int nargs, p; 2797 unsigned int nargs, p;
2785 int n, ndef; 2798 int n, ndef;
2786 int arg[ESC_ARGS] = { }; 2799 int arg[ESC_ARGS] = { };
2787 2800
2788 nargs = 0; 2801 nargs = 0;
2789 2802
2790 priv = 0; 2803 priv = 0;
2791 ch = cmd_getc (); 2804 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2805 if ((ch >= '<' && ch <= '?') || ch == '!')
2793 { 2806 {
2794 /* '<' '=' '>' '?' */ 2807 /* '<' '=' '>' '?' '!' */
2795 priv = ch; 2808 priv = ch;
2796 ch = cmd_getc (); 2809 ch = cmd_getc ();
2797 } 2810 }
2798 2811
2812 prev_ch = 0;
2799 /* read any numerical arguments */ 2813 /* read any numerical arguments */
2800 for (n = -1; ch < CSI_ICH; ) 2814 for (n = -1; ch < CSI_ICH; )
2801 { 2815 {
2802 if (isdigit (ch)) 2816 if (isdigit (ch))
2803 { 2817 {
… …
2813 n = -1; 2827 n = -1;
2814 } 2828 }
2815 else if (IS_CONTROL (ch)) 2829 else if (IS_CONTROL (ch))
2816 process_nonprinting (ch); 2830 process_nonprinting (ch);
2817 2831
2832 prev_ch = ch;
2818 ch = cmd_getc (); 2833 ch = cmd_getc ();
2819 } 2834 }
2820 2835
2821 if (ch > CSI_7F) 2836 if (ch > CSI_7F)
2822 return; 2837 return;
… …
2848 // versions. 2863 // versions.
2849 // 2864 //
2850 tt_printf ("\033[>%d;95;0c", 'U'); 2865 tt_printf ("\033[>%d;95;0c", 'U');
2851 } 2866 }
2852 break; 2867 break;
2868
2853 case '?': 2869 case '?':
2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2855 process_terminal_mode (ch, priv, nargs, arg); 2871 process_terminal_mode (ch, priv, nargs, arg);
2872 if (prev_ch == '$' && ch == 'p')
2873 process_terminal_mode (ch, priv, nargs, arg);
2856 break; 2874 break;
2875
2876 case '!':
2877 if (ch == CSI_70)
2878 {
2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2880 scr_soft_reset ();
2881
2882 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2884
2885 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2857 } 2887 }
2888 break;
2889 }
2890
2858 return; 2891 return;
2859 } 2892 }
2860 2893
2861 switch (ch) 2894 switch (ch)
2862 { 2895 {
… …
2876 } 2909 }
2877 break; 2910 break;
2878#endif 2911#endif
2879 2912
2880 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2913 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2881 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2914 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2882 arg[0] = -arg[0]; 2915 arg[0] = -arg[0];
2883 /* FALLTHROUGH */ 2916 /* FALLTHROUGH */
2884 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2917 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2885 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2886 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2887 break; 2920 break;
2888 2921
2889 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2890 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2891#ifdef ISO6429 2924#ifdef ISO6429
2892 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2893#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2894 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2895#endif 2928#endif
… …
2986 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
2987 if (option (Opt_insecure)) 3020 if (option (Opt_insecure))
2988 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2989 break; 3022 break;
2990 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
3024 {
3025 string_term st;
3026 st.v[0] = CHAR_ST;
3027 st.v[1] = '\0';
2991 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3028 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
2992 break; 3029 break;
3030 }
2993 } 3031 }
2994 break; 3032 break;
2995 3033
2996 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3034 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2997 switch (arg[0]) 3035 switch (arg[0])
… …
3040 scr_insert_mode (1); 3078 scr_insert_mode (1);
3041 else if (arg[0] == 20) 3079 else if (arg[0] == 20)
3042 priv_modes |= PrivMode_LFNL; 3080 priv_modes |= PrivMode_LFNL;
3043 break; 3081 break;
3044 3082
3083 case CSI_71: // DECSCUSR: set cursor style
3084 if (prev_ch == ' ')
3085 set_cursor_style (arg[0]);
3086 break;
3087
3045 /* 3088 /*
3046 * PRIVATE USE beyond this point. All CSI_7? sequences here 3089 * PRIVATE USE beyond this point. All CSI_7? sequences here
3047 */ 3090 */
3048 case CSI_72: /* DECSTBM: set top and bottom margins */ 3091 case CSI_72: /* DECSTBM: set top and bottom margins */
3049 if (nargs == 1) 3092 if (nargs == 1)
… …
3077 } 3120 }
3078} 3121}
3079/*}}} */ 3122/*}}} */
3080 3123
3081#if !ENABLE_MINIMAL 3124#if !ENABLE_MINIMAL
3082/* ARGSUSED */
3083void 3125void
3084rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3126rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3085{ 3127{
3086 int x, y; 3128 int x, y;
3087 XWindowAttributes wattr; 3129 XWindowAttributes wattr;
… …
3096 { 3138 {
3097 /* 3139 /*
3098 * commands 3140 * commands
3099 */ 3141 */
3100 case 1: /* deiconify window */ 3142 case 1: /* deiconify window */
3101 XMapWindow (dpy, parent[0]); 3143 XMapWindow (dpy, parent);
3102 break; 3144 break;
3103 case 2: /* iconify window */ 3145 case 2: /* iconify window */
3104 XIconifyWindow (dpy, parent[0], display->screen); 3146 XIconifyWindow (dpy, parent, display->screen);
3105 break; 3147 break;
3106 case 3: /* set position (pixels) */ 3148 case 3: /* set position (pixels) */
3107 XMoveWindow (dpy, parent[0], args[1], args[2]); 3149 XMoveWindow (dpy, parent, args[1], args[2]);
3108 break; 3150 break;
3109 case 4: /* set size (pixels) */ 3151 case 4: /* set size (pixels) */
3110 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3152 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3111 break; 3153 break;
3112 case 5: /* raise window */ 3154 case 5: /* raise window */
3113 XRaiseWindow (dpy, parent[0]); 3155 XRaiseWindow (dpy, parent);
3114 break; 3156 break;
3115 case 6: /* lower window */ 3157 case 6: /* lower window */
3116 XLowerWindow (dpy, parent[0]); 3158 XLowerWindow (dpy, parent);
3117 break; 3159 break;
3118 case 7: /* refresh window */ 3160 case 7: /* refresh window */
3119 scr_touch (true); 3161 scr_touch (true);
3120 break; 3162 break;
3121 case 8: /* set size (chars) */ 3163 case 8: /* set size (chars) */
… …
3124 break; 3166 break;
3125 3167
3126 //case 9: NYI, TODO, restore maximized window or maximize window 3168 //case 9: NYI, TODO, restore maximized window or maximize window
3127 default: 3169 default:
3128 if (args[0] >= 24) /* set height (chars) */ 3170 if (args[0] >= 24) /* set height (chars) */
3129 set_widthheight ((unsigned int)width, 3171 set_widthheight ((unsigned int)vt_width,
3130 (unsigned int) (args[1] * fheight)); 3172 (unsigned int) (args[1] * fheight));
3131 break; 3173 break;
3132 3174
3133 /* 3175 /*
3134 * reports - some output format copied from XTerm 3176 * reports - some output format copied from XTerm
3135 */ 3177 */
3136 case 11: /* report window state */ 3178 case 11: /* report window state */
3137 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3138 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3180 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3139 break; 3181 break;
3140 case 13: /* report window position */ 3182 case 13: /* report window position */
3141 XGetWindowAttributes (dpy, parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent, &wattr);
3142 XTranslateCoordinates (dpy, parent[0], wattr.root, 3184 XTranslateCoordinates (dpy, parent, wattr.root,
3143 -wattr.border_width, -wattr.border_width, 3185 -wattr.border_width, -wattr.border_width,
3144 &x, &y, &wdummy); 3186 &x, &y, &wdummy);
3145 tt_printf ("\033[3;%d;%dt", x, y); 3187 tt_printf ("\033[3;%d;%dt", x, y);
3146 break; 3188 break;
3147 case 14: /* report window size (pixels) */ 3189 case 14: /* report window size (pixels) */
3148 XGetWindowAttributes (dpy, parent[0], &wattr); 3190 XGetWindowAttributes (dpy, parent, &wattr);
3149 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3191 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3150 break; 3192 break;
3151 case 18: /* report text area size (chars) */ 3193 case 18: /* report text area size (chars) */
3152 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3194 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3153 break; 3195 break;
… …
3155 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3197 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3156 break; 3198 break;
3157 case 20: /* report icon label */ 3199 case 20: /* report icon label */
3158 { 3200 {
3159 char *s; 3201 char *s;
3160 XGetIconName (dpy, parent[0], &s); 3202 XGetIconName (dpy, parent, &s);
3161 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162 XFree (s); 3204 XFree (s);
3163 } 3205 }
3164 break; 3206 break;
3165 case 21: /* report window title */ 3207 case 21: /* report window title */
3166 { 3208 {
3167 char *s; 3209 char *s;
3168 XFetchName (dpy, parent[0], &s); 3210 XFetchName (dpy, parent, &s);
3169 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3211 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3170 XFree (s); 3212 XFree (s);
3171 } 3213 }
3172 break; 3214 break;
3173 } 3215 }
… …
3178/* 3220/*
3179 * get input up until STRING TERMINATOR (or BEL) 3221 * get input up until STRING TERMINATOR (or BEL)
3180 * ends_how is terminator used. returned input must be free()'d 3222 * ends_how is terminator used. returned input must be free()'d
3181 */ 3223 */
3182char * 3224char *
3183rxvt_term::get_to_st (unicode_t &ends_how) 3225rxvt_term::get_to_st (string_term &st)
3184{ 3226{
3185 unicode_t ch; 3227 unicode_t ch;
3186 bool seen_esc = false; 3228 bool seen_esc = false;
3187 unsigned int n = 0; 3229 unsigned int n = 0;
3188 wchar_t string[STRING_MAX]; 3230 wchar_t string[CBUFSIZ];
3189 3231
3190 while ((ch = cmd_getc ()) != NOCHAR) 3232 while ((ch = cmd_getc ()) != NOCHAR)
3191 { 3233 {
3192 if (seen_esc) 3234 if (seen_esc)
3193 { 3235 {
… …
3208 else if (ch < 0x20) 3250 else if (ch < 0x20)
3209 return NULL; /* other control character - exit */ 3251 return NULL; /* other control character - exit */
3210 3252
3211 seen_esc = false; 3253 seen_esc = false;
3212 3254
3213 if (n >= STRING_MAX - 1) 3255 if (n >= sizeof (string) - 1)
3214 // stop at some sane length 3256 // stop at some sane length
3215 return NULL; 3257 return NULL;
3216 3258
3217 string[n++] = ch; 3259 string[n++] = ch;
3218 } 3260 }
3219 3261
3220 string[n++] = '\0'; 3262 string[n++] = '\0';
3221 3263
3222 ends_how = (ch == 0x5c ? C0_ESC : ch); 3264 n = 0;
3265 if (ch == 0x5c)
3266 st.v[n++] = C0_ESC;
3267 st.v[n++] = ch;
3268 st.v[n] = '\0';
3223 3269
3224 return rxvt_wcstombs (string); 3270 return rxvt_wcstombs (string);
3225} 3271}
3226 3272
3227/*----------------------------------------------------------------------*/ 3273/*----------------------------------------------------------------------*/
… …
3229 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3275 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3230 */ 3276 */
3231void 3277void
3232rxvt_term::process_dcs_seq () 3278rxvt_term::process_dcs_seq ()
3233{ 3279{
3234 char *s;
3235 unicode_t eh;
3236
3237 /* 3280 /*
3238 * Not handled yet 3281 * Not handled yet
3239 */ 3282 */
3283
3284 string_term st;
3240 s = get_to_st (eh); 3285 char *s = get_to_st (st);
3241 if (s) 3286 if (s)
3242 free (s); 3287 free (s);
3243 3288
3244 return; 3289 return;
3245} 3290}
… …
3249 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3294 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3250 */ 3295 */
3251void 3296void
3252rxvt_term::process_osc_seq () 3297rxvt_term::process_osc_seq ()
3253{ 3298{
3254 unicode_t ch, eh;
3255 int arg; 3299 int arg;
3256 3300
3257 ch = cmd_getc (); 3301 unicode_t ch = cmd_getc ();
3258 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3302 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3259 arg = arg * 10 + (ch - '0'); 3303 arg = arg * 10 + (ch - '0');
3260 3304
3261 if (ch == ';') 3305 if (ch == ';')
3262 { 3306 {
3307 string_term st;
3263 char *s = get_to_st (eh); 3308 char *s = get_to_st (st);
3264 3309
3265 if (s) 3310 if (s)
3266 { 3311 {
3267 process_xterm_seq (arg, s, eh); 3312 process_xterm_seq (arg, s, st);
3268 free (s); 3313 free (s);
3269 } 3314 }
3270 } 3315 }
3271} 3316}
3272 3317
3318static unsigned int
3319colorcube_index (unsigned int idx_r,
3320 unsigned int idx_g,
3321 unsigned int idx_b)
3322{
3323 assert (idx_r < Red_levels);
3324 assert (idx_g < Green_levels);
3325 assert (idx_b < Blue_levels);
3326
3327 return idx_r * Blue_levels * Green_levels +
3328 idx_g * Blue_levels +
3329 idx_b;
3330}
3331
3332/*
3333 * Find the nearest color slot in the hidden color cube,
3334 * adapt its value to the 32bit RGBA color.
3335 */
3336unsigned int
3337rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3338{
3339 r &= 0xff;
3340 g &= 0xff;
3341 b &= 0xff;
3342 a &= 0xff;
3343
3344 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3345
3346 /* we allow one of the 6 closest neighbouring colours */
3347 /* to replace the current color, if they not used recently */
3348 #if 0
3349 static const unsigned char dxyz[][3] = {
3350 0, 0, 0,
3351 0, 0, 4,
3352 0, 4, 4,
3353 4, 4, 0,
3354 4, 0, 4,
3355 0, 4, 0,
3356 4, 0, 0,
3357 };
3358 #else
3359 // silly compressed verlapping triplets version of above
3360 static const unsigned char dxyz[] = {
3361 0, 0, 0, 4, 4, 0, 4, 0, 0,
3362 };
3363 #endif
3364
3365 static const unsigned char color_level[8][32] = {
3366 // neighbour index
3367 {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},
3368 {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},
3369 {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},
3370 {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},
3371 // Red_levels/Green_levels/Blue_levels index
3372 {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},
3373 {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},
3374 {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},
3375 {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},
3376 };
3377
3378 unsigned int idx;
3379
3380 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3381 {
3382 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3383 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3384 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3385 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3386
3387 if (n == 0)
3388 idx = index;
3389
3390 if (rgb24_color[index] == color)
3391 {
3392 rgb24_seqno[index] = ++rgb24_sequence;
3393 return index + minTermCOLOR24;
3394 }
3395
3396 // minor issue: could update index 0 few more times
3397 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3398 {
3399 idx = index;
3400 goto update;
3401 }
3402
3403 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3404 // but also handles wrap around values well enough
3405 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3406 idx = index;
3407 }
3408
3409update:
3410 rgb24_color[idx] = color;
3411 rgb24_seqno[idx] = ++rgb24_sequence;
3412
3413 idx += minTermCOLOR24;
3414 pix_colors_focused [idx].free (this);
3415 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3416 update_fade_color (idx, false);
3417
3418 return idx;
3419}
3420
3273void 3421void
3274rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3422rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3275{ 3423{
3276 if (str[0] == '?' && !str[1]) 3424 if (str[0] == '?' && !str[1])
3277 { 3425 {
3278 rgba c; 3426 rgba c;
3279 pix_colors_focused[color].get (c); 3427 pix_colors_focused[color].get (c);
3428 char rgba_str[32];
3280 3429
3281#if XFT 3430#if XFT
3282 if (c.a != rgba::MAX_CC) 3431 if (c.a != rgba::MAX_CC)
3283 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3432 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3284 else 3433 else
3285#endif 3434#endif
3286 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3435 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3436
3437 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3438 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3439 else
3440 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3287 } 3441 }
3288 else 3442 else
3289 set_window_color (color, str); 3443 set_window_color (color, str);
3290} 3444}
3291 3445
3292/* 3446/*
3293 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3447 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3294 */ 3448 */
3295void 3449void
3296rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3450rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3297{ 3451{
3298 int color; 3452 int color;
3299 char *buf, *name; 3453 char *buf, *name;
3300 bool query = str[0] == '?' && !str[1]; 3454 bool query = str[0] == '?' && !str[1];
3301 int saveop = op; 3455 int saveop = op;
… …
3328 unsigned long bytes_after; 3482 unsigned long bytes_after;
3329 unsigned char *value = 0; 3483 unsigned char *value = 0;
3330 const char *str = ""; 3484 const char *str = "";
3331 3485
3332 if (prop 3486 if (prop
3333 && XGetWindowProperty (dpy, parent[0], 3487 && XGetWindowProperty (dpy, parent,
3334 prop, 0, 1<<16, 0, AnyPropertyType, 3488 prop, 0, 1<<16, 0, AnyPropertyType,
3335 &actual_type, &actual_format, 3489 &actual_type, &actual_format,
3336 &nitems, &bytes_after, &value) == Success 3490 &nitems, &bytes_after, &value) == Success
3337 && actual_type != None 3491 && actual_type != None
3338 && actual_format == 8) 3492 && actual_format == 8)
3339 str = (const char *)(value); 3493 str = (const char *)(value);
3340 3494
3341 tt_printf ("\033]%d;%s%c", op, str, resp); 3495 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3342 3496
3343 XFree (value); 3497 XFree (value);
3344 } 3498 }
3345 else 3499 else
3346 { 3500 {
3347 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3501 char *eq = strchr (str, '=');
3348 3502
3349 if (eq) 3503 if (eq)
3350 { 3504 {
3351 *eq = 0; 3505 *eq = 0;
3352 set_utf8_property (display->atom (str), eq + 1); 3506 set_utf8_property (display->atom (str), eq + 1);
3353 } 3507 }
3354 else 3508 else
3355 XDeleteProperty (dpy, parent[0], 3509 XDeleteProperty (dpy, parent,
3356 display->atom (str)); 3510 display->atom (str));
3357 } 3511 }
3358 break; 3512 break;
3359 3513
3360 case XTerm_Color: 3514 case XTerm_Color:
… …
3370 break; 3524 break;
3371 3525
3372 if ((buf = strchr (name, ';')) != NULL) 3526 if ((buf = strchr (name, ';')) != NULL)
3373 *buf++ = '\0'; 3527 *buf++ = '\0';
3374 3528
3375 process_color_seq (op, color, name, resp); 3529 process_color_seq (op, color, name, st);
3376 } 3530 }
3377 break; 3531 break;
3378 case Rxvt_restoreFG: 3532 case Rxvt_restoreFG:
3379 case XTerm_Color00: 3533 case XTerm_Color00:
3380 process_color_seq (op, Color_fg, str, resp); 3534 process_color_seq (op, Color_fg, str, st);
3381 break; 3535 break;
3382 case Rxvt_restoreBG: 3536 case Rxvt_restoreBG:
3383 case XTerm_Color01: 3537 case XTerm_Color01:
3384 process_color_seq (op, Color_bg, str, resp); 3538 process_color_seq (op, Color_bg, str, st);
3385 break; 3539 break;
3386#ifndef NO_CURSORCOLOR 3540#ifndef NO_CURSORCOLOR
3387 case XTerm_Color_cursor: 3541 case XTerm_Color_cursor:
3388 process_color_seq (op, Color_cursor, str, resp); 3542 process_color_seq (op, Color_cursor, str, st);
3389 break; 3543 break;
3390#endif 3544#endif
3391 case XTerm_Color_pointer_fg: 3545 case XTerm_Color_pointer_fg:
3392 process_color_seq (op, Color_pointer_fg, str, resp); 3546 process_color_seq (op, Color_pointer_fg, str, st);
3393 break; 3547 break;
3394 case XTerm_Color_pointer_bg: 3548 case XTerm_Color_pointer_bg:
3395 process_color_seq (op, Color_pointer_bg, str, resp); 3549 process_color_seq (op, Color_pointer_bg, str, st);
3396 break; 3550 break;
3551#ifdef OPTION_HC
3552 case XTerm_Color_HC:
3553 process_color_seq (op, Color_HC, str, st);
3554 break;
3555 case XTerm_Color_HTC:
3556 process_color_seq (op, Color_HTC, str, st);
3557 break;
3558#endif
3397#ifndef NO_BOLD_UNDERLINE_REVERSE 3559#ifndef NO_BOLD_UNDERLINE_REVERSE
3398 case XTerm_Color_RV:
3399 process_color_seq (op, Color_RV, str, resp);
3400 break;
3401 case Rxvt_Color_BD:
3402 case URxvt_Color_BD: 3560 case URxvt_Color_BD:
3403 process_color_seq (op, Color_BD, str, resp); 3561 process_color_seq (op, Color_BD, str, st);
3404 break; 3562 break;
3405 case Rxvt_Color_UL:
3406 case URxvt_Color_UL: 3563 case URxvt_Color_UL:
3407 process_color_seq (op, Color_UL, str, resp); 3564 process_color_seq (op, Color_UL, str, st);
3408 break; 3565 break;
3409 case URxvt_Color_IT: 3566 case URxvt_Color_IT:
3410 process_color_seq (op, Color_IT, str, resp); 3567 process_color_seq (op, Color_IT, str, st);
3411 break; 3568 break;
3412#endif 3569#endif
3413#if ENABLE_TRANSPARENCY
3414 case URxvt_Color_tint: 3570 case URxvt_Color_border:
3415 process_color_seq (op, Color_tint, str, resp); 3571 process_color_seq (op, Color_border, str, st);
3416 {
3417 bool changed = false;
3418
3419 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3423
3424 if (changed)
3425 update_background ();
3426 }
3427
3428 break; 3572 break;
3429#endif
3430
3431#if BG_IMAGE_FROM_FILE
3432 case Rxvt_Pixmap:
3433 if (!strcmp (str, "?"))
3434 {
3435 char str[256];
3436
3437 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3441 }
3442 else
3443 {
3444 int changed = 0;
3445
3446 if (*str != ';')
3447 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */
3451 changed++;
3452 str = strchr (str, ';');
3453 if (str == NULL)
3454 bgPixmap.set_defaultGeometry ();
3455 }
3456
3457 while (str)
3458 {
3459 str++;
3460 if (bgPixmap.set_geometry (str))
3461 changed++;
3462 str = strchr (str, ';');
3463 }
3464
3465 if (changed)
3466 update_background ();
3467 }
3468 break;
3469#endif
3470 3573
3471 case XTerm_logfile: 3574 case XTerm_logfile:
3472 // TODO, when secure mode? 3575 // TODO, when secure mode?
3473 break; 3576 break;
3474 3577
… …
3491 case URxvt_boldFont: 3594 case URxvt_boldFont:
3492 case URxvt_italicFont: 3595 case URxvt_italicFont:
3493 case URxvt_boldItalicFont: 3596 case URxvt_boldItalicFont:
3494#endif 3597#endif
3495 if (query) 3598 if (query)
3496 tt_printf ("\33]%d;%-.250s%c", saveop, 3599 tt_printf ("\33]%d;%-.250s%s", saveop,
3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3600 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3498 ? fontset[op - URxvt_font]->fontdesc : "", 3601 ? fontset[op - URxvt_font]->fontdesc : "",
3499 resp); 3602 st.v);
3500 else 3603 else
3501 { 3604 {
3502 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3605 const char *&res = rs[Rs_font + (op - URxvt_font)];
3503 3606
3504 res = strdup (str); 3607 res = strdup (str);
… …
3507 } 3610 }
3508 break; 3611 break;
3509 3612
3510 case URxvt_version: 3613 case URxvt_version:
3511 if (query) 3614 if (query)
3512 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3615 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3513 op, 3616 op,
3514 rs[Rs_name], VERSION[0], VERSION[2], 3617 rs[Rs_name], VERSION[0], VERSION[2],
3515 resp); 3618 st.v);
3516 break; 3619 break;
3517 3620
3518#if !ENABLE_MINIMAL 3621#if !ENABLE_MINIMAL
3622 case URxvt_cellinfo:
3623 if (query)
3624 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3625 fwidth, fheight, fbase,
3626 st.v);
3627 break;
3628
3519 case URxvt_locale: 3629 case URxvt_locale:
3520 if (query) 3630 if (query)
3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3631 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3522 else 3632 else
3523 { 3633 {
3524 set_locale (str); 3634 set_locale (str);
3525 pty->set_utf8_mode (enc_utf8); 3635 pty->set_utf8_mode (enc_utf8);
3526 init_xlocale (); 3636 init_xlocale ();
… …
3541 break; 3651 break;
3542#endif 3652#endif
3543 3653
3544#if ENABLE_PERL 3654#if ENABLE_PERL
3545 case URxvt_perl: 3655 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3656 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3547 ; // no responses yet
3548 break; 3657 break;
3549#endif 3658#endif
3550 } 3659 }
3551} 3660}
3552/*----------------------------------------------------------------------*/ 3661/*----------------------------------------------------------------------*/
… …
3559 * 's' = save 3668 * 's' = save
3560 * 'r' = restore 3669 * 'r' = restore
3561 * 't' = toggle 3670 * 't' = toggle
3562 * so no need for fancy checking 3671 * so no need for fancy checking
3563 */ 3672 */
3564int 3673int ecb_cold
3565rxvt_term::privcases (int mode, unsigned long bit) 3674rxvt_term::privcases (int mode, unsigned long bit)
3566{ 3675{
3567 int state; 3676 int state;
3568 3677
3569 if (mode == 's') 3678 if (mode == 's')
3570 { 3679 {
3571 SavedModes |= (priv_modes & bit); 3680 if (priv_modes & bit)
3681 SavedModes |= bit;
3682 else
3683 SavedModes &= ~bit;
3572 return -1; 3684 return -1;
3573 } 3685 }
3574 else 3686 else
3575 { 3687 {
3576 if (mode == 'r') 3688 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3689 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3690 else
3579 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3691 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3692
3693 if (state)
3694 priv_modes |= bit;
3695 else
3696 priv_modes &= ~bit;
3581 } 3697 }
3582 3698
3583 return state; 3699 return state;
3584} 3700}
3585 3701
3586/* we're not using priv _yet_ */ 3702/* we're not using priv _yet_ */
3587void 3703void
3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3704rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3589{ 3705{
3590 unsigned int i, j; 3706 unsigned int i, j;
3591 int state; 3707 int state;
3592 3708
3593 static const struct 3709 static const struct
3594 { 3710 {
3595 const int argval; 3711 const int argval;
3596 const unsigned long bit; 3712 const unsigned long bit;
3597 } argtopriv[] = { 3713 } argtopriv[] = {
3598 { 1, PrivMode_aplCUR }, 3714 { 1, PrivMode_aplCUR }, // DECCKM
3599 { 2, PrivMode_vt52 }, 3715 { 2, PrivMode_vt52 }, // DECANM
3600 { 3, PrivMode_132 }, 3716 { 3, PrivMode_132 }, // DECCOLM
3601 { 4, PrivMode_smoothScroll }, 3717 { 4, PrivMode_smoothScroll }, // DECSCLM
3602 { 5, PrivMode_rVideo }, 3718 { 5, PrivMode_rVideo }, // DECSCNM
3603 { 6, PrivMode_relOrigin }, 3719 { 6, PrivMode_relOrigin }, // DECOM
3604 { 7, PrivMode_Autowrap }, 3720 { 7, PrivMode_Autowrap }, // DECAWM
3605 // 8, bi-directional support mode 3721 // 8, auto-repeat keys // DECARM
3606 { 9, PrivMode_MouseX10 }, 3722 { 9, PrivMode_MouseX10 },
3607 // 18, 19 printing-related
3608 { 25, PrivMode_VisibleCursor }, 3723 { 12, PrivMode_BlinkingCursor },
3724 // 18 end FF to printer after print screen
3725 // 19 Print screen prints full screen/scroll region
3726 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3727#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3728 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3729#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3730 { 35, PrivMode_ShiftKeys }, // rxvt extension
3731 // 38, tektronix mode // DECTEK
3613 { 40, PrivMode_132OK }, 3732 { 40, PrivMode_132OK },
3614 // 41 xterm more fixes NYI 3733 // 41 xterm more fixes NYI
3615 // 45 margin bell NYI 3734 // 45 margin bell NYI
3616 // 46 start logging 3735 // 46 start logging
3617 { 47, PrivMode_Screen }, 3736 { 47, PrivMode_Screen },
3618 { 66, PrivMode_aplKP }, 3737 { 66, PrivMode_aplKP }, // DECNKM
3619#ifndef NO_BACKSPACE_KEY 3738#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3739 { 67, PrivMode_BackSpace }, // DECBKM
3621#endif 3740#endif
3622 { 1000, PrivMode_MouseX11 }, 3741 { 1000, PrivMode_MouseX11 },
3623 { 1002, PrivMode_MouseBtnEvent }, 3742 { 1002, PrivMode_MouseBtnEvent },
3624 { 1003, PrivMode_MouseAnyEvent }, 3743 { 1003, PrivMode_MouseAnyEvent },
3744#if ENABLE_FRILLS
3745 { 1004, PrivMode_FocusEvent },
3746 { 1005, PrivMode_ExtMouseUTF8 },
3747 { 1006, PrivMode_ExtMouseSGR },
3748#endif
3625 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3749 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3626 { 1011, PrivMode_Keypress }, // rxvt extension 3750 { 1011, PrivMode_Keypress }, // rxvt extension
3751#if ENABLE_FRILLS
3752 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3753#endif
3627 // 1035 enable modifiers for alt, numlock NYI 3754 // 1035 enable modifiers for alt, numlock NYI
3628 // 1036 send ESC for meta keys NYI 3755 // 1036 send ESC for meta keys NYI
3629 // 1037 send DEL for keypad delete NYI 3756 // 1037 send DEL for keypad delete NYI
3630 { 1047, PrivMode_Screen }, 3757 { 1047, PrivMode_Screen },
3631 // 1048 save and restore cursor 3758 // 1048 save and restore cursor, implemented in code
3632 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3759 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3633 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3760 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3761#if ENABLE_FRILLS
3762 { 2004, PrivMode_BracketPaste },
3763#endif
3634 }; 3764 };
3635 3765
3636 if (nargs == 0) 3766 if (nargs == 0)
3637 return; 3767 return;
3768
3769 // DECRQM
3770 if (mode == 'p')
3771 {
3772 int status = 0;
3773 if (nargs != 1)
3774 return;
3775
3776 for (j = 0; j < ecb_array_length (argtopriv); j++)
3777 if (argtopriv[j].argval == arg[0])
3778 {
3779 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3780 break;
3781 }
3782
3783 tt_printf ("\33[?%d;%d$y", arg[0], status);
3784 return;
3785 }
3638 3786
3639 /* make lo/hi boolean */ 3787 /* make lo/hi boolean */
3640 if (mode == 'l') 3788 if (mode == 'l')
3641 mode = 0; /* reset */ 3789 mode = 0; /* reset */
3642 else if (mode == 'h') 3790 else if (mode == 'h')
… …
3645 for (i = 0; i < nargs; i++) 3793 for (i = 0; i < nargs; i++)
3646 { 3794 {
3647 state = -1; 3795 state = -1;
3648 3796
3649 /* basic handling */ 3797 /* basic handling */
3650 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3798 for (j = 0; j < ecb_array_length (argtopriv); j++)
3651 if (argtopriv[j].argval == arg[i]) 3799 if (argtopriv[j].argval == arg[i])
3652 { 3800 {
3653 state = privcases (mode, argtopriv[j].bit); 3801 state = privcases (mode, argtopriv[j].bit);
3654 break; 3802 break;
3655 } 3803 }
… …
3663 3811
3664 scr_touch (true); 3812 scr_touch (true);
3665 break; 3813 break;
3666#endif 3814#endif
3667 case 1048: /* alternative cursor save */ 3815 case 1048: /* alternative cursor save */
3668 case 1049:
3669 if (option (Opt_secondaryScreen)) 3816 if (option (Opt_secondaryScreen))
3670 if (mode == 0) 3817 if (mode == 0)
3671 scr_cursor (RESTORE); 3818 scr_cursor (RESTORE);
3672 else if (mode == 1) 3819 else if (mode == 1)
3673 scr_cursor (SAVE); 3820 scr_cursor (SAVE);
… …
3682 case 2: /* VT52 mode */ 3829 case 2: /* VT52 mode */
3683 /* oddball mode. should be set regardless of set/reset 3830 /* oddball mode. should be set regardless of set/reset
3684 * parameter. Return from VT52 mode with an ESC < from 3831 * parameter. Return from VT52 mode with an ESC < from
3685 * within VT52 mode 3832 * within VT52 mode
3686 */ 3833 */
3687 PrivMode (1, PrivMode_vt52); 3834 priv_modes |= PrivMode_vt52;
3688 break; 3835 break;
3689 case 3: /* 80/132 */ 3836 case 3: /* 80/132 */
3690 if (priv_modes & PrivMode_132OK) 3837 if (priv_modes & PrivMode_132OK)
3691 {
3692 scr_poweron ();
3693 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3838 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3694 }
3695 break; 3839 break;
3696 case 4: /* smooth scrolling */ 3840 case 4: /* smooth scrolling */
3697 set_option (Opt_jumpScroll, !state); 3841 set_option (Opt_jumpScroll, !state);
3698 break; 3842 break;
3699 case 5: /* reverse video */ 3843 case 5: /* reverse video */
… …
3710 if (state) /* orthogonal */ 3854 if (state) /* orthogonal */
3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3855 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3712 break; 3856 break;
3713#ifdef scrollBar_esc 3857#ifdef scrollBar_esc
3714 case scrollBar_esc: 3858 case scrollBar_esc:
3715 if (scrollbar_mapping (state)) 3859 scrollBar.map (state);
3716 {
3717 resize_all_windows (0, 0, 0); 3860 resize_all_windows (0, 0, 0);
3718 scr_touch (true); 3861 scr_touch (true);
3719 } 3862 break;
3863#endif
3864#ifdef CURSOR_BLINK
3865 case 12:
3866 cursor_blink_reset ();
3720 break; 3867 break;
3721#endif 3868#endif
3722 case 25: /* visible/invisible cursor */ 3869 case 25: /* visible/invisible cursor */
3723 scr_cursor_visible (state); 3870 scr_cursor_visible (state);
3724 break; 3871 break;
… …
3737 case 1003: 3884 case 1003:
3738 if (state) 3885 if (state)
3739 { 3886 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3887 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3888 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3889 mouse_row = mouse_col = 0;
3742 vt_emask_mouse = PointerMotionMask; 3890 vt_emask_mouse = PointerMotionMask;
3743 } 3891 }
3744 else 3892 else
3745 vt_emask_mouse = NoEventMask; 3893 vt_emask_mouse = NoEventMask;
3894
3746 vt_select_input (); 3895 vt_select_input ();
3747 break; 3896 break;
3748 case 1010: /* scroll to bottom on TTY output inhibit */ 3897 case 1010: /* scroll to bottom on TTY output inhibit */
3749 set_option (Opt_scrollTtyOutput, !state); 3898 set_option (Opt_scrollTtyOutput, !state);
3750 break; 3899 break;
3751 case 1011: /* scroll to bottom on key press */ 3900 case 1011: /* scroll to bottom on key press */
3752 set_option (Opt_scrollTtyKeypress, state); 3901 set_option (Opt_scrollTtyKeypress, state);
3753 break; 3902 break;
3754 case 1047: /* secondary screen w/ clearing last */ 3903 case 1047: /* secondary screen w/ clearing last */
3755 if (option (Opt_secondaryScreen)) 3904 if (option (Opt_secondaryScreen))
3756 if (current_screen != PRIMARY) 3905 if (!state)
3757 scr_erase_screen (2); 3906 scr_erase_screen (2);
3907
3758 scr_change_screen (state); 3908 scr_change_screen (state);
3759 break; 3909 break;
3760 case 1049: /* secondary screen w/ clearing first */ 3910 case 1049: /* secondary screen w/ clearing first */
3911 if (option (Opt_secondaryScreen))
3912 if (state)
3913 scr_cursor (SAVE);
3914
3761 scr_change_screen (state); 3915 scr_change_screen (state);
3916
3762 if (option (Opt_secondaryScreen)) 3917 if (option (Opt_secondaryScreen))
3763 if (current_screen != PRIMARY) 3918 if (state)
3764 scr_erase_screen (2); 3919 scr_erase_screen (2);
3920 else
3921 scr_cursor (RESTORE);
3765 break; 3922 break;
3766 default: 3923 default:
3767 break; 3924 break;
3768 } 3925 }
3769 } 3926 }
3770} 3927}
3771/*}}} */ 3928/*}}} */
3772 3929
3773/*{{{ process sgr sequences */ 3930/*{{{ process sgr sequences */
3774void 3931void ecb_hot
3775rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3932rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3776{ 3933{
3777 unsigned int i; 3934 unsigned int i;
3778 short rendset; 3935 short rendset;
3779 int rendstyle; 3936 int rendstyle;
… …
3821 //case 19: // ninth alt font 3978 //case 19: // ninth alt font
3822 //case 20: // gothic 3979 //case 20: // gothic
3823 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3980 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 3981 rendset = 0, rendstyle = RS_Bold;
3825 break; 3982 break;
3826 case 22: // normal intensity 3983 case 22: // bold off (vt220)
3827 rendset = 0, rendstyle = RS_Bold; 3984 rendset = 0, rendstyle = RS_Bold;
3828 break; 3985 break;
3829 case 23: // disable italic 3986 case 23: // disable italic
3830 rendset = 0, rendstyle = RS_Italic; 3987 rendset = 0, rendstyle = RS_Italic;
3831 break; 3988 break;
3832 case 24: 3989 case 24: // underline off (vt220)
3833 rendset = 0, rendstyle = RS_Uline; 3990 rendset = 0, rendstyle = RS_Uline;
3834 break; 3991 break;
3835 case 25: 3992 case 25: // blink off (vt220)
3836 rendset = 0, rendstyle = RS_Blink; 3993 rendset = 0, rendstyle = RS_Blink;
3837 break; 3994 break;
3838 case 26: // variable spacing (iso 8613) 3995 case 26: // variable spacing (iso 8613)
3839 rendset = 0, rendstyle = RS_Blink; 3996 rendset = 0, rendstyle = RS_Blink;
3840 break; 3997 break;
3841 case 27: 3998 case 27: // reverse off (vt220)
3842 rendset = 0, rendstyle = RS_RVid; 3999 rendset = 0, rendstyle = RS_RVid;
3843 break; 4000 break;
3844 //case 28: // visible. NYI 4001 //case 28: // visible. NYI
3845 //case 29: // not crossed-out 4002 //case 29: // not crossed-out
3846 } 4003 }
… …
3861 case 35: 4018 case 35:
3862 case 36: 4019 case 36:
3863 case 37: 4020 case 37:
3864 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4021 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3865 break; 4022 break;
3866 case 38: // set fg color, ISO 8613-6
3867 if (nargs > i + 2 && arg[i + 1] == 5)
3868 {
3869 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3870 i += 2;
3871 }
3872 break;
3873 case 39: /* default fg */ 4023 case 39: /* default fg */
3874 scr_color (Color_fg, Color_fg); 4024 scr_color (Color_fg, Color_fg);
3875 break; 4025 break;
3876 4026
3877 case 40: 4027 case 40:
… …
3882 case 45: 4032 case 45:
3883 case 46: 4033 case 46:
3884 case 47: 4034 case 47:
3885 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4035 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3886 break; 4036 break;
3887 case 48: // set bg color, ISO 8613-6
3888 if (nargs > i + 2 && arg[i + 1] == 5)
3889 {
3890 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3891 i += 2;
3892 }
3893 break;
3894 case 49: /* default bg */ 4037 case 49: /* default bg */
3895 scr_color (Color_bg, Color_bg); 4038 scr_color (Color_bg, Color_bg);
4039 break;
4040
4041 case 38: // set fg color, ISO 8613-6
4042 case 48: // set bg color, ISO 8613-6
4043 {
4044 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4045 unsigned int idx;
4046
4047 if (nargs > i + 2 && arg[i + 1] == 5)
4048 {
4049 idx = minCOLOR + arg[i + 2];
4050 i += 2;
4051
4052 scr_color (idx, fgbg);
4053 }
4054 else if (nargs > i + 4 && arg[i + 1] == 2)
4055 {
4056 unsigned int r = arg[i + 2];
4057 unsigned int g = arg[i + 3];
4058 unsigned int b = arg[i + 4];
4059 unsigned int a = 0xff;
4060
4061 idx = map_rgb24_color (r, g, b, a);
4062
4063 i += 4;
4064
4065 scr_color (idx, fgbg);
4066 }
4067 }
3896 break; 4068 break;
3897 4069
3898 //case 50: // not variable spacing 4070 //case 50: // not variable spacing
3899 4071
3900#if !ENABLE_MINIMAL 4072#if !ENABLE_MINIMAL
… …
3920 break; 4092 break;
3921#endif 4093#endif
3922 } 4094 }
3923 } 4095 }
3924} 4096}
4097
4098void
4099rxvt_term::set_cursor_style (int style)
4100{
4101 if (!IN_RANGE_INC (style, 0, 6))
4102 return;
4103
4104 if (style == 0)
4105 style = 1;
4106
4107 cursor_type = (style - 1) / 2;
4108 set_option (Opt_cursorUnderline, cursor_type == 1);
4109
4110#ifdef CURSOR_BLINK
4111 set_option (Opt_cursorBlink, style & 1);
4112 cursor_blink_reset ();
4113#endif
4114
4115 want_refresh = 1;
4116}
3925/*}}} */ 4117/*}}} */
3926 4118
3927/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3928void
3929rxvt_term::process_graphics ()
3930{
3931 unicode_t ch, cmd = cmd_getc ();
3932
3933 if (cmd == 'Q')
3934 {
3935 /* query graphics */
3936 tt_printf ("\033G0\012"); /* no graphics */
3937 return;
3938 }
3939 /* swallow other graphics sequences until terminating ':' */
3940 do
3941 ch = cmd_getc ();
3942 while (ch != ':');
3943}
3944/*}}} */
3945
3946/* ------------------------------------------------------------------------- */ 4119/* ---------------------------------------------------------------------- */
4120/* Write data to the pty as typed by the user, pasted with the mouse,
4121 * or generated by us in response to a query ESC sequence.
4122 */
3947 4123
3948/* 4124/*
3949 * Send printf () formatted output to the command. 4125 * Send printf () formatted output to the command.
3950 * Only use for small amounts of data. 4126 * Only use for small amounts of data.
3951 */ 4127 */
… …
3959 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4135 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3960 va_end (arg_ptr); 4136 va_end (arg_ptr);
3961 tt_write (buf, strlen (buf)); 4137 tt_write (buf, strlen (buf));
3962} 4138}
3963 4139
3964/* ---------------------------------------------------------------------- */
3965/* Write data to the pty as typed by the user, pasted with the mouse, 4140/* Write data to the pty as typed by the user. */
3966 * or generated by us in response to a query ESC sequence. 4141void
3967 */ 4142rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3968const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4143{
4144 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4145 return;
4146
4147 if (option (Opt_scrollTtyKeypress))
4148 if (view_start)
4149 {
4150 view_start = 0;
4151 want_refresh = 1;
4152 }
4153
4154 tt_write_ (data, len);
4155}
3969 4156
3970void 4157void
3971rxvt_term::tt_write (const char *data, unsigned int len) 4158rxvt_term::tt_write (const char *data, unsigned int len)
3972{ 4159{
3973 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4160 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3974 return; 4161 return;
3975 4162
4163 tt_write_ (data, len);
4164}
4165
4166static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4167
4168void
4169rxvt_term::tt_write_ (const char *data, unsigned int len)
4170{
3976 if (pty->pty < 0) 4171 if (pty->pty < 0)
3977 return; 4172 return;
3978 4173
3979 if (v_buflen == 0) 4174 if (v_buflen == 0)
3980 { 4175 {
3981 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4176 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3982 4177
4178 max_it (written, 0);
4179
3983 if ((unsigned int)written == len) 4180 if (written == len)
3984 return; 4181 return;
3985 4182
3986 data += written; 4183 data += written;
3987 len -= written; 4184 len -= written;
3988 } 4185 }
3989 4186
3990 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4187 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3991 4188
3992 memcpy (v_buffer + v_buflen, data, len); 4189 memcpy (v_buffer + v_buflen, data, len);
3993 v_buflen += len; 4190 v_buflen += len;
3994 4191
3995 pty_ev.set (ev::READ | ev::WRITE); 4192 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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