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.378 by root, Fri Dec 14 02:27:54 2007 UTC vs.
Revision 1.573 by root, Thu Jun 30 14:01:11 2016 UTC

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

Diff Legend

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