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

Diff Legend

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