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

Diff Legend

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