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

Diff Legend

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