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.382 by root, Fri Dec 14 06:04:56 2007 UTC vs.
Revision 1.576 by root, Thu Jun 30 16:59:02 2016 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-2014 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, 0);
… …
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 + hey
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}
1217 1239
1218void 1240 refresh_check ();
1241}
1242
1243void ecb_cold
1219rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1220{ 1245{
1221 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1222 recolour_cursor (); 1247 recolor_cursor ();
1223 1248
1224#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1225 hidden_pointer = 0; 1250 hidden_pointer = 0;
1226 1251
1227 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1228 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1229#endif 1254#endif
1230} 1255}
1231 1256
1232#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1233void 1258void ecb_cold
1234rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1235{ 1260{
1236 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1237 return; 1262 return;
1238 1263
… …
1240 XFlush (dpy); 1265 XFlush (dpy);
1241 1266
1242 hidden_pointer = 1; 1267 hidden_pointer = 1;
1243} 1268}
1244 1269
1245void 1270void ecb_cold
1246rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1247{ 1272{
1248 make_current (); 1273 make_current ();
1249 1274
1250 pointer_blank (); 1275 pointer_blank ();
… …
1256{ 1281{
1257 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1258 int x, y; 1283 int x, y;
1259 int code = 32; 1284 int code = 32;
1260 1285
1261 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1262 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1288
1263 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1264 { 1290 {
1265 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1266 return; 1292 return;
1293
1267 mouse_row = x; 1294 mouse_row = x;
1268 mouse_col = y; 1295 mouse_col = y;
1269 code += 32; 1296 code += 32;
1270 } 1297 }
1271 1298
… …
1274 else 1301 else
1275 { 1302 {
1276 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1277 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1278 if (button_number >= 3) 1305 if (button_number >= 3)
1279 button_number += (64 - 3); 1306 button_number += 64 - 3;
1280 } 1307 }
1281 1308
1282 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1283 { 1310 {
1284 /* 1311 /*
… …
1316 fputc ('A', stderr); 1343 fputc ('A', stderr);
1317 if (key_state & 32) 1344 if (key_state & 32)
1318 fputc ('2', stderr); 1345 fputc ('2', stderr);
1319 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1320 button_number, 1347 button_number,
1321 x + 1, 1348 x,
1322 y + 1); 1349 y);
1323#endif 1350#endif
1324 1351
1352#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight)
1354 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state,
1356 x,
1357 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse)
1359 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state,
1361 wint_t (32 + x),
1362 wint_t (32 + y));
1363 else
1364#endif
1325 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1326 (code + button_number + key_state), 1366 code + button_number + key_state,
1327 (32 + x + 1), 1367 32 + x,
1328 (32 + y + 1)); 1368 32 + y);
1329} 1369}
1330 1370
1331/*{{{ process an X event */ 1371/*{{{ process an X event */
1332void 1372void ecb_hot
1333rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1334{ 1374{
1335 make_current (); 1375 make_current ();
1336 1376
1337 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1435 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1436 focus_out (); 1476 focus_out ();
1437 break; 1477 break;
1438 1478
1439 case ConfigureNotify: 1479 case ConfigureNotify:
1440 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height); */
1443 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1444 { 1481 {
1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1446 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1499 int x, y;
1500
1501 if (ev.xconfigure.send_event)
1502 {
1503 x = ev.xconfigure.x;
1504 y = ev.xconfigure.y;
1505 }
1506 else
1507 get_window_origin (x, y);
1508
1509 if (x != parent_x || y != parent_y)
1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 }
1516 }
1447 1517
1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1519 {
1450 seen_resize = 1; 1520 seen_resize = 1;
1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1522 }
1453 else 1523 else
1454 { 1524 {
1455#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ()) 1526 if (moved)
1457 update_background (); 1527 update_background ();
1458#endif 1528#endif
1459 } 1529 }
1530
1460 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 } 1532 }
1462 break; 1533 break;
1463 1534
1464 case PropertyNotify: 1535 case PropertyNotify:
1465 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1466 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1467 && ev.xproperty.state == PropertyNewValue)
1468 selection_property (ev.xproperty.window, ev.xproperty.atom);
1469
1470 break; 1537 break;
1471 1538
1472 case SelectionClear: 1539 case SelectionClear:
1473 selection_clear (); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1474 break;
1475
1476 case SelectionNotify:
1477 if (selection_wait == Sel_normal)
1478 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1479 break; 1541 break;
1480 1542
1481 case SelectionRequest: 1543 case SelectionRequest:
1482 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1483 break; 1545 break;
1484 1546
1485 case MapNotify: 1547 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1486 mapped = 1; 1559 mapped = 1;
1487#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1488 text_blink_ev.start (); 1561 text_blink_ev.start ();
1489#endif 1562#endif
1490 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1503 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1504 { 1577 {
1505 do 1578 do
1506 { 1579 {
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1509 } 1582 }
1510 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1511 1584
1512 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1513 1586
1514 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1515 { 1588 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1591 }
1519 1592
1520 want_refresh = 1; 1593 want_refresh = 1;
1521 } 1594 }
1522 else 1595 else
… …
1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1599 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1527 ; 1600 ;
1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1529 ; 1602 ;
1530 1603
1531 if (isScrollbarWindow (ev.xany.window)) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1532 { 1605 {
1533 scrollBar.setIdle (); 1606 scrollBar.state = SB_STATE_IDLE;
1534 scrollbar_show (0); 1607 scrollBar.show (0);
1535 } 1608 }
1536 } 1609 }
1537 break; 1610 break;
1538 1611
1539 case MotionNotify: 1612 case MotionNotify:
1540#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1541 if (hidden_pointer) 1614 if (hidden_pointer)
1542 pointer_unblank (); 1615 pointer_unblank ();
1543#endif 1616#endif
1617 if (!bypass_keystate
1544 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1545 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1546 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1622 break;
1549 1623
1550 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1562 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1638 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1566 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1567 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1568 { 1643 {
1569#endif
1570#if ISO_14755 1644#if ISO_14755
1571 // 5.4 1645 // 5.4
1572 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1573 { 1647 {
1574 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1580 1654
1581#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1658 {
1659 page_dirn scroll_selection_dir;
1585 int dist; 1660 int dist;
1586 1661
1587 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1589 */ 1664 */
… …
1604 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1605 } 1680 }
1606 else 1681 else
1607 { 1682 {
1608 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1610 } 1685 }
1611 1686
1612 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1689 + 1;
1615 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1616 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1617 } 1693 }
1618 else 1694 else
1619 { 1695 {
1620 /* we are within the text window, so we 1696 /* we are within the text window, so we
1621 * shouldn't be scrolling 1697 * shouldn't be scrolling
1622 */ 1698 */
1623 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1624 } 1700 }
1625#endif 1701#endif
1626#ifdef MOUSE_THRESHOLD
1627 } 1702 }
1628#endif
1629 } 1703 }
1630 } 1704 }
1631 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1632 { 1706 {
1633 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1634 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1635 ; 1709 ;
1636 1710
1637 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1638 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1640 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1715 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1717 scrollBar.size ());
1644 want_refresh = 1; 1718 want_refresh = 1;
1645 scrollbar_show (1); 1719 scrollBar.show (1);
1646 } 1720 }
1647 break; 1721 break;
1648 } 1722 }
1649 1723
1650#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1651 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1652 {
1653 if (hidden_cursor)
1654 {
1655 hidden_cursor = 0;
1656 want_refresh = 1;
1657 }
1658
1659 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1660 }
1661#endif 1727#endif
1662 1728
1663#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1664 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1665 { 1731 {
… …
1675#endif 1741#endif
1676 1742
1677 refresh_check (); 1743 refresh_check ();
1678} 1744}
1679 1745
1680void 1746#if ENABLE_FRILLS
1747void ecb_cold
1748rxvt_term::set_urgency (bool enable)
1749{
1750 if (enable == urgency_hint)
1751 return;
1752
1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1754 {
1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1756 XSetWMHints (dpy, parent, h);
1757 urgency_hint = enable;
1758 XFree (h);
1759 }
1760}
1761#endif
1762
1763void ecb_cold
1681rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1682{ 1765{
1683 if (!focus) 1766 if (!focus)
1684 { 1767 {
1685 focus = 1; 1768 focus = 1;
1686 want_refresh = 1; 1769 want_refresh = 1;
1687 1770
1688 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1689
1690#if USE_XIM 1771#if USE_XIM
1691 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1692 { 1773 {
1693 IMSetPosition (); 1774 im_set_position ();
1694 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1695 } 1776 }
1696#endif 1777#endif
1697#if CURSOR_BLINK 1778#if CURSOR_BLINK
1698 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
… …
1700#endif 1781#endif
1701#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1703 { 1784 {
1704 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1705 scr_recolour (); 1786 scr_recolor ();
1706 } 1787 }
1707#endif 1788#endif
1708#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1709 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1710 { 1791 set_urgency (0);
1711 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1712 {
1713 h->flags &= ~XUrgencyHint;
1714 XSetWMHints (dpy, parent[0], h);
1715 }
1716 }
1717#endif
1718 }
1719}
1720 1792
1721void 1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1795#endif
1796
1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1798 }
1799}
1800
1801void ecb_cold
1722rxvt_term::focus_out () 1802rxvt_term::focus_out ()
1723{ 1803{
1724 if (focus) 1804 if (focus)
1725 { 1805 {
1726 focus = 0; 1806 focus = 0;
1727 want_refresh = 1; 1807 want_refresh = 1;
1728 1808
1729 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1809#if ENABLE_FRILLS
1810 if (option (Opt_urgentOnBell))
1811 set_urgency (0);
1730 1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1815#endif
1731#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1732 if (iso14755buf) 1817 if (iso14755buf)
1733 { 1818 {
1734 iso14755buf = 0; 1819 iso14755buf = 0;
1735# if ISO_14755 1820# if ISO_14755
… …
1749#endif 1834#endif
1750#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1751 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1752 { 1837 {
1753 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1754 scr_recolour (); 1839 scr_recolor ();
1755 } 1840 }
1756#endif 1841#endif
1757 }
1758}
1759 1842
1760void 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1844 }
1845}
1846
1847void ecb_cold
1761rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1762{ 1849{
1763#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1764 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1765 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1766 rgba c; 1856 rgba c;
1767 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1768 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1769 } 1859 }
1770#endif 1860#endif
1771} 1861}
1772 1862
1773#if ENABLE_TRANSPARENCY || ENABLE_PERL 1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1774void 1864void ecb_hot
1775rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1776{ 1866{
1777 make_current (); 1867 make_current ();
1778 1868
1779 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1780 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1781 return; 1871 return;
1782 1872
1783# if ENABLE_TRANSPARENCY
1784 switch (ev.type) 1873 switch (ev.type)
1785 { 1874 {
1786 case PropertyNotify: 1875 case PropertyNotify:
1787 /* 1876 /*
1788 * if user used some Esetroot compatible prog to set the root bg, 1877 * if user used some Esetroot compatible prog to set the root bg,
1789 * use the property to determine the pixmap. We use it later on. 1878 * use the property to determine the pixmap. We use it later on.
1790 */ 1879 */
1791 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1792 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1793 { 1882 {
1794 bgPixmap.set_root_pixmap (); 1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1795 update_background (); 1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1796 } 1891 }
1892
1797 break; 1893 break;
1798 } 1894 }
1799# endif
1800 1895
1801 refresh_check (); 1896 refresh_check ();
1802} 1897}
1803#endif 1898#endif
1804 1899
… …
1827 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1828 return; 1923 return;
1829 } 1924 }
1830#endif 1925#endif
1831 1926
1832 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1833 1928
1834 if (reportmode) 1929 if (reportmode)
1835 { 1930 {
1836 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1837 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
1838 MEvent.state = ev.state; 1933 MEvent.state = ev.state;
1839#ifdef MOUSE_REPORT_DOUBLECLICK 1934#ifdef MOUSE_REPORT_DOUBLECLICK
1840 if (ev.button == MEvent.button && clickintime) 1935 if (ev.button == MEvent.button && clickintime)
1841 { 1936 {
1842 /* same button, within alloted time */ 1937 /* same button, within allowed time */
1843 MEvent.clicks++; 1938 MEvent.clicks++;
1844 1939
1845 if (MEvent.clicks > 1) 1940 if (MEvent.clicks > 1)
1846 { 1941 {
1847 /* only report double clicks */ 1942 /* only report double clicks */
… …
1919 } 2014 }
1920 2015
1921 /* 2016 /*
1922 * Scrollbar window processing of button press 2017 * Scrollbar window processing of button press
1923 */ 2018 */
1924 if (isScrollbarWindow (ev.window)) 2019 if (scrollBar.state && ev.window == scrollBar.win)
1925 { 2020 {
1926 scrollBar.setIdle (); 2021 page_dirn direction = NO_DIR;
2022
2023 if (scrollBar.upButton (ev.y))
2024 direction = UP; /* up */
2025 else if (scrollBar.dnButton (ev.y))
2026 direction = DN; /* down */
2027
2028 scrollBar.state = SB_STATE_IDLE;
1927 /* 2029 /*
1928 * Rxvt-style scrollbar: 2030 * Rxvt-style scrollbar:
1929 * move up if mouse is above slider 2031 * move up if mouse is above slider
1930 * move dn if mouse is below slider 2032 * move dn if mouse is below slider
1931 * 2033 *
… …
1940 /* 2042 /*
1941 * Mouse report disabled scrollbar: 2043 * Mouse report disabled scrollbar:
1942 * arrow buttons - send up/down 2044 * arrow buttons - send up/down
1943 * click on scrollbar - send pageup/down 2045 * click on scrollbar - send pageup/down
1944 */ 2046 */
1945 if ((scrollBar.style == R_SB_NEXT 2047 if (direction == UP)
1946 && scrollbarnext_upButton (ev.y))
1947 || (scrollBar.style == R_SB_RXVT
1948 && scrollbarrxvt_upButton (ev.y)))
1949 tt_printf ("\033[A"); 2048 tt_printf ("\033[A");
1950 else if ((scrollBar.style == R_SB_NEXT 2049 else if (direction == DN)
1951 && scrollbarnext_dnButton (ev.y))
1952 || (scrollBar.style == R_SB_RXVT
1953 && scrollbarrxvt_dnButton (ev.y)))
1954 tt_printf ("\033[B"); 2050 tt_printf ("\033[B");
1955 else 2051 else
1956 switch (ev.button) 2052 switch (ev.button)
1957 { 2053 {
1958 case Button2: 2054 case Button2:
… …
1966 break; 2062 break;
1967 } 2063 }
1968 } 2064 }
1969 else 2065 else
1970#endif /* NO_SCROLLBAR_REPORT */ 2066#endif /* NO_SCROLLBAR_REPORT */
1971
1972 {
1973 char upordown = 0;
1974
1975 if (scrollBar.style == R_SB_NEXT)
1976 { 2067 {
1977 if (scrollbarnext_upButton (ev.y)) 2068 if (direction != NO_DIR)
1978 upordown = -1; /* up */
1979 else if (scrollbarnext_dnButton (ev.y))
1980 upordown = 1; /* down */
1981 }
1982 else if (scrollBar.style == R_SB_RXVT)
1983 {
1984 if (scrollbarrxvt_upButton (ev.y))
1985 upordown = -1; /* up */
1986 else if (scrollbarrxvt_dnButton (ev.y))
1987 upordown = 1; /* down */
1988 }
1989
1990 if (upordown)
1991 { 2069 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1993 if (!cont_scroll_ev.is_active ()) 2071 if (!cont_scroll_ev.is_active ())
1994 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2072 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1995#endif 2073#endif
1996 if (scr_page (upordown < 0 ? UP : DN, 1)) 2074 if (scr_page (direction, 1))
1997 { 2075 {
1998 if (upordown < 0) 2076 if (direction == UP)
1999 scrollBar.setUp (); 2077 scrollBar.state = SB_STATE_UP;
2000 else 2078 else
2001 scrollBar.setDn (); 2079 scrollBar.state = SB_STATE_DOWN;
2002 } 2080 }
2003 } 2081 }
2004 else 2082 else
2005 switch (ev.button) 2083 switch (ev.button)
2006 { 2084 {
2007 case Button2: 2085 case Button2:
2008 switch (scrollbar_align) 2086 switch (scrollBar.align)
2009 { 2087 {
2010 case R_SB_ALIGN_TOP: 2088 case SB_ALIGN_TOP:
2011 csrO = 0; 2089 csrO = 0;
2012 break; 2090 break;
2013 case R_SB_ALIGN_CENTRE: 2091 case SB_ALIGN_CENTRE:
2014 csrO = (scrollBar.bot - scrollBar.top) / 2; 2092 csrO = (scrollBar.bot - scrollBar.top) / 2;
2015 break; 2093 break;
2016 case R_SB_ALIGN_BOTTOM: 2094 case SB_ALIGN_BOTTOM:
2017 csrO = scrollBar.bot - scrollBar.top; 2095 csrO = scrollBar.bot - scrollBar.top;
2018 break; 2096 break;
2019 } 2097 }
2020 2098
2021 if (scrollBar.style == R_SB_XTERM 2099 if (scrollBar.style == SB_STYLE_XTERM
2022 || scrollbar_above_slider (ev.y) 2100 || scrollBar.above_slider (ev.y)
2023 || scrollbar_below_slider (ev.y)) 2101 || scrollBar.below_slider (ev.y))
2024 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2102 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2025 2103
2026 scrollBar.setMotion (); 2104 scrollBar.state = SB_STATE_MOTION;
2027 break; 2105 break;
2028 2106
2029 case Button1: 2107 case Button1:
2030 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2108 if (scrollBar.align == SB_ALIGN_CENTRE)
2031 csrO = ev.y - scrollBar.top; 2109 csrO = ev.y - scrollBar.top;
2032 /* FALLTHROUGH */ 2110 /* FALLTHROUGH */
2033 2111
2034 case Button3: 2112 case Button3:
2035 if (scrollBar.style != R_SB_XTERM) 2113 if (scrollBar.style != SB_STYLE_XTERM)
2036 { 2114 {
2037 if (scrollbar_above_slider (ev.y)) 2115 if (scrollBar.above_slider (ev.y))
2038# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2039 scr_page (UP, nrow - 1); 2117 scr_page (UP, nrow - 1);
2040# else 2118# else
2041 scr_page (UP, nrow / 4); 2119 scr_page (UP, nrow / 4);
2042# endif 2120# endif
2043 else if (scrollbar_below_slider (ev.y)) 2121 else if (scrollBar.below_slider (ev.y))
2044# ifdef RXVT_SCROLL_FULL 2122# ifdef RXVT_SCROLL_FULL
2045 scr_page (DN, nrow - 1); 2123 scr_page (DN, nrow - 1);
2046# else 2124# else
2047 scr_page (DN, nrow / 4); 2125 scr_page (DN, nrow / 4);
2048# endif 2126# endif
2049 else 2127 else
2050 scrollBar.setMotion (); 2128 scrollBar.state = SB_STATE_MOTION;
2051 } 2129 }
2052 else 2130 else
2053 { 2131 {
2054 scr_page ((ev.button == Button1 ? DN : UP), 2132 scr_page ((ev.button == Button1 ? DN : UP),
2055 (nrow 2133 (nrow
2056 * scrollbar_position (ev.y) 2134 * scrollBar.position (ev.y)
2057 / scrollbar_size ())); 2135 / scrollBar.size ()));
2058 } 2136 }
2059 2137
2060 break; 2138 break;
2061 } 2139 }
2062 } 2140 }
… …
2072 2150
2073 csrO = 0; /* reset csr Offset */ 2151 csrO = 0; /* reset csr Offset */
2074 if (!bypass_keystate) 2152 if (!bypass_keystate)
2075 reportmode = !! (priv_modes & PrivMode_mouse_report); 2153 reportmode = !! (priv_modes & PrivMode_mouse_report);
2076 2154
2077 if (scrollbar_isUpDn ()) 2155 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2078 { 2156 {
2079 scrollBar.setIdle (); 2157 scrollBar.state = SB_STATE_IDLE;
2080 scrollbar_show (0); 2158 scrollBar.show (0);
2081 } 2159 }
2082 2160
2083#ifdef SELECTION_SCROLLING 2161#ifdef SELECTION_SCROLLING
2084 sel_scroll_ev.stop(); 2162 sel_scroll_ev.stop();
2085#endif 2163#endif
… …
2104#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2105 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2106 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2107 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2108 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2109 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2110 { 2188 {
2111 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2112 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2113 mouse_report (ev); 2191 mouse_report (ev);
2114 } 2192 }
… …
2134 case Button3: 2212 case Button3:
2135 selection_make (ev.time); 2213 selection_make (ev.time);
2136 break; 2214 break;
2137 2215
2138 case Button2: 2216 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2217 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2218 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2219 break;
2142 2220
2143#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2144 case Button4: 2222 case Button4:
2145 case Button5: 2223 case Button5:
2146 { 2224 {
2147 int i; 2225 int lines;
2148 page_dirn v; 2226 page_dirn dirn;
2149 2227
2150 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2151 2229
2152 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2153 i = 1; 2231 lines = 1;
2154 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2233 lines = nrow - 1;
2156 else 2234 else
2157 i = 5; 2235 lines = 5;
2158 2236
2159# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2160 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2161 { 2239 {
2162 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165 2242
2166 if (!slip_wheel_ev.is_active ()) 2243 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168 } 2245 }
2169 else 2246 else
2247# endif
2170 { 2248 {
2171# endif
2172 scr_page (v, i); 2249 scr_page (dirn, lines);
2173 scrollbar_show (1); 2250 scrollBar.show (1);
2174# ifdef MOUSE_SLIP_WHEELING
2175 } 2251 }
2176# endif
2177 } 2252 }
2178 break; 2253 break;
2179#endif 2254#endif
2180 } 2255 }
2181 } 2256 }
2182} 2257}
2183 2258
2184/*}}} */ 2259/*}}} */
2185 2260
2186bool 2261void ecb_hot
2187rxvt_term::cmd_parse () 2262rxvt_term::cmd_parse ()
2188{ 2263{
2189 bool flag = false;
2190 wchar_t ch = NOCHAR; 2264 wchar_t ch = NOCHAR;
2191 char *seq_begin; // remember start of esc-sequence here 2265 char *seq_begin; // remember start of esc-sequence here
2192 2266
2193 for (;;) 2267 for (;;)
2194 { 2268 {
2195 if (ch == NOCHAR) 2269 if (ecb_unlikely (ch == NOCHAR))
2196 { 2270 {
2197 seq_begin = cmdbuf_ptr; 2271 seq_begin = cmdbuf_ptr;
2198 ch = next_char (); 2272 ch = next_char ();
2199 2273
2200 if (ch == NOCHAR) 2274 if (ch == NOCHAR)
2201 break; 2275 break;
2202 } 2276 }
2203 2277
2204 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2278 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2205 { 2279 {
2206 if (!seen_input) 2280 if (ecb_unlikely (!seen_input))
2207 { 2281 {
2208 seen_input = 1; 2282 seen_input = 1;
2209 // many badly-written programs (e.g. jed) contain a race condition: 2283 // many badly-written programs (e.g. jed) contain a race condition:
2210 // they first read the screensize and then install a SIGWINCH handler. 2284 // they first read the screensize and then install a SIGWINCH handler.
2211 // some window managers resize the window early, and these programs 2285 // some window managers resize the window early, and these programs
… …
2224 wchar_t *str = buf; 2298 wchar_t *str = buf;
2225 wchar_t *eol = str + min (ncol, UBUFSIZ); 2299 wchar_t *eol = str + min (ncol, UBUFSIZ);
2226 2300
2227 for (;;) 2301 for (;;)
2228 { 2302 {
2229 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2303 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2230 break; 2304 break;
2231 2305
2232 *str++ = ch; 2306 *str++ = ch;
2233 2307
2234 if (ch == C0_LF || str >= eol) 2308 if (ecb_unlikely (ch == C0_LF || str >= eol))
2235 { 2309 {
2236 if (ch == C0_LF) 2310 if (ch == C0_LF)
2237 nlines++; 2311 nlines++;
2238 2312
2239 refresh_count++; 2313 refresh_count++;
… …
2288 * What the heck we'll cheat and only refresh less than every page-full. 2362 * What the heck we'll cheat and only refresh less than every page-full.
2289 * if skipScroll is enabled. 2363 * if skipScroll is enabled.
2290 */ 2364 */
2291 if (refreshnow) 2365 if (refreshnow)
2292 { 2366 {
2293 flag = true;
2294 scr_refresh (); 2367 scr_refresh ();
2295 want_refresh = 1; 2368 want_refresh = 1;
2296 } 2369 }
2297
2298 } 2370 }
2299 else 2371 else
2300 { 2372 {
2301 try 2373 try
2302 { 2374 {
… …
2310 } 2382 }
2311 2383
2312 ch = NOCHAR; 2384 ch = NOCHAR;
2313 } 2385 }
2314 } 2386 }
2315
2316 refresh_check ();
2317
2318 return flag;
2319} 2387}
2320 2388
2321// read the next character 2389// read the next character
2322wchar_t 2390wchar_t ecb_hot
2323rxvt_term::next_char () NOTHROW 2391rxvt_term::next_char () NOTHROW
2324{ 2392{
2325 while (cmdbuf_ptr < cmdbuf_endp) 2393 while (cmdbuf_ptr < cmdbuf_endp)
2326 { 2394 {
2327 // assume 7-bit to be ascii ALWAYS 2395 // assume 7-bit to be ascii ALWAYS
2328 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2329 return *cmdbuf_ptr++; 2397 return *cmdbuf_ptr++;
2330 2398
2331 wchar_t wc; 2399 wchar_t wc;
2332 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2333 2401
… …
2337 cmdbuf_ptr = cmdbuf_endp; 2405 cmdbuf_ptr = cmdbuf_endp;
2338 break; 2406 break;
2339 } 2407 }
2340 2408
2341 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2410 {
2411 mbstate.reset (); // reset now undefined conversion state
2412 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2413 // 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 2414 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2415 }
2343 2416
2344 // assume wchar == unicode 2417 // assume wchar == unicode
2345 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
2346 return wc & UNICODE_MASK; 2419 return wc & UNICODE_MASK;
2347 } 2420 }
2348 2421
2349 return NOCHAR; 2422 return NOCHAR;
2350} 2423}
2351 2424
2352// read the next octet 2425// read the next octet
2353uint32_t 2426uint32_t ecb_hot
2354rxvt_term::next_octet () NOTHROW 2427rxvt_term::next_octet () NOTHROW
2355{ 2428{
2356 return cmdbuf_ptr < cmdbuf_endp 2429 return cmdbuf_ptr < cmdbuf_endp
2357 ? (unsigned char)*cmdbuf_ptr++ 2430 ? (unsigned char)*cmdbuf_ptr++
2358 : NOCHAR; 2431 : NOCHAR;
2359} 2432}
2360 2433
2361static class out_of_input out_of_input; 2434static class out_of_input out_of_input;
2362 2435
2363/* rxvt_cmd_getc () - Return next input character */ 2436wchar_t ecb_hot
2364/*
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)) 2437rxvt_term::cmd_getc () THROW ((class out_of_input))
2370{ 2438{
2371 wchar_t c = next_char (); 2439 wchar_t c = next_char ();
2372 2440
2373 if (c == NOCHAR) 2441 if (c == NOCHAR)
2374 throw out_of_input; 2442 throw out_of_input;
2375 2443
2376 return c; 2444 return c;
2377} 2445}
2378 2446
2379uint32_t 2447uint32_t ecb_hot
2380rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2448rxvt_term::cmd_get8 () THROW ((class out_of_input))
2381{ 2449{
2382 uint32_t c = next_octet (); 2450 uint32_t c = next_octet ();
2383 2451
2384 if (c == NOCHAR) 2452 if (c == NOCHAR)
… …
2388} 2456}
2389 2457
2390/*{{{ print pipe */ 2458/*{{{ print pipe */
2391/*----------------------------------------------------------------------*/ 2459/*----------------------------------------------------------------------*/
2392#ifdef PRINTPIPE 2460#ifdef PRINTPIPE
2393FILE * 2461FILE * ecb_cold
2394rxvt_term::popen_printer () 2462rxvt_term::popen_printer ()
2395{ 2463{
2396 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2464 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2397 2465
2398 if (stream == NULL) 2466 if (stream == NULL)
2399 rxvt_warn ("can't open printer pipe, not printing.\n"); 2467 rxvt_warn ("can't open printer pipe, not printing.\n");
2400 2468
2401 return stream; 2469 return stream;
2402} 2470}
2403 2471
2404int 2472int ecb_cold
2405rxvt_term::pclose_printer (FILE *stream) 2473rxvt_term::pclose_printer (FILE *stream)
2406{ 2474{
2407 fflush (stream); 2475 fflush (stream);
2408 return pclose (stream); 2476 return pclose (stream);
2409} 2477}
2410 2478
2411/* 2479/*
2412 * simulate attached vt100 printer 2480 * simulate attached vt100 printer
2413 */ 2481 */
2414void 2482void ecb_cold
2415rxvt_term::process_print_pipe () 2483rxvt_term::process_print_pipe ()
2416{ 2484{
2417 int done; 2485 FILE *fd = popen_printer ();
2418 FILE *fd;
2419 2486
2420 if ((fd = popen_printer ()) == NULL) 2487 if (!fd)
2421 return; 2488 return;
2422 2489
2423 /* 2490 /*
2424 * Send all input to the printer until either ESC[4i or ESC[?4i 2491 * Send all input to the printer until either ESC[4i or ESC[?4i
2425 * is received. 2492 * is received.
2426 */ 2493 */
2427 for (done = 0; !done;) 2494 for (int done = 0; !done; )
2428 { 2495 {
2429 unsigned char buf[8]; 2496 unsigned char buf[8];
2430 unicode_t ch; 2497 unicode_t ch;
2431 unsigned int i, len; 2498 unsigned int i, len;
2432 2499
… …
2466 pclose_printer (fd); 2533 pclose_printer (fd);
2467} 2534}
2468#endif /* PRINTPIPE */ 2535#endif /* PRINTPIPE */
2469/*}}} */ 2536/*}}} */
2470 2537
2471/* *INDENT-OFF* */
2472enum { 2538enum {
2473 C1_40 = 0x40, 2539 C1_40 = 0x40,
2474 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2540 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, 2541 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, 2542 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, 2543 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2478}; 2544};
2479/* *INDENT-ON* */
2480 2545
2481/*{{{ process non-printing single characters */ 2546/*{{{ process non-printing single characters */
2482void 2547void ecb_hot
2483rxvt_term::process_nonprinting (unicode_t ch) 2548rxvt_term::process_nonprinting (unicode_t ch)
2484{ 2549{
2485 switch (ch) 2550 switch (ch)
2486 { 2551 {
2487 case C0_ESC: 2552 case C0_ESC:
… …
2517 scr_charset_choose (0); 2582 scr_charset_choose (0);
2518 break; 2583 break;
2519 2584
2520#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2521 // 8-bit controls 2586 // 8-bit controls
2522 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2523 process_dcs_seq (); 2588 process_dcs_seq ();
2524 break; 2589 break;
2525 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2526 process_csi_seq (); 2591 process_csi_seq ();
2527 break; 2592 break;
2528 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2529 process_osc_seq (); 2594 process_osc_seq ();
2530 break; 2595 break;
2531#endif 2596#endif
2532 } 2597 }
2533} 2598}
2534/*}}} */ 2599/*}}} */
2535 2600
2536 2601
2537/*{{{ process VT52 escape sequences */ 2602/*{{{ process VT52 escape sequences */
2538void 2603void ecb_cold
2539rxvt_term::process_escape_vt52 (unicode_t ch) 2604rxvt_term::process_escape_vt52 (unicode_t ch)
2540{ 2605{
2541 int row, col; 2606 int row, col;
2542 2607
2543 switch (ch) 2608 switch (ch)
… …
2577 break; 2642 break;
2578 case 'Z': /* identify the terminal type */ 2643 case 'Z': /* identify the terminal type */
2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2644 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580 break; 2645 break;
2581 case '<': /* turn off VT52 mode */ 2646 case '<': /* turn off VT52 mode */
2582 PrivMode (0, PrivMode_vt52); 2647 priv_modes &= ~PrivMode_vt52;
2583 break; 2648 break;
2584 case 'F': /* use special graphics character set */ 2649 case 'F': /* use special graphics character set */
2585 case 'G': /* use regular character set */ 2650 case 'G': /* use regular character set */
2586 /* unimplemented */ 2651 /* unimplemented */
2587 break; 2652 break;
… …
2593} 2658}
2594/*}}} */ 2659/*}}} */
2595 2660
2596 2661
2597/*{{{ process escape sequences */ 2662/*{{{ process escape sequences */
2598void 2663void ecb_hot
2599rxvt_term::process_escape_seq () 2664rxvt_term::process_escape_seq ()
2600{ 2665{
2601 unicode_t ch = cmd_getc (); 2666 unicode_t ch = cmd_getc ();
2602 2667
2603 if (priv_modes & PrivMode_vt52) 2668 if (priv_modes & PrivMode_vt52)
… …
2606 return; 2671 return;
2607 } 2672 }
2608 2673
2609 switch (ch) 2674 switch (ch)
2610 { 2675 {
2611 /* case 1: do_tek_mode (); break; */
2612 case '#': 2676 case '#':
2613 if (cmd_getc () == '8') 2677 if (cmd_getc () == '8')
2614 scr_E (); 2678 scr_E ();
2615 break; 2679 break;
2616 case '(': 2680 case '(':
… …
2639#if !ENABLE_MINIMAL 2703#if !ENABLE_MINIMAL
2640 case '9': 2704 case '9':
2641 scr_forwardindex (); 2705 scr_forwardindex ();
2642 break; 2706 break;
2643#endif 2707#endif
2708 // DECPAM/DECPNM
2644 case '=': 2709 case '=':
2710 priv_modes |= PrivMode_aplKP;
2711 break;
2645 case '>': 2712 case '>':
2646 PrivMode ((ch == '='), PrivMode_aplKP); 2713 priv_modes &= ~PrivMode_aplKP;
2647 break; 2714 break;
2648 2715
2649 case C1_40: 2716 case C1_40:
2650 cmd_getc (); 2717 cmd_getc ();
2651 break; 2718 break;
… …
2655 2722
2656 /* 8.3.87: NEXT LINE */ 2723 /* 8.3.87: NEXT LINE */
2657 case C1_NEL: /* ESC E */ 2724 case C1_NEL: /* ESC E */
2658 { 2725 {
2659 wchar_t nlcr[] = { C0_LF, C0_CR }; 2726 wchar_t nlcr[] = { C0_LF, C0_CR };
2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2661 } 2728 }
2662 break; 2729 break;
2663 2730
2664 /* kidnapped escape sequence: Should be 8.3.48 */ 2731 /* kidnapped escape sequence: Should be 8.3.48 */
2665 case C1_ESA: /* ESC G */ 2732 case C1_ESA: /* ESC G */
2666 process_graphics (); 2733 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q')
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2667 break; 2736 break;
2668 2737
2669 /* 8.3.63: CHARACTER TABULATION SET */ 2738 /* 8.3.63: CHARACTER TABULATION SET */
2670 case C1_HTS: /* ESC H */ 2739 case C1_HTS: /* ESC H */
2671 scr_set_tab (1); 2740 scr_set_tab (1);
… …
2675 case C1_RI: /* ESC M */ 2744 case C1_RI: /* ESC M */
2676 scr_index (DN); 2745 scr_index (DN);
2677 break; 2746 break;
2678 2747
2679 /* 8.3.142: SINGLE-SHIFT TWO */ 2748 /* 8.3.142: SINGLE-SHIFT TWO */
2680 /*case C1_SS2: scr_single_shift (2); break; */ 2749 /* case C1_SS2: break; */
2681 2750
2682 /* 8.3.143: SINGLE-SHIFT THREE */ 2751 /* 8.3.143: SINGLE-SHIFT THREE */
2683 /*case C1_SS3: scr_single_shift (3); break; */ 2752 /* case C1_SS3: break; */
2684 2753
2685 /* 8.3.27: DEVICE CONTROL STRING */ 2754 /* 8.3.27: DEVICE CONTROL STRING */
2686 case C1_DCS: /* ESC P */ 2755 case C1_DCS: /* ESC P */
2687 process_dcs_seq (); 2756 process_dcs_seq ();
2688 break; 2757 break;
… …
2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2759 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2691 case C1_SCI: /* ESC Z */ 2760 case C1_SCI: /* ESC Z */
2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2761 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2693 break; /* steal obsolete ESC [ c */ 2762 break; /* steal obsolete ESC [ c */
2694 2763
2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2764 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2696 case C1_CSI: /* ESC [ */ 2765 case C1_CSI: /* ESC [ */
2697 process_csi_seq (); 2766 process_csi_seq ();
2698 break; 2767 break;
2699 2768
2700 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2769 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2701 case C1_OSC: /* ESC ] */ 2770 case C1_OSC: /* ESC ] */
2702 process_osc_seq (); 2771 process_osc_seq ();
2703 break; 2772 break;
2704 2773
2705 /* 8.3.106: RESET TO INITIAL STATE */ 2774 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2706 case 'c': 2775 case 'c':
2707 mbstate.reset (); 2776 mbstate.reset ();
2708 scr_poweron (); 2777 scr_poweron ();
2709 scrollbar_show (1); 2778 scrollBar.show (1);
2710 break; 2779 break;
2711 2780
2712 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2781 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2713 case 'n': 2782 case 'n':
2714 scr_charset_choose (2); 2783 scr_charset_choose (2);
… …
2721 } 2790 }
2722} 2791}
2723/*}}} */ 2792/*}}} */
2724 2793
2725/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2794/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2726/* *INDENT-OFF* */
2727enum { 2795enum {
2728 CSI_ICH = 0x40, 2796 CSI_ICH = 0x40,
2729 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2797 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 , 2798 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, 2799 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, 2802 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 , 2803 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 2804 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2737}; 2805};
2738 2806
2739#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2807#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2740 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2808 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2741 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2809 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2742#define get_byte_array_bit(array, bit) \ 2810#define get_byte_array_bit(array, bit) \
2743 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2811 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2744 2812
2745const unsigned char csi_defaults[] = 2813static const unsigned char csi_defaults[] =
2746 { 2814 {
2747 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2815 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, */ 2816 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, */ 2817 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, [, \, ], ^, _, */ 2818 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, */ 2819 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, */ 2820 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, */ 2821 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, {, |, }, ~, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2755 }; 2823 };
2756/* *INDENT-ON* */
2757 2824
2758void 2825void ecb_hot
2759rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2760{ 2827{
2761 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2762 unsigned int nargs, p; 2829 unsigned int nargs, p;
2763 int n, ndef; 2830 int n, ndef;
2764 int arg[ESC_ARGS] = { }; 2831 int arg[ESC_ARGS] = { };
2765 2832
2766 nargs = 0; 2833 nargs = 0;
2767 2834
2768 priv = 0; 2835 priv = 0;
2769 ch = cmd_getc (); 2836 ch = cmd_getc ();
2770 if (ch >= '<' && ch <= '?') 2837 if ((ch >= '<' && ch <= '?') || ch == '!')
2771 { 2838 {
2772 /* '<' '=' '>' '?' */ 2839 /* '<' '=' '>' '?' '!' */
2773 priv = ch; 2840 priv = ch;
2774 ch = cmd_getc (); 2841 ch = cmd_getc ();
2775 } 2842 }
2776 2843
2844 prev_ch = 0;
2777 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2778 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2779 { 2847 {
2780 if (isdigit (ch)) 2848 if (isdigit (ch))
2781 { 2849 {
… …
2791 n = -1; 2859 n = -1;
2792 } 2860 }
2793 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2794 process_nonprinting (ch); 2862 process_nonprinting (ch);
2795 2863
2864 prev_ch = ch;
2796 ch = cmd_getc (); 2865 ch = cmd_getc ();
2797 } 2866 }
2798 2867
2799 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2800 return; 2869 return;
… …
2826 // versions. 2895 // versions.
2827 // 2896 //
2828 tt_printf ("\033[>%d;95;0c", 'U'); 2897 tt_printf ("\033[>%d;95;0c", 'U');
2829 } 2898 }
2830 break; 2899 break;
2900
2831 case '?': 2901 case '?':
2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2902 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2833 process_terminal_mode (ch, priv, nargs, arg); 2903 process_terminal_mode (ch, priv, nargs, arg);
2834 break; 2904 break;
2905
2906 case '!':
2907 if (ch == CSI_70)
2908 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset ();
2911
2912 static const int pm_h[] = { 7, 25 };
2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2914
2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2835 } 2917 }
2918 break;
2919 }
2920
2836 return; 2921 return;
2837 } 2922 }
2838 2923
2839 switch (ch) 2924 switch (ch)
2840 { 2925 {
… …
2854 } 2939 }
2855 break; 2940 break;
2856#endif 2941#endif
2857 2942
2858 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2943 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2859 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2944 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2860 arg[0] = -arg[0]; 2945 arg[0] = -arg[0];
2861 /* FALLTHROUGH */ 2946 /* FALLTHROUGH */
2862 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2947 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2863 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2864 scr_gotorc (arg[0], 0, RELATIVE); 2949 scr_gotorc (arg[0], 0, RELATIVE);
2865 break; 2950 break;
2866 2951
2867 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2868 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3018 scr_insert_mode (1); 3103 scr_insert_mode (1);
3019 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3020 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3021 break; 3106 break;
3022 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3023 /* 3113 /*
3024 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3025 */ 3115 */
3026 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3027 if (nargs == 1) 3117 if (nargs == 1)
… …
3055 } 3145 }
3056} 3146}
3057/*}}} */ 3147/*}}} */
3058 3148
3059#if !ENABLE_MINIMAL 3149#if !ENABLE_MINIMAL
3060/* ARGSUSED */
3061void 3150void
3062rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3151rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3063{ 3152{
3064 int x, y; 3153 int x, y;
3065 XWindowAttributes wattr; 3154 XWindowAttributes wattr;
… …
3074 { 3163 {
3075 /* 3164 /*
3076 * commands 3165 * commands
3077 */ 3166 */
3078 case 1: /* deiconify window */ 3167 case 1: /* deiconify window */
3079 XMapWindow (dpy, parent[0]); 3168 XMapWindow (dpy, parent);
3080 break; 3169 break;
3081 case 2: /* iconify window */ 3170 case 2: /* iconify window */
3082 XIconifyWindow (dpy, parent[0], display->screen); 3171 XIconifyWindow (dpy, parent, display->screen);
3083 break; 3172 break;
3084 case 3: /* set position (pixels) */ 3173 case 3: /* set position (pixels) */
3085 XMoveWindow (dpy, parent[0], args[1], args[2]); 3174 XMoveWindow (dpy, parent, args[1], args[2]);
3086 break; 3175 break;
3087 case 4: /* set size (pixels) */ 3176 case 4: /* set size (pixels) */
3088 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3177 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3089 break; 3178 break;
3090 case 5: /* raise window */ 3179 case 5: /* raise window */
3091 XRaiseWindow (dpy, parent[0]); 3180 XRaiseWindow (dpy, parent);
3092 break; 3181 break;
3093 case 6: /* lower window */ 3182 case 6: /* lower window */
3094 XLowerWindow (dpy, parent[0]); 3183 XLowerWindow (dpy, parent);
3095 break; 3184 break;
3096 case 7: /* refresh window */ 3185 case 7: /* refresh window */
3097 scr_touch (true); 3186 scr_touch (true);
3098 break; 3187 break;
3099 case 8: /* set size (chars) */ 3188 case 8: /* set size (chars) */
… …
3102 break; 3191 break;
3103 3192
3104 //case 9: NYI, TODO, restore maximized window or maximize window 3193 //case 9: NYI, TODO, restore maximized window or maximize window
3105 default: 3194 default:
3106 if (args[0] >= 24) /* set height (chars) */ 3195 if (args[0] >= 24) /* set height (chars) */
3107 set_widthheight ((unsigned int)width, 3196 set_widthheight ((unsigned int)vt_width,
3108 (unsigned int) (args[1] * fheight)); 3197 (unsigned int) (args[1] * fheight));
3109 break; 3198 break;
3110 3199
3111 /* 3200 /*
3112 * reports - some output format copied from XTerm 3201 * reports - some output format copied from XTerm
3113 */ 3202 */
3114 case 11: /* report window state */ 3203 case 11: /* report window state */
3115 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3116 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3205 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3117 break; 3206 break;
3118 case 13: /* report window position */ 3207 case 13: /* report window position */
3119 XGetWindowAttributes (dpy, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3120 XTranslateCoordinates (dpy, parent[0], wattr.root, 3209 XTranslateCoordinates (dpy, parent, wattr.root,
3121 -wattr.border_width, -wattr.border_width, 3210 -wattr.border_width, -wattr.border_width,
3122 &x, &y, &wdummy); 3211 &x, &y, &wdummy);
3123 tt_printf ("\033[3;%d;%dt", x, y); 3212 tt_printf ("\033[3;%d;%dt", x, y);
3124 break; 3213 break;
3125 case 14: /* report window size (pixels) */ 3214 case 14: /* report window size (pixels) */
3126 XGetWindowAttributes (dpy, parent[0], &wattr); 3215 XGetWindowAttributes (dpy, parent, &wattr);
3127 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3216 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3128 break; 3217 break;
3129 case 18: /* report text area size (chars) */ 3218 case 18: /* report text area size (chars) */
3130 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3219 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3131 break; 3220 break;
… …
3133 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3222 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3134 break; 3223 break;
3135 case 20: /* report icon label */ 3224 case 20: /* report icon label */
3136 { 3225 {
3137 char *s; 3226 char *s;
3138 XGetIconName (dpy, parent[0], &s); 3227 XGetIconName (dpy, parent, &s);
3139 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3228 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3140 XFree (s); 3229 XFree (s);
3141 } 3230 }
3142 break; 3231 break;
3143 case 21: /* report window title */ 3232 case 21: /* report window title */
3144 { 3233 {
3145 char *s; 3234 char *s;
3146 XFetchName (dpy, parent[0], &s); 3235 XFetchName (dpy, parent, &s);
3147 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3236 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3148 XFree (s); 3237 XFree (s);
3149 } 3238 }
3150 break; 3239 break;
3151 } 3240 }
… …
3161rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3162{ 3251{
3163 unicode_t ch; 3252 unicode_t ch;
3164 bool seen_esc = false; 3253 bool seen_esc = false;
3165 unsigned int n = 0; 3254 unsigned int n = 0;
3166 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3167 3256
3168 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3169 { 3258 {
3170 if (seen_esc) 3259 if (seen_esc)
3171 { 3260 {
… …
3186 else if (ch < 0x20) 3275 else if (ch < 0x20)
3187 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3188 3277
3189 seen_esc = false; 3278 seen_esc = false;
3190 3279
3191 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3192 // stop at some sane length 3281 // stop at some sane length
3193 return NULL; 3282 return NULL;
3194 3283
3195 string[n++] = ch; 3284 string[n++] = ch;
3196 } 3285 }
… …
3207 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3296 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3208 */ 3297 */
3209void 3298void
3210rxvt_term::process_dcs_seq () 3299rxvt_term::process_dcs_seq ()
3211{ 3300{
3212 char *s;
3213 unicode_t eh;
3214
3215 /* 3301 /*
3216 * Not handled yet 3302 * Not handled yet
3217 */ 3303 */
3304
3305 unicode_t eh;
3218 s = get_to_st (eh); 3306 char *s = get_to_st (eh);
3219 if (s) 3307 if (s)
3220 free (s); 3308 free (s);
3221 3309
3222 return; 3310 return;
3223} 3311}
… …
3227 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3315 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3228 */ 3316 */
3229void 3317void
3230rxvt_term::process_osc_seq () 3318rxvt_term::process_osc_seq ()
3231{ 3319{
3232 unicode_t ch, eh;
3233 int arg; 3320 int arg;
3234 3321
3235 ch = cmd_getc (); 3322 unicode_t ch = cmd_getc ();
3236 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3323 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3237 arg = arg * 10 + (ch - '0'); 3324 arg = arg * 10 + (ch - '0');
3238 3325
3239 if (ch == ';') 3326 if (ch == ';')
3240 { 3327 {
3328 unicode_t eh;
3241 char *s = get_to_st (eh); 3329 char *s = get_to_st (eh);
3242 3330
3243 if (s) 3331 if (s)
3244 { 3332 {
3245 process_xterm_seq (arg, s, eh); 3333 process_xterm_seq (arg, s, eh);
3246 free (s); 3334 free (s);
3247 } 3335 }
3248 } 3336 }
3249} 3337}
3250 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363
3364 unsigned int color = (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3366 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3367 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369
3370 if (rgb24_color[idx] == color)
3371 return idx + minTermCOLOR24;
3372
3373 /* we allow one of the 6 directly neighbouring colours */
3374 /* to replace the current color, if they not used recently */
3375 static const signed char dxyz[][3] = {
3376 0, 0, 0,
3377 0, 0, +1,
3378 0, 0, -1,
3379 0, +1, 0,
3380 0, -1, 0,
3381 +1, 0, 0,
3382 -1, 0, 0,
3383 };
3384
3385 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3386 {
3387 int r = idx_r + dxyz[n][0];
3388 int g = idx_r + dxyz[n][1];
3389 int b = idx_r + dxyz[n][2];
3390
3391 if (!IN_RANGE_EXC (r, 0, Red_levels))
3392 continue;
3393
3394 if (!IN_RANGE_EXC (g, 0, Green_levels))
3395 continue;
3396
3397 if (!IN_RANGE_EXC (b, 0, Blue_levels))
3398 continue;
3399
3400 unsigned int index = colorcube_index (r, g, b);
3401
3402 // minor issue: could update index 0 few more times
3403 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3404 {
3405 idx = index;
3406 goto update;
3407 }
3408
3409 if (rgb24_color[index] == color)
3410 return index + minTermCOLOR24;
3411
3412 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3413 // but also handles wrap around values good enough
3414 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3415 idx = index;
3416 }
3417
3418update:
3419 rgb24_color[idx] = color;
3420 rgb24_seqno[idx] = ++rgb24_sequence;
3421
3422 idx += minTermCOLOR24;
3423 pix_colors_focused [idx].free (this);
3424 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101));
3425 update_fade_color (idx, false);
3426
3427 return idx;
3428}
3429
3251void 3430void
3252rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3431rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3253{ 3432{
3254 if (str[0] == '?' && !str[1]) 3433 if (str[0] == '?' && !str[1])
3255 { 3434 {
3256 rgba c; 3435 rgba c;
3257 pix_colors_focused[color].get (c); 3436 pix_colors_focused[color].get (c);
3258 3437
3259#if XFT 3438#if XFT
3260 if (c.a != rgba::MAX_CC) 3439 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); 3440 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3262 else 3441 else
3263#endif 3442#endif
3264 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3443 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3265 } 3444 }
3266 else 3445 else
… …
3269 3448
3270/* 3449/*
3271 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3450 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3272 */ 3451 */
3273void 3452void
3274rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3453rxvt_term::process_xterm_seq (int op, char *str, char resp)
3275{ 3454{
3276 int color; 3455 int color;
3277 char *buf, *name; 3456 char *buf, *name;
3278 bool query = str[0] == '?' && !str[1]; 3457 bool query = str[0] == '?' && !str[1];
3279 int saveop = op; 3458 int saveop = op;
… …
3306 unsigned long bytes_after; 3485 unsigned long bytes_after;
3307 unsigned char *value = 0; 3486 unsigned char *value = 0;
3308 const char *str = ""; 3487 const char *str = "";
3309 3488
3310 if (prop 3489 if (prop
3311 && XGetWindowProperty (dpy, parent[0], 3490 && XGetWindowProperty (dpy, parent,
3312 prop, 0, 1<<16, 0, AnyPropertyType, 3491 prop, 0, 1<<16, 0, AnyPropertyType,
3313 &actual_type, &actual_format, 3492 &actual_type, &actual_format,
3314 &nitems, &bytes_after, &value) == Success 3493 &nitems, &bytes_after, &value) == Success
3315 && actual_type != None 3494 && actual_type != None
3316 && actual_format == 8) 3495 && actual_format == 8)
3317 str = (const char *)(value); 3496 str = (const char *)(value);
3318 3497
3319 tt_printf ("\033]%d;%s%c", op, str, resp); 3498 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3320 3499
3321 XFree (value); 3500 XFree (value);
3322 } 3501 }
3323 else 3502 else
3324 { 3503 {
3325 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3504 char *eq = strchr (str, '=');
3326 3505
3327 if (eq) 3506 if (eq)
3328 { 3507 {
3329 *eq = 0; 3508 *eq = 0;
3330 set_utf8_property (display->atom (str), eq + 1); 3509 set_utf8_property (display->atom (str), eq + 1);
3331 } 3510 }
3332 else 3511 else
3333 XDeleteProperty (dpy, parent[0], 3512 XDeleteProperty (dpy, parent,
3334 display->atom (str)); 3513 display->atom (str));
3335 } 3514 }
3336 break; 3515 break;
3337 3516
3338 case XTerm_Color: 3517 case XTerm_Color:
… …
3351 *buf++ = '\0'; 3530 *buf++ = '\0';
3352 3531
3353 process_color_seq (op, color, name, resp); 3532 process_color_seq (op, color, name, resp);
3354 } 3533 }
3355 break; 3534 break;
3535 case Rxvt_restoreFG:
3356 case XTerm_Color00: 3536 case XTerm_Color00:
3357 process_color_seq (op, Color_fg, str, resp); 3537 process_color_seq (op, Color_fg, str, resp);
3358 break; 3538 break;
3539 case Rxvt_restoreBG:
3359 case XTerm_Color01: 3540 case XTerm_Color01:
3360 process_color_seq (op, Color_bg, str, resp); 3541 process_color_seq (op, Color_bg, str, resp);
3361 break; 3542 break;
3362#ifndef NO_CURSORCOLOR 3543#ifndef NO_CURSORCOLOR
3363 case XTerm_Color_cursor: 3544 case XTerm_Color_cursor:
… …
3368 process_color_seq (op, Color_pointer_fg, str, resp); 3549 process_color_seq (op, Color_pointer_fg, str, resp);
3369 break; 3550 break;
3370 case XTerm_Color_pointer_bg: 3551 case XTerm_Color_pointer_bg:
3371 process_color_seq (op, Color_pointer_bg, str, resp); 3552 process_color_seq (op, Color_pointer_bg, str, resp);
3372 break; 3553 break;
3554#ifdef OPTION_HC
3555 case XTerm_Color_HC:
3556 process_color_seq (op, Color_HC, str, resp);
3557 break;
3558 case XTerm_Color_HTC:
3559 process_color_seq (op, Color_HTC, str, resp);
3560 break;
3561#endif
3373#ifndef NO_BOLD_UNDERLINE_REVERSE 3562#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: 3563 case URxvt_Color_BD:
3379 process_color_seq (op, Color_BD, str, resp); 3564 process_color_seq (op, Color_BD, str, resp);
3380 break; 3565 break;
3381 case Rxvt_Color_UL:
3382 case URxvt_Color_UL: 3566 case URxvt_Color_UL:
3383 process_color_seq (op, Color_UL, str, resp); 3567 process_color_seq (op, Color_UL, str, resp);
3384 break; 3568 break;
3385 case URxvt_Color_IT: 3569 case URxvt_Color_IT:
3386 process_color_seq (op, Color_IT, str, resp); 3570 process_color_seq (op, Color_IT, str, resp);
3387 break; 3571 break;
3388#endif 3572#endif
3389#if ENABLE_TRANSPARENCY 3573 case URxvt_Color_border:
3574 process_color_seq (op, Color_border, str, resp);
3575 break;
3576
3577#if BG_IMAGE_FROM_ROOT
3390 case URxvt_Color_tint: 3578 case URxvt_Color_tint:
3391 process_color_seq (op, Color_tint, str, resp); 3579 process_color_seq (op, Color_tint, str, resp);
3392 { 3580 {
3393 bool changed = false; 3581 bool changed = false;
3582
3394 if (ISSET_PIXCOLOR (Color_tint)) 3583 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3584 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3396 else 3585
3397 changed = bgPixmap.unset_tint ();
3398 if (changed) 3586 if (changed)
3399 update_background (); 3587 update_background ();
3400 } 3588 }
3401 3589
3402 break; 3590 break;
… …
3405#if BG_IMAGE_FROM_FILE 3593#if BG_IMAGE_FROM_FILE
3406 case Rxvt_Pixmap: 3594 case Rxvt_Pixmap:
3407 if (!strcmp (str, "?")) 3595 if (!strcmp (str, "?"))
3408 { 3596 {
3409 char str[256]; 3597 char str[256];
3598 int h_scale = fimage.h_scale;
3599 int v_scale = fimage.v_scale;
3600 int h_align = fimage.h_align;
3601 int v_align = fimage.v_align;
3410 3602
3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3603 sprintf (str, "[%dx%d+%d+%d]",
3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3604 h_scale, v_scale,
3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3605 h_align, v_align);
3414 process_xterm_seq (XTerm_title, str, CHAR_ST); 3606 process_xterm_seq (XTerm_title, str, CHAR_ST);
3415 } 3607 }
3416 else 3608 else
3417 { 3609 {
3418 int changed = 0; 3610 bool changed = false;
3419 3611
3420 if (*str != ';') 3612 if (*str != ';')
3421 { 3613 {
3422 /* reset to default scaling :*/ 3614 try
3423 bgPixmap.unset_geometry (); 3615 {
3424 if (bgPixmap.set_file (str)) /* change pixmap */ 3616 fimage.set_file_geometry (this, str);
3425 changed++; 3617 changed = true;
3426 str = strchr (str, ';'); 3618 }
3427 if (str == NULL) 3619 catch (const class rxvt_failure_exception &e)
3428 bgPixmap.set_defaultGeometry (); 3620 {
3621 }
3429 } 3622 }
3430 while (str) 3623 else
3431 { 3624 {
3432 str++; 3625 str++;
3433 if (bgPixmap.set_geometry (str)) 3626 if (fimage.set_geometry (str, true))
3434 changed++; 3627 changed = true;
3435 str = strchr (str, ';');
3436 } 3628 }
3629
3437 if (changed) 3630 if (changed)
3631 {
3632 if (bg_window_position_sensitive ())
3633 {
3634 int x, y;
3635 get_window_origin (x, y);
3636 parent_x = x;
3637 parent_y = y;
3638 }
3438 update_background (); 3639 update_background ();
3640 }
3439 } 3641 }
3440 break; 3642 break;
3441#endif 3643#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;
3449 3644
3450 case XTerm_logfile: 3645 case XTerm_logfile:
3451 // TODO, when secure mode? 3646 // TODO, when secure mode?
3452 break; 3647 break;
3453 3648
… …
3520 break; 3715 break;
3521#endif 3716#endif
3522 3717
3523#if ENABLE_PERL 3718#if ENABLE_PERL
3524 case URxvt_perl: 3719 case URxvt_perl:
3525 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3720 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3526 ; // no responses yet
3527 break; 3721 break;
3528#endif 3722#endif
3529 } 3723 }
3530} 3724}
3531/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
… …
3538 * 's' = save 3732 * 's' = save
3539 * 'r' = restore 3733 * 'r' = restore
3540 * 't' = toggle 3734 * 't' = toggle
3541 * so no need for fancy checking 3735 * so no need for fancy checking
3542 */ 3736 */
3543int 3737int ecb_cold
3544rxvt_term::privcases (int mode, unsigned long bit) 3738rxvt_term::privcases (int mode, unsigned long bit)
3545{ 3739{
3546 int state; 3740 int state;
3547 3741
3548 if (mode == 's') 3742 if (mode == 's')
3549 { 3743 {
3550 SavedModes |= (priv_modes & bit); 3744 if (priv_modes & bit)
3745 SavedModes |= bit;
3746 else
3747 SavedModes &= ~bit;
3551 return -1; 3748 return -1;
3552 } 3749 }
3553 else 3750 else
3554 { 3751 {
3555 if (mode == 'r') 3752 if (mode == 'r')
3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3753 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557 else 3754 else
3558 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3755 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559 PrivMode (state, bit); 3756
3757 if (state)
3758 priv_modes |= bit;
3759 else
3760 priv_modes &= ~bit;
3560 } 3761 }
3561 3762
3562 return state; 3763 return state;
3563} 3764}
3564 3765
3565/* we're not using priv _yet_ */ 3766/* we're not using priv _yet_ */
3566void 3767void
3567rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3768rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3568{ 3769{
3569 unsigned int i, j; 3770 unsigned int i, j;
3570 int state; 3771 int state;
3571 3772
3572 static const struct 3773 static const struct
3573 { 3774 {
3574 const int argval; 3775 const int argval;
3575 const unsigned long bit; 3776 const unsigned long bit;
3576 } argtopriv[] = { 3777 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3778 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3779 { 2, PrivMode_vt52 }, // DECANM
3579 { 3, PrivMode_132 }, 3780 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3781 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3782 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3783 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3784 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3785 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3786 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related
3587 { 25, PrivMode_VisibleCursor }, 3787 { 12, PrivMode_BlinkingCursor },
3788 // 18 end FF to printer after print screen
3789 // 19 Print screen prints full screen/scroll region
3790 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3791#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3792 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3793#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3794 { 35, PrivMode_ShiftKeys }, // rxvt extension
3795 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3796 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3797 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3798 // 45 margin bell NYI
3595 // 46 start logging 3799 // 46 start logging
3596 { 47, PrivMode_Screen }, 3800 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3801 { 66, PrivMode_aplKP }, // DECNKM
3598#ifndef NO_BACKSPACE_KEY 3802#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3803 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3804#endif
3601 { 1000, PrivMode_MouseX11 }, 3805 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3806 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3807 { 1003, PrivMode_MouseAnyEvent },
3808#if ENABLE_FRILLS
3809 { 1004, PrivMode_FocusEvent },
3810 { 1005, PrivMode_ExtModeMouse },
3811#endif
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3812 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3605 { 1011, PrivMode_Keypress }, // rxvt extension 3813 { 1011, PrivMode_Keypress }, // rxvt extension
3814#if ENABLE_FRILLS
3815 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3816#endif
3606 // 1035 enable modifiers for alt, numlock NYI 3817 // 1035 enable modifiers for alt, numlock NYI
3607 // 1036 send ESC for meta keys NYI 3818 // 1036 send ESC for meta keys NYI
3608 // 1037 send DEL for keypad delete NYI 3819 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3820 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3821 // 1048 save and restore cursor, implemented in code
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3822 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3823 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3824 { 2004, PrivMode_BracketPaste },
3613 }; 3825 };
3614 3826
3615 if (nargs == 0) 3827 if (nargs == 0)
3616 return; 3828 return;
3617 3829
… …
3624 for (i = 0; i < nargs; i++) 3836 for (i = 0; i < nargs; i++)
3625 { 3837 {
3626 state = -1; 3838 state = -1;
3627 3839
3628 /* basic handling */ 3840 /* basic handling */
3629 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3841 for (j = 0; j < ecb_array_length (argtopriv); j++)
3630 if (argtopriv[j].argval == arg[i]) 3842 if (argtopriv[j].argval == arg[i])
3631 { 3843 {
3632 state = privcases (mode, argtopriv[j].bit); 3844 state = privcases (mode, argtopriv[j].bit);
3633 break; 3845 break;
3634 } 3846 }
… …
3642 3854
3643 scr_touch (true); 3855 scr_touch (true);
3644 break; 3856 break;
3645#endif 3857#endif
3646 case 1048: /* alternative cursor save */ 3858 case 1048: /* alternative cursor save */
3647 case 1049:
3648 if (option (Opt_secondaryScreen)) 3859 if (option (Opt_secondaryScreen))
3649 if (mode == 0) 3860 if (mode == 0)
3650 scr_cursor (RESTORE); 3861 scr_cursor (RESTORE);
3651 else if (mode == 1) 3862 else if (mode == 1)
3652 scr_cursor (SAVE); 3863 scr_cursor (SAVE);
… …
3661 case 2: /* VT52 mode */ 3872 case 2: /* VT52 mode */
3662 /* oddball mode. should be set regardless of set/reset 3873 /* oddball mode. should be set regardless of set/reset
3663 * parameter. Return from VT52 mode with an ESC < from 3874 * parameter. Return from VT52 mode with an ESC < from
3664 * within VT52 mode 3875 * within VT52 mode
3665 */ 3876 */
3666 PrivMode (1, PrivMode_vt52); 3877 priv_modes |= PrivMode_vt52;
3667 break; 3878 break;
3668 case 3: /* 80/132 */ 3879 case 3: /* 80/132 */
3669 if (priv_modes & PrivMode_132OK) 3880 if (priv_modes & PrivMode_132OK)
3670 set_widthheight (((state ? 132 : 80) * fwidth), height); 3881 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 break; 3882 break;
3672 case 4: /* smooth scrolling */ 3883 case 4: /* smooth scrolling */
3673 set_option (Opt_jumpScroll, !state); 3884 set_option (Opt_jumpScroll, !state);
3674 break; 3885 break;
3675 case 5: /* reverse video */ 3886 case 5: /* reverse video */
… …
3686 if (state) /* orthogonal */ 3897 if (state) /* orthogonal */
3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3898 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3688 break; 3899 break;
3689#ifdef scrollBar_esc 3900#ifdef scrollBar_esc
3690 case scrollBar_esc: 3901 case scrollBar_esc:
3691 if (scrollbar_mapping (state)) 3902 scrollBar.map (state);
3692 {
3693 resize_all_windows (0, 0, 0); 3903 resize_all_windows (0, 0, 0);
3694 scr_touch (true); 3904 scr_touch (true);
3695 } 3905 break;
3906#endif
3907#ifdef CURSOR_BLINK
3908 case 12:
3909 cursor_blink_reset ();
3696 break; 3910 break;
3697#endif 3911#endif
3698 case 25: /* visible/invisible cursor */ 3912 case 25: /* visible/invisible cursor */
3699 scr_cursor_visible (state); 3913 scr_cursor_visible (state);
3700 break; 3914 break;
… …
3713 case 1003: 3927 case 1003:
3714 if (state) 3928 if (state)
3715 { 3929 {
3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3930 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3931 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3932 mouse_row = mouse_col = 0;
3718 vt_emask_mouse = PointerMotionMask; 3933 vt_emask_mouse = PointerMotionMask;
3719 } 3934 }
3720 else 3935 else
3721 vt_emask_mouse = NoEventMask; 3936 vt_emask_mouse = NoEventMask;
3937
3722 vt_select_input (); 3938 vt_select_input ();
3723 break; 3939 break;
3724 case 1010: /* scroll to bottom on TTY output inhibit */ 3940 case 1010: /* scroll to bottom on TTY output inhibit */
3725 set_option (Opt_scrollTtyOutput, !state); 3941 set_option (Opt_scrollTtyOutput, !state);
3726 break; 3942 break;
3727 case 1011: /* scroll to bottom on key press */ 3943 case 1011: /* scroll to bottom on key press */
3728 set_option (Opt_scrollTtyKeypress, state); 3944 set_option (Opt_scrollTtyKeypress, state);
3729 break; 3945 break;
3730 case 1047: /* secondary screen w/ clearing last */ 3946 case 1047: /* secondary screen w/ clearing last */
3731 if (option (Opt_secondaryScreen)) 3947 if (option (Opt_secondaryScreen))
3732 if (current_screen != PRIMARY) 3948 if (!state)
3733 scr_erase_screen (2); 3949 scr_erase_screen (2);
3950
3734 scr_change_screen (state); 3951 scr_change_screen (state);
3735 break; 3952 break;
3736 case 1049: /* secondary screen w/ clearing first */ 3953 case 1049: /* secondary screen w/ clearing first */
3954 if (option (Opt_secondaryScreen))
3955 if (state)
3956 scr_cursor (SAVE);
3957
3737 scr_change_screen (state); 3958 scr_change_screen (state);
3959
3738 if (option (Opt_secondaryScreen)) 3960 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3961 if (state)
3740 scr_erase_screen (2); 3962 scr_erase_screen (2);
3963 else
3964 scr_cursor (RESTORE);
3741 break; 3965 break;
3742 default: 3966 default:
3743 break; 3967 break;
3744 } 3968 }
3745 } 3969 }
3746} 3970}
3747/*}}} */ 3971/*}}} */
3748 3972
3749/*{{{ process sgr sequences */ 3973/*{{{ process sgr sequences */
3750void 3974void ecb_hot
3751rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3975rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3752{ 3976{
3753 unsigned int i; 3977 unsigned int i;
3754 short rendset; 3978 short rendset;
3755 int rendstyle; 3979 int rendstyle;
… …
3797 //case 19: // ninth alt font 4021 //case 19: // ninth alt font
3798 //case 20: // gothic 4022 //case 20: // gothic
3799 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4023 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3800 rendset = 0, rendstyle = RS_Bold; 4024 rendset = 0, rendstyle = RS_Bold;
3801 break; 4025 break;
3802 case 22: // normal intensity 4026 case 22: // bold off (vt220)
3803 rendset = 0, rendstyle = RS_Bold; 4027 rendset = 0, rendstyle = RS_Bold;
3804 break; 4028 break;
3805 case 23: // disable italic 4029 case 23: // disable italic
3806 rendset = 0, rendstyle = RS_Italic; 4030 rendset = 0, rendstyle = RS_Italic;
3807 break; 4031 break;
3808 case 24: 4032 case 24: // underline off (vt220)
3809 rendset = 0, rendstyle = RS_Uline; 4033 rendset = 0, rendstyle = RS_Uline;
3810 break; 4034 break;
3811 case 25: 4035 case 25: // blink off (vt220)
3812 rendset = 0, rendstyle = RS_Blink; 4036 rendset = 0, rendstyle = RS_Blink;
3813 break; 4037 break;
3814 case 26: // variable spacing (iso 8613) 4038 case 26: // variable spacing (iso 8613)
3815 rendset = 0, rendstyle = RS_Blink; 4039 rendset = 0, rendstyle = RS_Blink;
3816 break; 4040 break;
3817 case 27: 4041 case 27: // reverse off (vt220)
3818 rendset = 0, rendstyle = RS_RVid; 4042 rendset = 0, rendstyle = RS_RVid;
3819 break; 4043 break;
3820 //case 28: // visible. NYI 4044 //case 28: // visible. NYI
3821 //case 29: // not crossed-out 4045 //case 29: // not crossed-out
3822 } 4046 }
… …
3843 if (nargs > i + 2 && arg[i + 1] == 5) 4067 if (nargs > i + 2 && arg[i + 1] == 5)
3844 { 4068 {
3845 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4069 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3846 i += 2; 4070 i += 2;
3847 } 4071 }
4072 else if (nargs > i + 4 && arg[i + 1] == 2)
4073 {
4074 unsigned int r = arg[i + 2];
4075 unsigned int g = arg[i + 3];
4076 unsigned int b = arg[i + 4];
4077 unsigned int idx = map_rgb24_color (r, g, b);
4078 scr_color (idx, Color_fg);
4079 i += 4;
4080 }
3848 break; 4081 break;
3849 case 39: /* default fg */ 4082 case 39: /* default fg */
3850 scr_color (Color_fg, Color_fg); 4083 scr_color (Color_fg, Color_fg);
3851 break; 4084 break;
3852 4085
… …
3863 case 48: // set bg color, ISO 8613-6 4096 case 48: // set bg color, ISO 8613-6
3864 if (nargs > i + 2 && arg[i + 1] == 5) 4097 if (nargs > i + 2 && arg[i + 1] == 5)
3865 { 4098 {
3866 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4099 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3867 i += 2; 4100 i += 2;
4101 }
4102 else if (nargs > i + 4 && arg[i + 1] == 2)
4103 {
4104 unsigned int r = arg[i + 2];
4105 unsigned int g = arg[i + 3];
4106 unsigned int b = arg[i + 4];
4107 unsigned int idx = map_rgb24_color (r, g, b);
4108 scr_color (idx, Color_bg);
4109 i += 4;
3868 } 4110 }
3869 break; 4111 break;
3870 case 49: /* default bg */ 4112 case 49: /* default bg */
3871 scr_color (Color_bg, Color_bg); 4113 scr_color (Color_bg, Color_bg);
3872 break; 4114 break;
… …
3896 break; 4138 break;
3897#endif 4139#endif
3898 } 4140 }
3899 } 4141 }
3900} 4142}
4143
4144void
4145rxvt_term::set_cursor_style (int style)
4146{
4147 if (!IN_RANGE_INC (style, 0, 6))
4148 return;
4149
4150 if (style == 0)
4151 style = 1;
4152
4153 cursor_type = (style - 1) / 2;
4154 set_option (Opt_cursorUnderline, cursor_type == 1);
4155
4156#ifdef CURSOR_BLINK
4157 set_option (Opt_cursorBlink, style & 1);
4158 cursor_blink_reset ();
4159#endif
4160
4161 want_refresh = 1;
4162}
3901/*}}} */ 4163/*}}} */
3902 4164
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/* ------------------------------------------------------------------------- */ 4165/* ---------------------------------------------------------------------- */
4166/* Write data to the pty as typed by the user, pasted with the mouse,
4167 * or generated by us in response to a query ESC sequence.
4168 */
3923 4169
3924/* 4170/*
3925 * Send printf () formatted output to the command. 4171 * Send printf () formatted output to the command.
3926 * Only use for small amounts of data. 4172 * Only use for small amounts of data.
3927 */ 4173 */
… …
3935 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4181 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3936 va_end (arg_ptr); 4182 va_end (arg_ptr);
3937 tt_write (buf, strlen (buf)); 4183 tt_write (buf, strlen (buf));
3938} 4184}
3939 4185
3940/* ---------------------------------------------------------------------- */
3941/* Write data to the pty as typed by the user, pasted with the mouse, 4186/* Write data to the pty as typed by the user. */
3942 * or generated by us in response to a query ESC sequence. 4187void
3943 */ 4188rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3944const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4189{
4190 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4191 return;
4192
4193 if (option (Opt_scrollTtyKeypress))
4194 if (view_start)
4195 {
4196 view_start = 0;
4197 want_refresh = 1;
4198 }
4199
4200 tt_write_ (data, len);
4201}
3945 4202
3946void 4203void
3947rxvt_term::tt_write (const char *data, unsigned int len) 4204rxvt_term::tt_write (const char *data, unsigned int len)
3948{ 4205{
3949 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4206 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3950 return; 4207 return;
3951 4208
4209 tt_write_ (data, len);
4210}
4211
4212static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4213
4214void
4215rxvt_term::tt_write_ (const char *data, unsigned int len)
4216{
3952 if (pty->pty < 0) 4217 if (pty->pty < 0)
3953 return; 4218 return;
3954 4219
3955 if (v_buflen == 0) 4220 if (v_buflen == 0)
3956 { 4221 {
3957 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4222 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3958 4223
4224 max_it (written, 0);
4225
3959 if ((unsigned int)written == len) 4226 if (written == len)
3960 return; 4227 return;
3961 4228
3962 data += written; 4229 data += written;
3963 len -= written; 4230 len -= written;
3964 } 4231 }
3965 4232
3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4233 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3967 4234
3968 memcpy (v_buffer + v_buflen, data, len); 4235 memcpy (v_buffer + v_buflen, data, len);
3969 v_buflen += len; 4236 v_buflen += len;
3970 4237
3971 pty_ev.set (ev::READ | ev::WRITE); 4238 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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