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.346 by root, Wed Aug 15 06:48:16 2007 UTC vs.
Revision 1.563 by root, Sat Dec 13 12:24:32 2014 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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 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 newlen = 1;
553 switch (keysym)
554 {
555#ifndef NO_BACKSPACE_KEY
556 case XK_BackSpace:
557 if (priv_modes & PrivMode_HaveBackSpace)
558 {
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0';
562 }
563 else
564 strcpy (kbuf, key_backspace);
565 break;
566#endif
567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete:
579 strcpy (kbuf, key_delete);
580 break;
581#endif
582 case XK_Tab:
583 if (shft)
584 strcpy (kbuf, "\033[Z");
585 else
586 {
587#ifdef CTRL_TAB_MAKES_META
588 if (ctrl)
589 meta = 1;
590#endif
591#ifdef MOD4_TAB_MAKES_META
592 if (ev.state & Mod4Mask)
593 meta = 1;
594#endif
595 newlen = 0;
596 }
597 break;
598
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z");
620 kbuf[2] = "DACB"[keysym - XK_Left];
621 /* do Shift first */
622 if (shft)
623 kbuf[2] = "dacb"[keysym - XK_Left];
624 else if (ctrl)
625 {
626 kbuf[1] = 'O';
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 }
629 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O';
631 break;
632
633#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior:
645 strcpy (kbuf, "\033[5~");
646 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next:
658 strcpy (kbuf, "\033[6~");
659 break;
660#endif
661 case XK_KP_Enter:
662 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
664 {
665 strcpy (kbuf, "\033OM");
666 break;
667 }
668
669 /* FALLTHROUGH */
670
671 case XK_Return:
672 if (priv_modes & PrivMode_LFNL)
673 {
674 kbuf[0] = '\015';
675 kbuf[1] = '\012';
676 kbuf[2] = '\0';
677 }
678 else
679 {
680 kbuf[0] = '\015';
681 kbuf[1] = '\0';
682 }
683 break;
684
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP");
696 kbuf[2] += (keysym - XK_KP_F1);
697 break;
698
699 case XK_KP_Multiply: /* "\033Oj" : "*" */
700 case XK_KP_Add: /* "\033Ok" : "+" */
701 case XK_KP_Separator: /* "\033Ol" : "," */
702 case XK_KP_Subtract: /* "\033Om" : "-" */
703 case XK_KP_Decimal: /* "\033On" : "." */
704 case XK_KP_Divide: /* "\033Oo" : "/" */
705 case XK_KP_0: /* "\033Op" : "0" */
706 case XK_KP_1: /* "\033Oq" : "1" */
707 case XK_KP_2: /* "\033Or" : "2" */
708 case XK_KP_3: /* "\033Os" : "3" */
709 case XK_KP_4: /* "\033Ot" : "4" */
710 case XK_KP_5: /* "\033Ou" : "5" */
711 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
717 {
718 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply);
720 }
721 else
722 {
723 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_Find:
729 strcpy (kbuf, "\033[1~");
730 break;
731
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert:
743 strcpy (kbuf, "\033[2~");
744 break;
745#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove:
747 /* FALLTHROUGH */
748#endif
749 case XK_Execute:
750 strcpy (kbuf, "\033[3~");
751 break;
752 case XK_Select:
753 strcpy (kbuf, "\033[4~");
754 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End:
766 strcpy (kbuf, KS_END);
767 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home:
779 strcpy (kbuf, KS_HOME);
780 break;
781
782#define FKEY(n, fkey) \
783 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
784
785 case XK_F1: /* "\033[11~" */
786 case XK_F2: /* "\033[12~" */
787 case XK_F3: /* "\033[13~" */
788 case XK_F4: /* "\033[14~" */
789 case XK_F5: /* "\033[15~" */
790 FKEY (11, XK_F1);
791 break;
792 case XK_F6: /* "\033[17~" */
793 case XK_F7: /* "\033[18~" */
794 case XK_F8: /* "\033[19~" */
795 case XK_F9: /* "\033[20~" */
796 case XK_F10: /* "\033[21~" */
797 FKEY (17, XK_F6);
798 break;
799 case XK_F11: /* "\033[23~" */
800 case XK_F12: /* "\033[24~" */
801 case XK_F13: /* "\033[25~" */
802 case XK_F14: /* "\033[26~" */
803 FKEY (23, XK_F11);
804 break;
805 case XK_F15: /* "\033[28~" */
806 case XK_F16: /* "\033[29~" */
807 FKEY (28, XK_F15);
808 break;
809 case XK_Help: /* "\033[28~" */
810 FKEY (28, XK_Help);
811 break;
812 case XK_Menu: /* "\033[29~" */
813 FKEY (29, XK_Menu);
814 break;
815 case XK_F17: /* "\033[31~" */
816 case XK_F18: /* "\033[32~" */
817 case XK_F19: /* "\033[33~" */
818 case XK_F20: /* "\033[34~" */
819 case XK_F21: /* "\033[35~" */
820 case XK_F22: /* "\033[36~" */
821 case XK_F23: /* "\033[37~" */
822 case XK_F24: /* "\033[38~" */
823 case XK_F25: /* "\033[39~" */
824 case XK_F26: /* "\033[40~" */
825 case XK_F27: /* "\033[41~" */
826 case XK_F28: /* "\033[42~" */
827 case XK_F29: /* "\033[43~" */
828 case XK_F30: /* "\033[44~" */
829 case XK_F31: /* "\033[45~" */
830 case XK_F32: /* "\033[46~" */
831 case XK_F33: /* "\033[47~" */
832 case XK_F34: /* "\033[48~" */
833 case XK_F35: /* "\033[49~" */
834 FKEY (31, XK_F17);
835 break;
836#undef FKEY
837 default:
838 newlen = 0;
839 break;
840 }
841
842 if (newlen)
843 len = strlen (kbuf);
844 }
845
846 /*
847 * Pass meta for all function keys, if 'meta' option set
848 */
849#ifdef META8_OPTION
850 if (meta && (meta_char == 0x80) && len > 0)
851 kbuf[len - 1] |= 0x80;
852#endif
853
854 }
855 else if (ctrl && keysym == XK_minus)
856 {
857 len = 1;
858 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
859 }
860 else if (keysym == XK_ISO_Left_Tab)
861 {
862 strcpy (kbuf, "\033[Z");
863 len = 3;
864 }
865 else
866 {
867#ifdef META8_OPTION
868 /* set 8-bit on */
869 if (meta && (meta_char == 0x80))
870 {
871 char *ch;
872
873 for (ch = kbuf; ch < kbuf + len; ch++)
874 *ch |= 0x80;
875
876 meta = 0;
877 }
878#endif
879 /* nil */ ;
880 }
881 } 868 }
882
883 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
884 return;
885 869
886 if (len <= 0) 870 if (len <= 0)
887 return; /* not mapped */ 871 return; /* not mapped */
888 872
889 if (option (Opt_scrollTtyKeypress))
890 if (view_start)
891 {
892 view_start = 0;
893 want_refresh = 1;
894 }
895
896 /*
897 * these modifications only affect the static keybuffer
898 * pass Shift/Control indicators for function keys ending with `~'
899 *
900 * eg,
901 * Prior = "ESC[5~"
902 * Shift+Prior = "ESC[5$"
903 * Ctrl+Prior = "ESC[5^"
904 * Ctrl+Shift+Prior = "ESC[5@"
905 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
906 */
907 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
908 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
909
910 /* escape prefix */
911 if (meta
912#ifdef META8_OPTION
913 && meta_char == C0_ESC
914#endif
915 )
916 {
917 const char ch = C0_ESC;
918 tt_write (&ch, 1);
919 }
920
921 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
922} 874}
923 875
924void 876void ecb_cold
925rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
926{ 878{
927#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
928 KeySym keysym; 880 KeySym keysym;
929 881
… …
949 commit_iso14755 (); 901 commit_iso14755 ();
950 902
951 return; 903 return;
952 } 904 }
953 905
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
955 if (i[0] == keysym) 907 if (i[0] == keysym)
956 { 908 {
957 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 (); 910 commit_iso14755 ();
959 911
… …
996 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
997 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
998#endif 950#endif
999} 951}
1000 952
1001#if defined (KEYSYM_RESOURCE)
1002unsigned int
1003rxvt_term::cmd_write (const char *str, unsigned int count)
1004{
1005 unsigned int n, s;
1006
1007 n = cmdbuf_ptr - cmdbuf_base;
1008 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1009
1010 if (n > 0 && s < count)
1011 {
1012 memmove (cmdbuf_base, cmdbuf_ptr,
1013 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1014 cmdbuf_ptr = cmdbuf_base;
1015 cmdbuf_endp -= n;
1016 s += n;
1017 }
1018
1019 if (count > s)
1020 {
1021 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1022 count = s;
1023 }
1024
1025 for (; count--;)
1026 *cmdbuf_endp++ = *str++;
1027
1028 cmd_parse ();
1029
1030 return 0;
1031}
1032#endif
1033
1034void 953void
1035rxvt_term::flush () 954rxvt_term::flush ()
1036{ 955{
1037 flush_ev.stop (); 956 flush_ev.stop ();
1038 957
1039#ifdef ENABLE_TRANSPARENCY 958#ifdef HAVE_IMG
1040 if (want_full_refresh) 959 if (bg_flags & BG_NEEDS_REFRESH)
1041 { 960 {
1042 want_full_refresh = 0; 961 bg_flags &= ~BG_NEEDS_REFRESH;
1043 scr_clear ();
1044 scr_touch (false); 962 scr_touch (false);
1045 } 963 }
1046#endif 964#endif
1047 965
1048 if (want_refresh) 966 if (want_refresh)
… …
1084 } 1002 }
1085 while (row < end_row); 1003 while (row < end_row);
1086 } 1004 }
1087 1005
1088 scr_refresh (); 1006 scr_refresh ();
1089 scrollbar_show (1); 1007 scrollBar.show (1);
1090#ifdef USE_XIM 1008#if USE_XIM
1091 IMSendSpot (); 1009 im_send_spot ();
1092#endif 1010#endif
1093 } 1011 }
1094 1012
1095 display->flush (); 1013 display->flush ();
1096} 1014}
1097 1015
1016/* checks whether a refresh is requested and starts the refresh timer */
1098void 1017void
1099rxvt_term::check_cb (check_watcher &w) 1018rxvt_term::refresh_check ()
1100{ 1019{
1101 make_current (); 1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1022
1103 display->flush (); 1023 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1024}
1108 1025
1109void 1026void
1110rxvt_term::flush_cb (time_watcher &w) 1027rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1028{
1112 make_current (); 1029 make_current ();
1113 1030
1114 refresh_count = 0; 1031 refresh_count = 0;
1115 flush (); 1032 flush ();
1116} 1033}
1117 1034
1118#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1119void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (hidden_cursor)
1040 {
1041 hidden_cursor = 0;
1042 want_refresh = 1;
1043 }
1044
1045 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1046 cursor_blink_ev.again ();
1047 else
1048 cursor_blink_ev.stop ();
1049}
1050
1051void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1052rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1053{
1122 hidden_cursor = !hidden_cursor; 1054 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1055 want_refresh = 1;
1124 1056 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1057}
1127#endif 1058#endif
1128 1059
1129#ifdef TEXT_BLINK 1060#ifdef TEXT_BLINK
1130void 1061void
1131rxvt_term::text_blink_cb (time_watcher &w) 1062rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1063{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1064 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1065 {
1135 hidden_text = !hidden_text; 1066 hidden_text = !hidden_text;
1136 want_refresh = 1; 1067 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1068 refresh_check ();
1138 } 1069 }
1070 else
1071 w.stop ();
1139} 1072}
1140#endif 1073#endif
1141 1074
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1076void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1077rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1078{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1079 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1080 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1148 { 1081 {
1149 want_refresh = 1; 1082 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1083 refresh_check ();
1151 } 1084 }
1085 else
1086 w.stop ();
1152} 1087}
1153#endif 1088#endif
1154 1089
1155#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1156void 1091void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1092rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1093{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1094 if (scr_page (scroll_selection_lines))
1160 { 1095 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1096 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1097 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1164 } 1099 }
1100 else
1101 w.stop ();
1165} 1102}
1166#endif 1103#endif
1167 1104
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1105#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1106void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1107rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1108{
1172 if (mouse_slip_wheel_speed == 0 1109 if (scr_page (mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1110 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1111 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 refresh_check ();
1113 }
1114
1115 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1116 {
1117 mouse_slip_wheel_speed = 0;
1118 w.stop ();
1181 } 1119 }
1182} 1120}
1183#endif 1121#endif
1184 1122
1185#if LINUX_YIELD_HACK 1123#if LINUX_YIELD_HACK
1186static struct event_handler 1124static struct event_handler
1187{ 1125{
1188 check_watcher yield_ev; 1126 ev::prepare yield_ev;
1189 1127
1190 void yield_cb (check_watcher &w) 1128 void yield_cb (ev::prepare &w, int revents)
1191 { 1129 {
1192 // this should really be sched_yield(), but the linux guys thought 1130 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1131 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is 1132 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1133 // allowed by the sus... as is returning ENOSYS.
1134 // since the linux guys additionally thought that breaking the only
1135 // known workaround against their unusable sched_yield hack is cool,
1136 // we just nanosleep a bit and hope for the best.
1196 1137
1197 struct timespec ts = { 0, 0 }; 1138 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1139 nanosleep (&ts, 0);
1199 1140
1200 w.stop (); 1141 w.stop ();
1201 } 1142 }
1202 1143
… …
1205 { 1146 {
1206 } 1147 }
1207} event_handler; 1148} event_handler;
1208#endif 1149#endif
1209 1150
1151/* make sure all the cmd data is at beginning of cmdbuf */
1152void
1153rxvt_term::cmdbuf_reify ()
1154{
1155 if (cmdbuf_ptr == cmdbuf_base)
1156 return;
1157
1158 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1159
1160 memmove (cmdbuf_base, cmdbuf_ptr, used);
1161 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + used;
1163
1164}
1165
1166#if defined (KEYSYM_RESOURCE)
1167void
1168rxvt_term::cmdbuf_append (const char *str, size_t count)
1169{
1170 cmdbuf_reify ();
1171
1172 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1173
1174 if (count > avail)
1175 return;
1176
1177 memcpy (cmdbuf_endp, str, count);
1178 cmdbuf_endp += count;
1179
1180 cmd_parse ();
1181}
1182#endif
1183
1210bool 1184bool
1211rxvt_term::pty_fill () 1185rxvt_term::pty_fill ()
1212{ 1186{
1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1187 cmdbuf_reify ();
1214 1188
1215 if (CBUFSIZ == n) 1189 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1216 { 1190
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1191 if (!avail)
1218 n = 0;
1219 } 1192 {
1220 1193 // normally this indicates a "too long" command sequence - just drop the data we have
1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1222 cmdbuf_ptr = cmdbuf_base; 1194 cmdbuf_ptr = cmdbuf_base;
1223 cmdbuf_endp = cmdbuf_ptr + n; 1195 cmdbuf_endp = cmdbuf_ptr;
1196 avail = CBUFSIZ;
1197 }
1224 1198
1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1199 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1226 1200
1227 if (r > 0) 1201 if (r > 0)
1228 { 1202 {
1229 cmdbuf_endp += r; 1203 cmdbuf_endp += r;
1230 return true; 1204 return true;
… …
1246 1220
1247 return false; 1221 return false;
1248} 1222}
1249 1223
1250void 1224void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1225rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1226{
1253 make_current (); 1227 make_current ();
1254 1228
1255 if (revents & EVENT_READ) 1229 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1230 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1231 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1232 cmd_parse ();
1259 break;
1260 1233
1261 if (revents & EVENT_WRITE) 1234 if (revents & ev::WRITE)
1262 pty_write (); 1235 pty_write ();
1263}
1264 1236
1265void 1237 refresh_check ();
1238}
1239
1240void ecb_cold
1266rxvt_term::pointer_unblank () 1241rxvt_term::pointer_unblank ()
1267{ 1242{
1268 XDefineCursor (dpy, vt, TermWin_cursor); 1243 XDefineCursor (dpy, vt, TermWin_cursor);
1269 recolour_cursor (); 1244 recolor_cursor ();
1270 1245
1271#ifdef POINTER_BLANK 1246#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1247 hidden_pointer = 0;
1273 1248
1274 if (option (Opt_pointerBlank)) 1249 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1250 pointer_ev.start (pointerBlankDelay);
1276#endif 1251#endif
1277} 1252}
1278 1253
1279#ifdef POINTER_BLANK 1254#ifdef POINTER_BLANK
1280void 1255void ecb_cold
1281rxvt_term::pointer_blank () 1256rxvt_term::pointer_blank ()
1282{ 1257{
1283 if (!option (Opt_pointerBlank)) 1258 if (!option (Opt_pointerBlank))
1284 return; 1259 return;
1285 1260
… …
1287 XFlush (dpy); 1262 XFlush (dpy);
1288 1263
1289 hidden_pointer = 1; 1264 hidden_pointer = 1;
1290} 1265}
1291 1266
1292void 1267void ecb_cold
1293rxvt_term::pointer_cb (time_watcher &w) 1268rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1269{
1295 make_current (); 1270 make_current ();
1296 1271
1297 pointer_blank (); 1272 pointer_blank ();
1298} 1273}
… …
1301void 1276void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1277rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1278{
1304 int button_number, key_state = 0; 1279 int button_number, key_state = 0;
1305 int x, y; 1280 int x, y;
1281 int code = 32;
1306 1282
1307 x = ev.x; 1283 x = Pixel2Col (ev.x) + 1;
1308 y = ev.y; 1284 y = Pixel2Row (ev.y) + 1;
1309 pixel_position (&x, &y); 1285
1286 if (ev.type == MotionNotify)
1287 {
1288 if (x == mouse_row && y == mouse_col)
1289 return;
1290
1291 mouse_row = x;
1292 mouse_col = y;
1293 code += 32;
1294 }
1310 1295
1311 if (MEvent.button == AnyButton) 1296 if (MEvent.button == AnyButton)
1312 button_number = 3; 1297 button_number = 3;
1313 else 1298 else
1314 { 1299 {
1315 button_number = MEvent.button - Button1; 1300 button_number = MEvent.button - Button1;
1316 /* add 0x3D for wheel events, like xterm does */ 1301 /* add 0x3D for wheel events, like xterm does */
1317 if (button_number >= 3) 1302 if (button_number >= 3)
1318 button_number += (64 - 3); 1303 button_number += 64 - 3;
1319 } 1304 }
1320 1305
1321 if (priv_modes & PrivMode_MouseX10) 1306 if (priv_modes & PrivMode_MouseX10)
1322 { 1307 {
1323 /* 1308 /*
… …
1355 fputc ('A', stderr); 1340 fputc ('A', stderr);
1356 if (key_state & 32) 1341 if (key_state & 32)
1357 fputc ('2', stderr); 1342 fputc ('2', stderr);
1358 fprintf (stderr, "]: <%d>, %d/%d\n", 1343 fprintf (stderr, "]: <%d>, %d/%d\n",
1359 button_number, 1344 button_number,
1360 x + 1, 1345 x,
1361 y + 1); 1346 y);
1362#endif 1347#endif
1363 1348
1349#if ENABLE_FRILLS
1350 if (priv_modes & PrivMode_ExtMouseRight)
1351 tt_printf ("\033[%d;%d;%dM",
1352 code + button_number + key_state,
1353 x,
1354 y);
1355 else if (priv_modes & PrivMode_ExtModeMouse)
1356 tt_printf ("\033[M%c%lc%lc",
1357 code + button_number + key_state,
1358 wint_t (32 + x),
1359 wint_t (32 + y));
1360 else
1361#endif
1364 tt_printf ("\033[M%c%c%c", 1362 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1363 code + button_number + key_state,
1366 (32 + x + 1), 1364 32 + x,
1367 (32 + y + 1)); 1365 32 + y);
1368} 1366}
1369 1367
1370/*{{{ process an X event */ 1368/*{{{ process an X event */
1371void 1369void ecb_hot
1372rxvt_term::x_cb (XEvent &ev) 1370rxvt_term::x_cb (XEvent &ev)
1373{ 1371{
1374 make_current (); 1372 make_current ();
1375 1373
1376 dLocal (Display *, dpy); 1374 dLocal (Display *, dpy);
… …
1474 && ev.xfocus.mode != NotifyGrab) 1472 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1473 focus_out ();
1476 break; 1474 break;
1477 1475
1478 case ConfigureNotify: 1476 case ConfigureNotify:
1479 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent)
1480 { 1478 {
1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482 ; 1480 ;
1481
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483
1484 bool moved = false;
1485#ifdef HAVE_BG_PIXMAP
1486 if (bg_window_position_sensitive ())
1487 {
1488 want_position_change = true;
1489 if (bg_img == 0)
1490 moved = true;
1491 }
1492#endif
1493
1494 if (want_position_change)
1495 {
1496 int x, y;
1497
1498 if (ev.xconfigure.send_event)
1499 {
1500 x = ev.xconfigure.x;
1501 y = ev.xconfigure.y;
1502 }
1503 else
1504 get_window_origin (x, y);
1505
1506 if (x != parent_x || y != parent_y)
1507 {
1508 parent_x = x;
1509 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1511 moved = true;
1512 }
1513 }
1483 1514
1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1485 { 1516 {
1486 seen_resize = 1; 1517 seen_resize = 1;
1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488#ifdef XPM_BACKGROUND
1489 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1490 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1491 {
1492 bgPixmap.render ();
1493 scr_touch (true);
1494 }
1495#endif
1496 } 1519 }
1520 else
1521 {
1522#ifdef HAVE_BG_PIXMAP
1523 if (moved)
1524 update_background ();
1525#endif
1526 }
1497 1527
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 bgPixmap.render ();
1503#endif
1504 } 1529 }
1505 break; 1530 break;
1506 1531
1507 case PropertyNotify: 1532 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1533 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1510 && ev.xproperty.state == PropertyNewValue)
1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1512
1513 break; 1534 break;
1514 1535
1515 case SelectionClear: 1536 case SelectionClear:
1516 selection_clear (); 1537 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1517 break;
1518
1519 case SelectionNotify:
1520 if (selection_wait == Sel_normal)
1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1522 break; 1538 break;
1523 1539
1524 case SelectionRequest: 1540 case SelectionRequest:
1525 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1526 break; 1542 break;
1527 1543
1528 case MapNotify: 1544 case MapNotify:
1545#ifdef HAVE_BG_PIXMAP
1546 // This is needed at startup for the case of no window manager
1547 // or a non-reparenting window manager and also because we
1548 // defer bg image updates if the window is not mapped. The
1549 // short delay is to optimize for multiple ConfigureNotify
1550 // events at startup when the window manager reparents the
1551 // window, so as to perform the computation after we have
1552 // received all of them.
1553 if (bg_img == 0)
1554 update_background_ev.start (0.025);
1555#endif
1529 mapped = 1; 1556 mapped = 1;
1530#ifdef TEXT_BLINK 1557#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1558 text_blink_ev.start ();
1532#endif 1559#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1560 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break; 1561 break;
1535 1562
1536 case UnmapNotify: 1563 case UnmapNotify:
… …
1538#ifdef TEXT_BLINK 1565#ifdef TEXT_BLINK
1539 text_blink_ev.stop (); 1566 text_blink_ev.stop ();
1540#endif 1567#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1568 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1569 break;
1543
1544#ifdef ENABLE_TRANSPARENCY
1545 case ReparentNotify:
1546 rootwin_cb (ev);
1547 break;
1548#endif /* ENABLE_TRANSPARENCY */
1549 1570
1550 case GraphicsExpose: 1571 case GraphicsExpose:
1551 case Expose: 1572 case Expose:
1552 if (ev.xany.window == vt) 1573 if (ev.xany.window == vt)
1553 { 1574 {
1554 do 1575 do
1576 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, false);
1579 }
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1580 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558 1581
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1582 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560 1583
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1584 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1585 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1588 }
1564 1589
1565 want_refresh = 1; 1590 want_refresh = 1;
1566 } 1591 }
1567 else 1592 else
1568 { 1593 {
… …
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1596 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572 ; 1597 ;
1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1598 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574 ; 1599 ;
1575 1600
1576 if (isScrollbarWindow (ev.xany.window)) 1601 if (scrollBar.state && ev.xany.window == scrollBar.win)
1577 { 1602 {
1578 scrollBar.setIdle (); 1603 scrollBar.state = SB_STATE_IDLE;
1579 scrollbar_show (0); 1604 scrollBar.show (0);
1580 } 1605 }
1581 } 1606 }
1582 break; 1607 break;
1583 1608
1584 case MotionNotify: 1609 case MotionNotify:
1585#ifdef POINTER_BLANK 1610#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1611 if (hidden_pointer)
1587 pointer_unblank (); 1612 pointer_unblank ();
1588#endif 1613#endif
1614 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 || priv_modes & PrivMode_MouseAnyEvent)
1616 mouse_report (ev.xbutton);
1589 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1590 break; 1618 break;
1591 1619
1592 if (ev.xany.window == vt) 1620 if (ev.xany.window == vt)
1593 { 1621 {
… …
1622 1650
1623#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1624 if (ev.xbutton.y < int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1625 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1626 { 1654 {
1655 page_dirn scroll_selection_dir;
1627 int dist; 1656 int dist;
1628 1657
1629 /* don't clobber the current delay if we are 1658 /* don't clobber the current delay if we are
1630 * already in the middle of scrolling. 1659 * already in the middle of scrolling.
1631 */ 1660 */
1632 if (!sel_scroll_ev.active) 1661 if (!sel_scroll_ev.is_active ())
1633 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1662 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1634 1663
1635 /* save the event params so we can highlight 1664 /* save the event params so we can highlight
1636 * the selection in the pending-scroll loop 1665 * the selection in the pending-scroll loop
1637 */ 1666 */
1638 selection_save_x = ev.xbutton.x; 1667 selection_save_x = ev.xbutton.x;
… …
1646 dist = int_bwidth - ev.xbutton.y; 1675 dist = int_bwidth - ev.xbutton.y;
1647 } 1676 }
1648 else 1677 else
1649 { 1678 {
1650 scroll_selection_dir = DN; 1679 scroll_selection_dir = DN;
1651 dist = ev.xbutton.y - (int_bwidth + height); 1680 dist = ev.xbutton.y - (int_bwidth + vt_height);
1652 } 1681 }
1653 1682
1654 scroll_selection_lines = Pixel2Height (dist) 1683 scroll_selection_lines = Pixel2Height (dist)
1655 / SELECTION_SCROLL_LINE_SPEEDUP 1684 / SELECTION_SCROLL_LINE_SPEEDUP
1656 + 1; 1685 + 1;
1657 min_it (scroll_selection_lines, 1686 min_it (scroll_selection_lines,
1658 SELECTION_SCROLL_MAX_LINES); 1687 SELECTION_SCROLL_MAX_LINES);
1688 scroll_selection_lines *= scroll_selection_dir;
1659 } 1689 }
1660 else 1690 else
1661 { 1691 {
1662 /* we are within the text window, so we 1692 /* we are within the text window, so we
1663 * shouldn't be scrolling 1693 * shouldn't be scrolling
1664 */ 1694 */
1665 if (sel_scroll_ev.active)
1666 sel_scroll_ev.stop(); 1695 sel_scroll_ev.stop();
1667 } 1696 }
1668#endif 1697#endif
1669#ifdef MOUSE_THRESHOLD 1698#ifdef MOUSE_THRESHOLD
1670 } 1699 }
1671#endif 1700#endif
1672 } 1701 }
1673 } 1702 }
1674 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1675 { 1704 {
1676 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1677 MotionNotify, &ev)) 1706 MotionNotify, &ev))
1678 ; 1707 ;
1679 1708
1680 XQueryPointer (dpy, scrollBar.win, 1709 XQueryPointer (dpy, scrollBar.win,
1681 &unused_root, &unused_child, 1710 &unused_root, &unused_child,
1682 &unused_root_x, &unused_root_y, 1711 &unused_root_x, &unused_root_y,
1683 &ev.xbutton.x, &ev.xbutton.y, 1712 &ev.xbutton.x, &ev.xbutton.y,
1684 &unused_mask); 1713 &unused_mask);
1685 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1714 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1686 scrollbar_size ()); 1715 scrollBar.size ());
1687 want_refresh = 1; 1716 want_refresh = 1;
1688 scrollbar_show (1); 1717 scrollBar.show (1);
1689 } 1718 }
1690 break; 1719 break;
1691 } 1720 }
1692 1721
1693#if defined(CURSOR_BLINK) 1722#if defined(CURSOR_BLINK)
1694 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1723 if (ev.type == KeyPress)
1695 { 1724 cursor_blink_reset ();
1696 if (hidden_cursor)
1697 {
1698 hidden_cursor = 0;
1699 want_refresh = 1;
1700 }
1701
1702 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1703 }
1704#endif 1725#endif
1705 1726
1706#if defined(POINTER_BLANK) 1727#if defined(POINTER_BLANK)
1707 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1728 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1708 { 1729 {
… …
1714 1735
1715 if (ev.type == KeyPress && hidden_pointer == 0) 1736 if (ev.type == KeyPress && hidden_pointer == 0)
1716 pointer_blank (); 1737 pointer_blank ();
1717 } 1738 }
1718#endif 1739#endif
1719}
1720 1740
1721void 1741 refresh_check ();
1742}
1743
1744#if ENABLE_FRILLS
1745void ecb_cold
1746rxvt_term::set_urgency (bool enable)
1747{
1748 if (enable == urgency_hint)
1749 return;
1750
1751 if (XWMHints *h = XGetWMHints (dpy, parent))
1752 {
1753 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1754 XSetWMHints (dpy, parent, h);
1755 urgency_hint = enable;
1756 XFree (h);
1757 }
1758}
1759#endif
1760
1761void ecb_cold
1722rxvt_term::focus_in () 1762rxvt_term::focus_in ()
1723{ 1763{
1724 if (!focus) 1764 if (!focus)
1725 { 1765 {
1726 focus = 1; 1766 focus = 1;
1727 want_refresh = 1; 1767 want_refresh = 1;
1728 1768
1729 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1730
1731#if USE_XIM 1769#if USE_XIM
1732 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1733 { 1771 {
1734 IMSetPosition (); 1772 im_set_position ();
1735 XSetICFocus (Input_Context); 1773 XSetICFocus (Input_Context);
1736 } 1774 }
1737#endif 1775#endif
1738#if CURSOR_BLINK 1776#if CURSOR_BLINK
1739 if (option (Opt_cursorBlink)) 1777 if (option (Opt_cursorBlink))
1740 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1778 cursor_blink_ev.again ();
1741#endif 1779#endif
1742#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1743 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1744 { 1782 {
1745 pix_colors = pix_colors_focused; 1783 pix_colors = pix_colors_focused;
1746 scr_recolour (); 1784 scr_recolor ();
1747 } 1785 }
1748#endif 1786#endif
1749#if ENABLE_FRILLS 1787#if ENABLE_FRILLS
1750 if (option (Opt_urgentOnBell)) 1788 if (option (Opt_urgentOnBell))
1751 { 1789 set_urgency (0);
1752 XWMHints *h;
1753
1754 h = XGetWMHints(dpy, parent[0]);
1755 if (h != NULL)
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints(dpy, parent[0], h);
1759 }
1760 }
1761#endif 1790#endif
1762 }
1763}
1764 1791
1765void 1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1793 }
1794}
1795
1796void ecb_cold
1766rxvt_term::focus_out () 1797rxvt_term::focus_out ()
1767{ 1798{
1768 if (focus) 1799 if (focus)
1769 { 1800 {
1770 focus = 0; 1801 focus = 0;
1771 want_refresh = 1; 1802 want_refresh = 1;
1772 1803
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1804#if ENABLE_FRILLS
1774 1805 if (option (Opt_urgentOnBell))
1806 set_urgency (0);
1807#endif
1775#if ENABLE_FRILLS || ISO_14755 1808#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf) 1809 if (iso14755buf)
1777 { 1810 {
1778 iso14755buf = 0; 1811 iso14755buf = 0;
1779# if ISO_14755 1812# if ISO_14755
… …
1786 XUnsetICFocus (Input_Context); 1819 XUnsetICFocus (Input_Context);
1787#endif 1820#endif
1788#if CURSOR_BLINK 1821#if CURSOR_BLINK
1789 if (option (Opt_cursorBlink)) 1822 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1823 cursor_blink_ev.stop ();
1824
1791 hidden_cursor = 0; 1825 hidden_cursor = 0;
1792#endif 1826#endif
1793#if OFF_FOCUS_FADING 1827#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1828 if (rs[Rs_fade])
1795 { 1829 {
1796 pix_colors = pix_colors_unfocused; 1830 pix_colors = pix_colors_unfocused;
1797 scr_recolour (); 1831 scr_recolor ();
1798 } 1832 }
1799#endif 1833#endif
1800 }
1801}
1802 1834
1803void 1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 }
1837}
1838
1839void ecb_cold
1804rxvt_term::update_fade_color (unsigned int idx) 1840rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1805{ 1841{
1806#if OFF_FOCUS_FADING 1842#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1843 if (rs[Rs_fade])
1808 { 1844 {
1845 if (!first_time)
1846 pix_colors_focused [idx].free (this);
1847
1809 rgba c; 1848 rgba c;
1810 pix_colors [Color_fade].get (c); 1849 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1850 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 } 1851 }
1813#endif 1852#endif
1814} 1853}
1815 1854
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL 1855#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1817void 1856void ecb_hot
1818rxvt_term::rootwin_cb (XEvent &ev) 1857rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1858{
1820 make_current (); 1859 make_current ();
1821 1860
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1861 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1862 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return; 1863 return;
1825 1864
1826# if ENABLE_TRANSPARENCY
1827 switch (ev.type) 1865 switch (ev.type)
1828 { 1866 {
1829 case PropertyNotify: 1867 case PropertyNotify:
1830 /* 1868 /*
1831 * if user used some Esetroot compatible prog to set the root bg, 1869 * if user used some Esetroot compatible prog to set the root bg,
1832 * use the property to determine the pixmap. We use it later on. 1870 * use the property to determine the pixmap. We use it later on.
1833 */ 1871 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1872 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1873 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1874 {
1837 bgPixmap.set_root_pixmap (); 1875#if BG_IMAGE_FROM_ROOT
1838 bgPixmap.render (); 1876 if (option (Opt_transparent))
1877 {
1878 rxvt_img::new_from_root (this)->replace (root_img);
1879 update_background ();
1880 }
1881#endif
1882 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1839 } 1883 }
1884
1840 break; 1885 break;
1841 } 1886 }
1842# endif 1887
1888 refresh_check ();
1843} 1889}
1844#endif 1890#endif
1845 1891
1846void 1892void
1847rxvt_term::button_press (XButtonEvent &ev) 1893rxvt_term::button_press (XButtonEvent &ev)
… …
1868 iso14755_54 (ev.x, ev.y); 1914 iso14755_54 (ev.x, ev.y);
1869 return; 1915 return;
1870 } 1916 }
1871#endif 1917#endif
1872 1918
1873 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1919 clickintime = ev.time - MEvent.time < multiClickTime;
1874 1920
1875 if (reportmode) 1921 if (reportmode)
1876 { 1922 {
1877 /* mouse report from vt window */ 1923 /* mouse report from vt window */
1878 /* save the xbutton state (for ButtonRelease) */ 1924 /* save the xbutton state (for ButtonRelease) */
1879 MEvent.state = ev.state; 1925 MEvent.state = ev.state;
1880#ifdef MOUSE_REPORT_DOUBLECLICK 1926#ifdef MOUSE_REPORT_DOUBLECLICK
1881 if (ev.button == MEvent.button && clickintime) 1927 if (ev.button == MEvent.button && clickintime)
1882 { 1928 {
1883 /* same button, within alloted time */ 1929 /* same button, within allowed time */
1884 MEvent.clicks++; 1930 MEvent.clicks++;
1885 1931
1886 if (MEvent.clicks > 1) 1932 if (MEvent.clicks > 1)
1887 { 1933 {
1888 /* only report double clicks */ 1934 /* only report double clicks */
… …
1902 mouse_report (ev); 1948 mouse_report (ev);
1903 } 1949 }
1904#else 1950#else
1905 MEvent.button = ev.button; 1951 MEvent.button = ev.button;
1906 mouse_report (ev); 1952 mouse_report (ev);
1907#endif /* MOUSE_REPORT_DOUBLECLICK */ 1953#endif /* MOUSE_REPORT_DOUBLECLICK */
1908 1954
1909 } 1955 }
1910 else 1956 else
1911 { 1957 {
1912 if (ev.button != MEvent.button) 1958 if (ev.button != MEvent.button)
… …
1960 } 2006 }
1961 2007
1962 /* 2008 /*
1963 * Scrollbar window processing of button press 2009 * Scrollbar window processing of button press
1964 */ 2010 */
1965 if (isScrollbarWindow (ev.window)) 2011 if (scrollBar.state && ev.window == scrollBar.win)
1966 { 2012 {
1967 scrollBar.setIdle (); 2013 page_dirn direction = NO_DIR;
2014
2015 if (scrollBar.upButton (ev.y))
2016 direction = UP; /* up */
2017 else if (scrollBar.dnButton (ev.y))
2018 direction = DN; /* down */
2019
2020 scrollBar.state = SB_STATE_IDLE;
1968 /* 2021 /*
1969 * Rxvt-style scrollbar: 2022 * Rxvt-style scrollbar:
1970 * move up if mouse is above slider 2023 * move up if mouse is above slider
1971 * move dn if mouse is below slider 2024 * move dn if mouse is below slider
1972 * 2025 *
… …
1981 /* 2034 /*
1982 * Mouse report disabled scrollbar: 2035 * Mouse report disabled scrollbar:
1983 * arrow buttons - send up/down 2036 * arrow buttons - send up/down
1984 * click on scrollbar - send pageup/down 2037 * click on scrollbar - send pageup/down
1985 */ 2038 */
1986 if ((scrollBar.style == R_SB_NEXT 2039 if (direction == UP)
1987 && scrollbarnext_upButton (ev.y))
1988 || (scrollBar.style == R_SB_RXVT
1989 && scrollbarrxvt_upButton (ev.y)))
1990 tt_printf ("\033[A"); 2040 tt_printf ("\033[A");
1991 else if ((scrollBar.style == R_SB_NEXT 2041 else if (direction == DN)
1992 && scrollbarnext_dnButton (ev.y))
1993 || (scrollBar.style == R_SB_RXVT
1994 && scrollbarrxvt_dnButton (ev.y)))
1995 tt_printf ("\033[B"); 2042 tt_printf ("\033[B");
1996 else 2043 else
1997 switch (ev.button) 2044 switch (ev.button)
1998 { 2045 {
1999 case Button2: 2046 case Button2:
… …
2006 tt_printf ("\033[5~"); 2053 tt_printf ("\033[5~");
2007 break; 2054 break;
2008 } 2055 }
2009 } 2056 }
2010 else 2057 else
2011#endif /* NO_SCROLLBAR_REPORT */ 2058#endif /* NO_SCROLLBAR_REPORT */
2012
2013 {
2014 char upordown = 0;
2015
2016 if (scrollBar.style == R_SB_NEXT)
2017 { 2059 {
2018 if (scrollbarnext_upButton (ev.y)) 2060 if (direction != NO_DIR)
2019 upordown = -1; /* up */
2020 else if (scrollbarnext_dnButton (ev.y))
2021 upordown = 1; /* down */
2022 }
2023 else if (scrollBar.style == R_SB_RXVT)
2024 {
2025 if (scrollbarrxvt_upButton (ev.y))
2026 upordown = -1; /* up */
2027 else if (scrollbarrxvt_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 if (upordown)
2031 { 2061 {
2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2062#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2063 if (!cont_scroll_ev.is_active ())
2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2064 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2034#endif 2065#endif
2035 if (scr_page (upordown < 0 ? UP : DN, 1)) 2066 if (scr_page (direction, 1))
2036 { 2067 {
2037 if (upordown < 0) 2068 if (direction == UP)
2038 scrollBar.setUp (); 2069 scrollBar.state = SB_STATE_UP;
2039 else 2070 else
2040 scrollBar.setDn (); 2071 scrollBar.state = SB_STATE_DOWN;
2041 } 2072 }
2042 } 2073 }
2043 else 2074 else
2044 switch (ev.button) 2075 switch (ev.button)
2045 { 2076 {
2046 case Button2: 2077 case Button2:
2047 switch (scrollbar_align) 2078 switch (scrollBar.align)
2048 { 2079 {
2049 case R_SB_ALIGN_TOP: 2080 case SB_ALIGN_TOP:
2050 csrO = 0; 2081 csrO = 0;
2051 break; 2082 break;
2052 case R_SB_ALIGN_CENTRE: 2083 case SB_ALIGN_CENTRE:
2053 csrO = (scrollBar.bot - scrollBar.top) / 2; 2084 csrO = (scrollBar.bot - scrollBar.top) / 2;
2054 break; 2085 break;
2055 case R_SB_ALIGN_BOTTOM: 2086 case SB_ALIGN_BOTTOM:
2056 csrO = scrollBar.bot - scrollBar.top; 2087 csrO = scrollBar.bot - scrollBar.top;
2057 break; 2088 break;
2058 } 2089 }
2059 2090
2060 if (scrollBar.style == R_SB_XTERM 2091 if (scrollBar.style == SB_STYLE_XTERM
2061 || scrollbar_above_slider (ev.y) 2092 || scrollBar.above_slider (ev.y)
2062 || scrollbar_below_slider (ev.y)) 2093 || scrollBar.below_slider (ev.y))
2063 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2094 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2064 2095
2065 scrollBar.setMotion (); 2096 scrollBar.state = SB_STATE_MOTION;
2066 break; 2097 break;
2067 2098
2068 case Button1: 2099 case Button1:
2069 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2100 if (scrollBar.align == SB_ALIGN_CENTRE)
2070 csrO = ev.y - scrollBar.top; 2101 csrO = ev.y - scrollBar.top;
2071 /* FALLTHROUGH */ 2102 /* FALLTHROUGH */
2072 2103
2073 case Button3: 2104 case Button3:
2074 if (scrollBar.style != R_SB_XTERM) 2105 if (scrollBar.style != SB_STYLE_XTERM)
2075 { 2106 {
2076 if (scrollbar_above_slider (ev.y)) 2107 if (scrollBar.above_slider (ev.y))
2077# ifdef RXVT_SCROLL_FULL 2108# ifdef RXVT_SCROLL_FULL
2078 scr_page (UP, nrow - 1); 2109 scr_page (UP, nrow - 1);
2079# else 2110# else
2080 scr_page (UP, nrow / 4); 2111 scr_page (UP, nrow / 4);
2081# endif 2112# endif
2082 else if (scrollbar_below_slider (ev.y)) 2113 else if (scrollBar.below_slider (ev.y))
2083# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2084 scr_page (DN, nrow - 1); 2115 scr_page (DN, nrow - 1);
2085# else 2116# else
2086 scr_page (DN, nrow / 4); 2117 scr_page (DN, nrow / 4);
2087# endif 2118# endif
2088 else 2119 else
2089 scrollBar.setMotion (); 2120 scrollBar.state = SB_STATE_MOTION;
2090 } 2121 }
2091 else 2122 else
2092 { 2123 {
2093 scr_page ((ev.button == Button1 ? DN : UP), 2124 scr_page ((ev.button == Button1 ? DN : UP),
2094 (nrow 2125 (nrow
2095 * scrollbar_position (ev.y) 2126 * scrollBar.position (ev.y)
2096 / scrollbar_size ())); 2127 / scrollBar.size ()));
2097 } 2128 }
2098 2129
2099 break; 2130 break;
2100 } 2131 }
2101 } 2132 }
… …
2111 2142
2112 csrO = 0; /* reset csr Offset */ 2143 csrO = 0; /* reset csr Offset */
2113 if (!bypass_keystate) 2144 if (!bypass_keystate)
2114 reportmode = !! (priv_modes & PrivMode_mouse_report); 2145 reportmode = !! (priv_modes & PrivMode_mouse_report);
2115 2146
2116 if (scrollbar_isUpDn ()) 2147 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2117 { 2148 {
2118 scrollBar.setIdle (); 2149 scrollBar.state = SB_STATE_IDLE;
2119 scrollbar_show (0); 2150 scrollBar.show (0);
2120 } 2151 }
2121 2152
2122#ifdef SELECTION_SCROLLING 2153#ifdef SELECTION_SCROLLING
2123 if (sel_scroll_ev.active)
2124 sel_scroll_ev.stop(); 2154 sel_scroll_ev.stop();
2125#endif 2155#endif
2126 2156
2127 if (ev.window == vt) 2157 if (ev.window == vt)
2128 { 2158 {
2129 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2159 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2144#ifdef MOUSE_REPORT_DOUBLECLICK 2174#ifdef MOUSE_REPORT_DOUBLECLICK
2145 /* only report the release of 'slow' single clicks */ 2175 /* only report the release of 'slow' single clicks */
2146 if (MEvent.button != AnyButton 2176 if (MEvent.button != AnyButton
2147 && (ev.button != MEvent.button 2177 && (ev.button != MEvent.button
2148 || (ev.time - MEvent.time 2178 || (ev.time - MEvent.time
2149 > MULTICLICK_TIME / 2))) 2179 > multiClickTime / 2)))
2150 { 2180 {
2151 MEvent.clicks = 0; 2181 MEvent.clicks = 0;
2152 MEvent.button = AnyButton; 2182 MEvent.button = AnyButton;
2153 mouse_report (ev); 2183 mouse_report (ev);
2154 } 2184 }
2155#else /* MOUSE_REPORT_DOUBLECLICK */ 2185#else /* MOUSE_REPORT_DOUBLECLICK */
2156 MEvent.button = AnyButton; 2186 MEvent.button = AnyButton;
2157 mouse_report (ev); 2187 mouse_report (ev);
2158#endif /* MOUSE_REPORT_DOUBLECLICK */ 2188#endif /* MOUSE_REPORT_DOUBLECLICK */
2159 return; 2189 return;
2160 } 2190 }
2161 2191
2162 /* 2192 /*
2163 * dumb hack to compensate for the failure of click-and-drag 2193 * dumb hack to compensate for the failure of click-and-drag
… …
2174 case Button3: 2204 case Button3:
2175 selection_make (ev.time); 2205 selection_make (ev.time);
2176 break; 2206 break;
2177 2207
2178 case Button2: 2208 case Button2:
2179 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2209 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2210 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2181 break; 2211 break;
2182 2212
2183#ifdef MOUSE_WHEEL 2213#ifdef MOUSE_WHEEL
2184 case Button4: 2214 case Button4:
2185 case Button5: 2215 case Button5:
2186 { 2216 {
2187 int i; 2217 int lines;
2188 page_dirn v; 2218 page_dirn dirn;
2189 2219
2190 v = ev.button == Button4 ? UP : DN; 2220 dirn = ev.button == Button4 ? UP : DN;
2191 2221
2192 if (ev.state & ShiftMask) 2222 if (ev.state & ShiftMask)
2193 i = 1; 2223 lines = 1;
2194 else if (option (Opt_mouseWheelScrollPage)) 2224 else if (option (Opt_mouseWheelScrollPage))
2195 i = nrow - 1; 2225 lines = nrow - 1;
2196 else 2226 else
2197 i = 5; 2227 lines = 5;
2198 2228
2199# ifdef MOUSE_SLIP_WHEELING 2229# ifdef MOUSE_SLIP_WHEELING
2200 if (ev.state & ControlMask) 2230 if (ev.state & ControlMask)
2201 { 2231 {
2202 mouse_slip_wheel_speed += v ? -1 : 1; 2232 mouse_slip_wheel_speed += dirn;
2203 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2233 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2204 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2205 2234
2206 if (slip_wheel_ev.at < NOW) 2235 if (!slip_wheel_ev.is_active ())
2207 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2236 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2208
2209 slip_wheel_ev.start ();
2210 } 2237 }
2211 else 2238 else
2239# endif
2212 { 2240 {
2213# endif
2214 scr_page (v, i); 2241 scr_page (dirn, lines);
2215 scrollbar_show (1); 2242 scrollBar.show (1);
2216# ifdef MOUSE_SLIP_WHEELING
2217 } 2243 }
2218# endif
2219 } 2244 }
2220 break; 2245 break;
2221#endif 2246#endif
2222 } 2247 }
2223 } 2248 }
2224} 2249}
2225 2250
2226/*}}} */ 2251/*}}} */
2227 2252
2228bool 2253void ecb_hot
2229rxvt_term::cmd_parse () 2254rxvt_term::cmd_parse ()
2230{ 2255{
2231 bool flag = false;
2232 wchar_t ch = NOCHAR; 2256 wchar_t ch = NOCHAR;
2233 char *seq_begin; // remember start of esc-sequence here 2257 char *seq_begin; // remember start of esc-sequence here
2234 2258
2235 for (;;) 2259 for (;;)
2236 { 2260 {
2237 if (ch == NOCHAR) 2261 if (ecb_unlikely (ch == NOCHAR))
2238 { 2262 {
2239 seq_begin = cmdbuf_ptr; 2263 seq_begin = cmdbuf_ptr;
2240 ch = next_char (); 2264 ch = next_char ();
2241 2265
2242 if (ch == NOCHAR) 2266 if (ch == NOCHAR)
2243 break; 2267 break;
2244 } 2268 }
2245 2269
2246 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2270 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2247 { 2271 {
2248 if (!seen_input) 2272 if (ecb_unlikely (!seen_input))
2249 { 2273 {
2250 seen_input = 1; 2274 seen_input = 1;
2251 // many badly-written programs (e.g. jed) contain a race condition: 2275 // many badly-written programs (e.g. jed) contain a race condition:
2252 // they first read the screensize and then install a SIGWINCH handler. 2276 // they first read the screensize and then install a SIGWINCH handler.
2253 // some window managers resize the window early, and these programs 2277 // some window managers resize the window early, and these programs
… …
2266 wchar_t *str = buf; 2290 wchar_t *str = buf;
2267 wchar_t *eol = str + min (ncol, UBUFSIZ); 2291 wchar_t *eol = str + min (ncol, UBUFSIZ);
2268 2292
2269 for (;;) 2293 for (;;)
2270 { 2294 {
2271 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2295 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2272 break; 2296 break;
2273 2297
2274 *str++ = ch; 2298 *str++ = ch;
2275 2299
2276 if (ch == C0_LF || str >= eol) 2300 if (ecb_unlikely (ch == C0_LF || str >= eol))
2277 { 2301 {
2278 if (ch == C0_LF) 2302 if (ch == C0_LF)
2279 nlines++; 2303 nlines++;
2280 2304
2281 refresh_count++; 2305 refresh_count++;
2282 2306
2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2307 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2284 { 2308 {
2285 refresh_count = 0; 2309 refresh_count = 0;
2286 2310
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2311 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2288 { 2312 {
2289 refreshnow = true; 2313 refreshnow = true;
2290 ch = NOCHAR; 2314 ch = NOCHAR;
2291 break; 2315 break;
2292 } 2316 }
… …
2330 * What the heck we'll cheat and only refresh less than every page-full. 2354 * What the heck we'll cheat and only refresh less than every page-full.
2331 * if skipScroll is enabled. 2355 * if skipScroll is enabled.
2332 */ 2356 */
2333 if (refreshnow) 2357 if (refreshnow)
2334 { 2358 {
2335 flag = true;
2336 scr_refresh (); 2359 scr_refresh ();
2337 want_refresh = 1; 2360 want_refresh = 1;
2338 } 2361 }
2339
2340 } 2362 }
2341 else 2363 else
2342 { 2364 {
2343 try 2365 try
2344 { 2366 {
… …
2352 } 2374 }
2353 2375
2354 ch = NOCHAR; 2376 ch = NOCHAR;
2355 } 2377 }
2356 } 2378 }
2357
2358 return flag;
2359} 2379}
2360 2380
2361// read the next character 2381// read the next character
2362wchar_t 2382wchar_t ecb_hot
2363rxvt_term::next_char () NOTHROW 2383rxvt_term::next_char () NOTHROW
2364{ 2384{
2365 while (cmdbuf_ptr < cmdbuf_endp) 2385 while (cmdbuf_ptr < cmdbuf_endp)
2366 { 2386 {
2367 // assume 7-bit to be ascii ALWAYS 2387 // assume 7-bit to be ascii ALWAYS
2368 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2388 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2369 return *cmdbuf_ptr++; 2389 return *cmdbuf_ptr++;
2370 2390
2371 wchar_t wc; 2391 wchar_t wc;
2372 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2392 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2373 2393
… …
2377 cmdbuf_ptr = cmdbuf_endp; 2397 cmdbuf_ptr = cmdbuf_endp;
2378 break; 2398 break;
2379 } 2399 }
2380 2400
2381 if (len == (size_t)-1) 2401 if (len == (size_t)-1)
2402 {
2403 mbstate.reset (); // reset now undefined conversion state
2404 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2405 // in which case we "erroneously" return the next byte which might be valid.
2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2406 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2407 }
2383 2408
2384 // assume wchar == unicode 2409 // assume wchar == unicode
2385 cmdbuf_ptr += len; 2410 cmdbuf_ptr += len;
2386 return wc & UNICODE_MASK; 2411 return wc & UNICODE_MASK;
2387 } 2412 }
2388 2413
2389 return NOCHAR; 2414 return NOCHAR;
2390} 2415}
2391 2416
2392// read the next octet 2417// read the next octet
2393uint32_t 2418uint32_t ecb_hot
2394rxvt_term::next_octet () NOTHROW 2419rxvt_term::next_octet () NOTHROW
2395{ 2420{
2396 return cmdbuf_ptr < cmdbuf_endp 2421 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++ 2422 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR; 2423 : NOCHAR;
2399} 2424}
2400 2425
2401static class out_of_input out_of_input; 2426static class out_of_input out_of_input;
2402 2427
2403/* rxvt_cmd_getc () - Return next input character */ 2428wchar_t ecb_hot
2404/*
2405 * Return the next input character after first passing any keyboard input
2406 * to the command.
2407 */
2408wchar_t
2409rxvt_term::cmd_getc () THROW ((class out_of_input)) 2429rxvt_term::cmd_getc () THROW ((class out_of_input))
2410{ 2430{
2411 wchar_t c = next_char (); 2431 wchar_t c = next_char ();
2412 2432
2413 if (c == NOCHAR) 2433 if (c == NOCHAR)
2414 throw out_of_input; 2434 throw out_of_input;
2415 2435
2416 return c; 2436 return c;
2417} 2437}
2418 2438
2419uint32_t 2439uint32_t ecb_hot
2420rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2440rxvt_term::cmd_get8 () THROW ((class out_of_input))
2421{ 2441{
2422 uint32_t c = next_octet (); 2442 uint32_t c = next_octet ();
2423 2443
2424 if (c == NOCHAR) 2444 if (c == NOCHAR)
… …
2428} 2448}
2429 2449
2430/*{{{ print pipe */ 2450/*{{{ print pipe */
2431/*----------------------------------------------------------------------*/ 2451/*----------------------------------------------------------------------*/
2432#ifdef PRINTPIPE 2452#ifdef PRINTPIPE
2433FILE * 2453FILE * ecb_cold
2434rxvt_term::popen_printer () 2454rxvt_term::popen_printer ()
2435{ 2455{
2436 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2456 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2437 2457
2438 if (stream == NULL) 2458 if (stream == NULL)
2439 rxvt_warn ("can't open printer pipe, not printing.\n"); 2459 rxvt_warn ("can't open printer pipe, not printing.\n");
2440 2460
2441 return stream; 2461 return stream;
2442} 2462}
2443 2463
2444int 2464int ecb_cold
2445rxvt_term::pclose_printer (FILE *stream) 2465rxvt_term::pclose_printer (FILE *stream)
2446{ 2466{
2447 fflush (stream); 2467 fflush (stream);
2448 return pclose (stream); 2468 return pclose (stream);
2449} 2469}
2450 2470
2451/* 2471/*
2452 * simulate attached vt100 printer 2472 * simulate attached vt100 printer
2453 */ 2473 */
2454void 2474void ecb_cold
2455rxvt_term::process_print_pipe () 2475rxvt_term::process_print_pipe ()
2456{ 2476{
2457 int done; 2477 FILE *fd = popen_printer ();
2458 FILE *fd;
2459 2478
2460 if ((fd = popen_printer ()) == NULL) 2479 if (!fd)
2461 return; 2480 return;
2462 2481
2463 /* 2482 /*
2464 * Send all input to the printer until either ESC[4i or ESC[?4i 2483 * Send all input to the printer until either ESC[4i or ESC[?4i
2465 * is received. 2484 * is received.
2466 */ 2485 */
2467 for (done = 0; !done;) 2486 for (int done = 0; !done; )
2468 { 2487 {
2469 unsigned char buf[8]; 2488 unsigned char buf[8];
2470 unicode_t ch; 2489 unicode_t ch;
2471 unsigned int i, len; 2490 unsigned int i, len;
2472 2491
… …
2503 } 2522 }
2504 } 2523 }
2505 2524
2506 pclose_printer (fd); 2525 pclose_printer (fd);
2507} 2526}
2508#endif /* PRINTPIPE */ 2527#endif /* PRINTPIPE */
2509/*}}} */ 2528/*}}} */
2510 2529
2511/* *INDENT-OFF* */
2512enum { 2530enum {
2513 C1_40 = 0x40, 2531 C1_40 = 0x40,
2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2532 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2533 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2534 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2535 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2518}; 2536};
2519/* *INDENT-ON* */
2520 2537
2521/*{{{ process non-printing single characters */ 2538/*{{{ process non-printing single characters */
2522void 2539void ecb_hot
2523rxvt_term::process_nonprinting (unicode_t ch) 2540rxvt_term::process_nonprinting (unicode_t ch)
2524{ 2541{
2525 switch (ch) 2542 switch (ch)
2526 { 2543 {
2527 case C0_ESC: 2544 case C0_ESC:
… …
2557 scr_charset_choose (0); 2574 scr_charset_choose (0);
2558 break; 2575 break;
2559 2576
2560#ifdef EIGHT_BIT_CONTROLS 2577#ifdef EIGHT_BIT_CONTROLS
2561 // 8-bit controls 2578 // 8-bit controls
2562 case 0x90: /* DCS */ 2579 case 0x90: /* DCS */
2563 process_dcs_seq (); 2580 process_dcs_seq ();
2564 break; 2581 break;
2565 case 0x9b: /* CSI */ 2582 case 0x9b: /* CSI */
2566 process_csi_seq (); 2583 process_csi_seq ();
2567 break; 2584 break;
2568 case 0x9d: /* OSC */ 2585 case 0x9d: /* OSC */
2569 process_osc_seq (); 2586 process_osc_seq ();
2570 break; 2587 break;
2571#endif 2588#endif
2572 } 2589 }
2573} 2590}
2574/*}}} */ 2591/*}}} */
2575 2592
2576 2593
2577/*{{{ process VT52 escape sequences */ 2594/*{{{ process VT52 escape sequences */
2578void 2595void ecb_cold
2579rxvt_term::process_escape_vt52 (unicode_t ch) 2596rxvt_term::process_escape_vt52 (unicode_t ch)
2580{ 2597{
2581 int row, col; 2598 int row, col;
2582 2599
2583 switch (ch) 2600 switch (ch)
… …
2617 break; 2634 break;
2618 case 'Z': /* identify the terminal type */ 2635 case 'Z': /* identify the terminal type */
2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2636 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2620 break; 2637 break;
2621 case '<': /* turn off VT52 mode */ 2638 case '<': /* turn off VT52 mode */
2622 PrivMode (0, PrivMode_vt52); 2639 priv_modes &= ~PrivMode_vt52;
2623 break; 2640 break;
2624 case 'F': /* use special graphics character set */ 2641 case 'F': /* use special graphics character set */
2625 case 'G': /* use regular character set */ 2642 case 'G': /* use regular character set */
2626 /* unimplemented */ 2643 /* unimplemented */
2627 break; 2644 break;
… …
2633} 2650}
2634/*}}} */ 2651/*}}} */
2635 2652
2636 2653
2637/*{{{ process escape sequences */ 2654/*{{{ process escape sequences */
2638void 2655void ecb_hot
2639rxvt_term::process_escape_seq () 2656rxvt_term::process_escape_seq ()
2640{ 2657{
2641 unicode_t ch = cmd_getc (); 2658 unicode_t ch = cmd_getc ();
2642 2659
2643 if (priv_modes & PrivMode_vt52) 2660 if (priv_modes & PrivMode_vt52)
… …
2646 return; 2663 return;
2647 } 2664 }
2648 2665
2649 switch (ch) 2666 switch (ch)
2650 { 2667 {
2651 /* case 1: do_tek_mode (); break; */
2652 case '#': 2668 case '#':
2653 if (cmd_getc () == '8') 2669 if (cmd_getc () == '8')
2654 scr_E (); 2670 scr_E ();
2655 break; 2671 break;
2656 case '(': 2672 case '(':
… …
2679#if !ENABLE_MINIMAL 2695#if !ENABLE_MINIMAL
2680 case '9': 2696 case '9':
2681 scr_forwardindex (); 2697 scr_forwardindex ();
2682 break; 2698 break;
2683#endif 2699#endif
2700 // DECPAM/DECPNM
2684 case '=': 2701 case '=':
2702 priv_modes |= PrivMode_aplKP;
2703 break;
2685 case '>': 2704 case '>':
2686 PrivMode ((ch == '='), PrivMode_aplKP); 2705 priv_modes &= ~PrivMode_aplKP;
2687 break; 2706 break;
2688 2707
2689 case C1_40: 2708 case C1_40:
2690 cmd_getc (); 2709 cmd_getc ();
2691 break; 2710 break;
… …
2695 2714
2696 /* 8.3.87: NEXT LINE */ 2715 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2716 case C1_NEL: /* ESC E */
2698 { 2717 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2718 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2719 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2701 } 2720 }
2702 break; 2721 break;
2703 2722
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2723 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2724 case C1_ESA: /* ESC G */
2706 process_graphics (); 2725 // used by original rxvt for rob nations own graphics mode
2726 if (cmd_getc () == 'Q')
2727 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2707 break; 2728 break;
2708 2729
2709 /* 8.3.63: CHARACTER TABULATION SET */ 2730 /* 8.3.63: CHARACTER TABULATION SET */
2710 case C1_HTS: /* ESC H */ 2731 case C1_HTS: /* ESC H */
2711 scr_set_tab (1); 2732 scr_set_tab (1);
… …
2715 case C1_RI: /* ESC M */ 2736 case C1_RI: /* ESC M */
2716 scr_index (DN); 2737 scr_index (DN);
2717 break; 2738 break;
2718 2739
2719 /* 8.3.142: SINGLE-SHIFT TWO */ 2740 /* 8.3.142: SINGLE-SHIFT TWO */
2720 /*case C1_SS2: scr_single_shift (2); break; */ 2741 /* case C1_SS2: break; */
2721 2742
2722 /* 8.3.143: SINGLE-SHIFT THREE */ 2743 /* 8.3.143: SINGLE-SHIFT THREE */
2723 /*case C1_SS3: scr_single_shift (3); break; */ 2744 /* case C1_SS3: break; */
2724 2745
2725 /* 8.3.27: DEVICE CONTROL STRING */ 2746 /* 8.3.27: DEVICE CONTROL STRING */
2726 case C1_DCS: /* ESC P */ 2747 case C1_DCS: /* ESC P */
2727 process_dcs_seq (); 2748 process_dcs_seq ();
2728 break; 2749 break;
… …
2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2751 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2731 case C1_SCI: /* ESC Z */ 2752 case C1_SCI: /* ESC Z */
2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2753 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2733 break; /* steal obsolete ESC [ c */ 2754 break; /* steal obsolete ESC [ c */
2734 2755
2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2756 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2736 case C1_CSI: /* ESC [ */ 2757 case C1_CSI: /* ESC [ */
2737 process_csi_seq (); 2758 process_csi_seq ();
2738 break; 2759 break;
2739 2760
2740 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2761 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2741 case C1_OSC: /* ESC ] */ 2762 case C1_OSC: /* ESC ] */
2742 process_osc_seq (); 2763 process_osc_seq ();
2743 break; 2764 break;
2744 2765
2745 /* 8.3.106: RESET TO INITIAL STATE */ 2766 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2746 case 'c': 2767 case 'c':
2747 mbstate.reset (); 2768 mbstate.reset ();
2748 scr_poweron (); 2769 scr_poweron ();
2749 scrollbar_show (1); 2770 scrollBar.show (1);
2750 break; 2771 break;
2751 2772
2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2773 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2753 case 'n': 2774 case 'n':
2754 scr_charset_choose (2); 2775 scr_charset_choose (2);
… …
2761 } 2782 }
2762} 2783}
2763/*}}} */ 2784/*}}} */
2764 2785
2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2786/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2766/* *INDENT-OFF* */
2767enum { 2787enum {
2768 CSI_ICH = 0x40, 2788 CSI_ICH = 0x40,
2769 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2789 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2770 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2790 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2771 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2791 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2794 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2795 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2796 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2777}; 2797};
2778 2798
2779#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2799#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2800 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2801 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2782#define get_byte_array_bit(array, bit) \ 2802#define get_byte_array_bit(array, bit) \
2783 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2803 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2784 2804
2785const unsigned char csi_defaults[] = 2805static const unsigned char csi_defaults[] =
2786 { 2806 {
2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2807 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2808 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2809 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2810 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2791 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2811 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2792 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2812 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2793 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2813 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2794 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2814 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2795 }; 2815 };
2796/* *INDENT-ON* */
2797 2816
2798void 2817void ecb_hot
2799rxvt_term::process_csi_seq () 2818rxvt_term::process_csi_seq ()
2800{ 2819{
2801 unicode_t ch, priv, i; 2820 unicode_t ch, priv, prev_ch, i;
2802 unsigned int nargs, p; 2821 unsigned int nargs, p;
2803 int n, ndef; 2822 int n, ndef;
2804 int arg[ESC_ARGS]; 2823 int arg[ESC_ARGS] = { };
2805 2824
2806 memset (arg, 0, sizeof (arg));
2807 nargs = 0; 2825 nargs = 0;
2808 2826
2809 priv = 0; 2827 priv = 0;
2810 ch = cmd_getc (); 2828 ch = cmd_getc ();
2811 if (ch >= '<' && ch <= '?') 2829 if ((ch >= '<' && ch <= '?') || ch == '!')
2830 {
2812 { /* '<' '=' '>' '?' */ 2831 /* '<' '=' '>' '?' '!' */
2813 priv = ch; 2832 priv = ch;
2814 ch = cmd_getc (); 2833 ch = cmd_getc ();
2815 } 2834 }
2816 2835
2836 prev_ch = 0;
2817 /* read any numerical arguments */ 2837 /* read any numerical arguments */
2818 for (n = -1; ch < CSI_ICH; ) 2838 for (n = -1; ch < CSI_ICH; )
2819 { 2839 {
2820 if (isdigit (ch)) 2840 if (isdigit (ch))
2821 { 2841 {
… …
2831 n = -1; 2851 n = -1;
2832 } 2852 }
2833 else if (IS_CONTROL (ch)) 2853 else if (IS_CONTROL (ch))
2834 process_nonprinting (ch); 2854 process_nonprinting (ch);
2835 2855
2856 prev_ch = ch;
2836 ch = cmd_getc (); 2857 ch = cmd_getc ();
2837 } 2858 }
2838 2859
2839 if (ch > CSI_7F) 2860 if (ch > CSI_7F)
2840 return; 2861 return;
… …
2860 { 2881 {
2861 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2882 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2862 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2883 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2863 // 2884 //
2864 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2885 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2865 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2886 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2866 // that we do not support xterm mouse reporting (should be 95 when we do). 2887 // versions.
2867 // 2888 //
2868 tt_printf ("\033[>%d;94;0c", 'U'); 2889 tt_printf ("\033[>%d;95;0c", 'U');
2869 } 2890 }
2870 break; 2891 break;
2892
2871 case '?': 2893 case '?':
2872 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2894 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2873 process_terminal_mode (ch, priv, nargs, arg); 2895 process_terminal_mode (ch, priv, nargs, arg);
2874 break; 2896 break;
2897
2898 case '!':
2899 if (ch == CSI_70)
2900 {
2901 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2902 scr_soft_reset ();
2903
2904 static const int pm_h[] = { 7, 25 };
2905 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2906
2907 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2908 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2875 } 2909 }
2910 break;
2911 }
2912
2876 return; 2913 return;
2877 } 2914 }
2878 2915
2879 switch (ch) 2916 switch (ch)
2880 { 2917 {
… …
2894 } 2931 }
2895 break; 2932 break;
2896#endif 2933#endif
2897 2934
2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2935 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2899 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2936 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2900 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
2901 /* FALLTHROUGH */ 2938 /* FALLTHROUGH */
2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2939 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2903 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2940 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2904 scr_gotorc (arg[0], 0, RELATIVE); 2941 scr_gotorc (arg[0], 0, RELATIVE);
2905 break; 2942 break;
2906 2943
2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2944 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2945 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3058 scr_insert_mode (1); 3095 scr_insert_mode (1);
3059 else if (arg[0] == 20) 3096 else if (arg[0] == 20)
3060 priv_modes |= PrivMode_LFNL; 3097 priv_modes |= PrivMode_LFNL;
3061 break; 3098 break;
3062 3099
3100 case CSI_71: // DECSCUSR: set cursor style
3101 if (prev_ch == ' ')
3102 set_cursor_style (arg[0]);
3103 break;
3104
3063 /* 3105 /*
3064 * PRIVATE USE beyond this point. All CSI_7? sequences here 3106 * PRIVATE USE beyond this point. All CSI_7? sequences here
3065 */ 3107 */
3066 case CSI_72: /* DECSTBM: set top and bottom margins */ 3108 case CSI_72: /* DECSTBM: set top and bottom margins */
3067 if (nargs == 1) 3109 if (nargs == 1)
… …
3095 } 3137 }
3096} 3138}
3097/*}}} */ 3139/*}}} */
3098 3140
3099#if !ENABLE_MINIMAL 3141#if !ENABLE_MINIMAL
3100/* ARGSUSED */
3101void 3142void
3102rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3143rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3103{ 3144{
3104 int x, y; 3145 int x, y;
3105 XWindowAttributes wattr; 3146 XWindowAttributes wattr;
… …
3114 { 3155 {
3115 /* 3156 /*
3116 * commands 3157 * commands
3117 */ 3158 */
3118 case 1: /* deiconify window */ 3159 case 1: /* deiconify window */
3119 XMapWindow (dpy, parent[0]); 3160 XMapWindow (dpy, parent);
3120 break; 3161 break;
3121 case 2: /* iconify window */ 3162 case 2: /* iconify window */
3122 XIconifyWindow (dpy, parent[0], display->screen); 3163 XIconifyWindow (dpy, parent, display->screen);
3123 break; 3164 break;
3124 case 3: /* set position (pixels) */ 3165 case 3: /* set position (pixels) */
3125 XMoveWindow (dpy, parent[0], args[1], args[2]); 3166 XMoveWindow (dpy, parent, args[1], args[2]);
3126 break; 3167 break;
3127 case 4: /* set size (pixels) */ 3168 case 4: /* set size (pixels) */
3128 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3169 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3129 break; 3170 break;
3130 case 5: /* raise window */ 3171 case 5: /* raise window */
3131 XRaiseWindow (dpy, parent[0]); 3172 XRaiseWindow (dpy, parent);
3132 break; 3173 break;
3133 case 6: /* lower window */ 3174 case 6: /* lower window */
3134 XLowerWindow (dpy, parent[0]); 3175 XLowerWindow (dpy, parent);
3135 break; 3176 break;
3136 case 7: /* refresh window */ 3177 case 7: /* refresh window */
3137 scr_touch (true); 3178 scr_touch (true);
3138 break; 3179 break;
3139 case 8: /* set size (chars) */ 3180 case 8: /* set size (chars) */
… …
3142 break; 3183 break;
3143 3184
3144 //case 9: NYI, TODO, restore maximized window or maximize window 3185 //case 9: NYI, TODO, restore maximized window or maximize window
3145 default: 3186 default:
3146 if (args[0] >= 24) /* set height (chars) */ 3187 if (args[0] >= 24) /* set height (chars) */
3147 set_widthheight ((unsigned int)width, 3188 set_widthheight ((unsigned int)vt_width,
3148 (unsigned int) (args[1] * fheight)); 3189 (unsigned int) (args[1] * fheight));
3149 break; 3190 break;
3150 3191
3151 /* 3192 /*
3152 * reports - some output format copied from XTerm 3193 * reports - some output format copied from XTerm
3153 */ 3194 */
3154 case 11: /* report window state */ 3195 case 11: /* report window state */
3155 XGetWindowAttributes (dpy, parent[0], &wattr); 3196 XGetWindowAttributes (dpy, parent, &wattr);
3156 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3197 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3157 break; 3198 break;
3158 case 13: /* report window position */ 3199 case 13: /* report window position */
3159 XGetWindowAttributes (dpy, parent[0], &wattr); 3200 XGetWindowAttributes (dpy, parent, &wattr);
3160 XTranslateCoordinates (dpy, parent[0], wattr.root, 3201 XTranslateCoordinates (dpy, parent, wattr.root,
3161 -wattr.border_width, -wattr.border_width, 3202 -wattr.border_width, -wattr.border_width,
3162 &x, &y, &wdummy); 3203 &x, &y, &wdummy);
3163 tt_printf ("\033[3;%d;%dt", x, y); 3204 tt_printf ("\033[3;%d;%dt", x, y);
3164 break; 3205 break;
3165 case 14: /* report window size (pixels) */ 3206 case 14: /* report window size (pixels) */
3166 XGetWindowAttributes (dpy, parent[0], &wattr); 3207 XGetWindowAttributes (dpy, parent, &wattr);
3167 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3208 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3168 break; 3209 break;
3169 case 18: /* report text area size (chars) */ 3210 case 18: /* report text area size (chars) */
3170 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3211 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3171 break; 3212 break;
… …
3173 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3214 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3174 break; 3215 break;
3175 case 20: /* report icon label */ 3216 case 20: /* report icon label */
3176 { 3217 {
3177 char *s; 3218 char *s;
3178 XGetIconName (dpy, parent[0], &s); 3219 XGetIconName (dpy, parent, &s);
3179 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3220 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3180 XFree (s); 3221 XFree (s);
3181 } 3222 }
3182 break; 3223 break;
3183 case 21: /* report window title */ 3224 case 21: /* report window title */
3184 { 3225 {
3185 char *s; 3226 char *s;
3186 XFetchName (dpy, parent[0], &s); 3227 XFetchName (dpy, parent, &s);
3187 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 */
3188 XFree (s); 3229 XFree (s);
3189 } 3230 }
3190 break; 3231 break;
3191 } 3232 }
… …
3201rxvt_term::get_to_st (unicode_t &ends_how) 3242rxvt_term::get_to_st (unicode_t &ends_how)
3202{ 3243{
3203 unicode_t ch; 3244 unicode_t ch;
3204 bool seen_esc = false; 3245 bool seen_esc = false;
3205 unsigned int n = 0; 3246 unsigned int n = 0;
3206 wchar_t string[STRING_MAX]; 3247 wchar_t string[CBUFSIZ];
3207 3248
3208 while ((ch = cmd_getc ()) != NOCHAR) 3249 while ((ch = cmd_getc ()) != NOCHAR)
3209 { 3250 {
3210 if (seen_esc) 3251 if (seen_esc)
3211 { 3252 {
… …
3226 else if (ch < 0x20) 3267 else if (ch < 0x20)
3227 return NULL; /* other control character - exit */ 3268 return NULL; /* other control character - exit */
3228 3269
3229 seen_esc = false; 3270 seen_esc = false;
3230 3271
3231 if (n >= STRING_MAX - 1) 3272 if (n >= sizeof (string) - 1)
3232 // stop at some sane length 3273 // stop at some sane length
3233 return NULL; 3274 return NULL;
3234 3275
3235 string[n++] = ch; 3276 string[n++] = ch;
3236 } 3277 }
… …
3247 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3288 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3248 */ 3289 */
3249void 3290void
3250rxvt_term::process_dcs_seq () 3291rxvt_term::process_dcs_seq ()
3251{ 3292{
3252 char *s;
3253 unicode_t eh;
3254
3255 /* 3293 /*
3256 * Not handled yet 3294 * Not handled yet
3257 */ 3295 */
3296
3297 unicode_t eh;
3258 s = get_to_st (eh); 3298 char *s = get_to_st (eh);
3259 if (s) 3299 if (s)
3260 free (s); 3300 free (s);
3261 3301
3262 return; 3302 return;
3263} 3303}
… …
3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3307 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3268 */ 3308 */
3269void 3309void
3270rxvt_term::process_osc_seq () 3310rxvt_term::process_osc_seq ()
3271{ 3311{
3272 unicode_t ch, eh;
3273 int arg; 3312 int arg;
3274 3313
3275 ch = cmd_getc (); 3314 unicode_t ch = cmd_getc ();
3276 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3315 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3277 arg = arg * 10 + (ch - '0'); 3316 arg = arg * 10 + (ch - '0');
3278 3317
3279 if (ch == ';') 3318 if (ch == ';')
3280 { 3319 {
3320 unicode_t eh;
3281 char *s = get_to_st (eh); 3321 char *s = get_to_st (eh);
3282 3322
3283 if (s) 3323 if (s)
3284 { 3324 {
3285 process_xterm_seq (arg, s, eh); 3325 process_xterm_seq (arg, s, eh);
… …
3309 3349
3310/* 3350/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3351 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3312 */ 3352 */
3313void 3353void
3314rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3354rxvt_term::process_xterm_seq (int op, char *str, char resp)
3315{ 3355{
3316 int color; 3356 int color;
3317 char *buf, *name; 3357 char *buf, *name;
3318 bool query = str[0] == '?' && !str[1]; 3358 bool query = str[0] == '?' && !str[1];
3319 int saveop = op; 3359 int saveop = op;
… …
3346 unsigned long bytes_after; 3386 unsigned long bytes_after;
3347 unsigned char *value = 0; 3387 unsigned char *value = 0;
3348 const char *str = ""; 3388 const char *str = "";
3349 3389
3350 if (prop 3390 if (prop
3351 && XGetWindowProperty (dpy, parent[0], 3391 && XGetWindowProperty (dpy, parent,
3352 prop, 0, 1<<16, 0, AnyPropertyType, 3392 prop, 0, 1<<16, 0, AnyPropertyType,
3353 &actual_type, &actual_format, 3393 &actual_type, &actual_format,
3354 &nitems, &bytes_after, &value) == Success 3394 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None 3395 && actual_type != None
3356 && actual_format == 8) 3396 && actual_format == 8)
3357 str = (const char *)(value); 3397 str = (const char *)(value);
3358 3398
3359 tt_printf ("\033]%d;%s%c", op, str, resp); 3399 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3360 3400
3361 XFree (value); 3401 XFree (value);
3362 } 3402 }
3363 else 3403 else
3364 { 3404 {
3365 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3405 char *eq = strchr (str, '=');
3366 3406
3367 if (eq) 3407 if (eq)
3368 { 3408 {
3369 *eq = 0; 3409 *eq = 0;
3370 set_utf8_property (display->atom (str), eq + 1); 3410 set_utf8_property (display->atom (str), eq + 1);
3371 } 3411 }
3372 else 3412 else
3373 XDeleteProperty (dpy, parent[0], 3413 XDeleteProperty (dpy, parent,
3374 display->atom (str)); 3414 display->atom (str));
3375 } 3415 }
3376 break; 3416 break;
3377 3417
3378 case XTerm_Color: 3418 case XTerm_Color:
… …
3391 *buf++ = '\0'; 3431 *buf++ = '\0';
3392 3432
3393 process_color_seq (op, color, name, resp); 3433 process_color_seq (op, color, name, resp);
3394 } 3434 }
3395 break; 3435 break;
3436 case Rxvt_restoreFG:
3396 case XTerm_Color00: 3437 case XTerm_Color00:
3397 process_color_seq (op, Color_fg, str, resp); 3438 process_color_seq (op, Color_fg, str, resp);
3398 break; 3439 break;
3440 case Rxvt_restoreBG:
3399 case XTerm_Color01: 3441 case XTerm_Color01:
3400 process_color_seq (op, Color_bg, str, resp); 3442 process_color_seq (op, Color_bg, str, resp);
3401 break; 3443 break;
3402#ifndef NO_CURSORCOLOR 3444#ifndef NO_CURSORCOLOR
3403 case XTerm_Color_cursor: 3445 case XTerm_Color_cursor:
… …
3408 process_color_seq (op, Color_pointer_fg, str, resp); 3450 process_color_seq (op, Color_pointer_fg, str, resp);
3409 break; 3451 break;
3410 case XTerm_Color_pointer_bg: 3452 case XTerm_Color_pointer_bg:
3411 process_color_seq (op, Color_pointer_bg, str, resp); 3453 process_color_seq (op, Color_pointer_bg, str, resp);
3412 break; 3454 break;
3455#ifdef OPTION_HC
3456 case XTerm_Color_HC:
3457 process_color_seq (op, Color_HC, str, resp);
3458 break;
3459 case XTerm_Color_HTC:
3460 process_color_seq (op, Color_HTC, str, resp);
3461 break;
3462#endif
3413#ifndef NO_BOLD_UNDERLINE_REVERSE 3463#ifndef NO_BOLD_UNDERLINE_REVERSE
3414 case XTerm_Color_RV:
3415 process_color_seq (op, Color_RV, str, resp);
3416 break;
3417 case Rxvt_Color_BD:
3418 case URxvt_Color_BD: 3464 case URxvt_Color_BD:
3419 process_color_seq (op, Color_BD, str, resp); 3465 process_color_seq (op, Color_BD, str, resp);
3420 break; 3466 break;
3421 case Rxvt_Color_UL:
3422 case URxvt_Color_UL: 3467 case URxvt_Color_UL:
3423 process_color_seq (op, Color_UL, str, resp); 3468 process_color_seq (op, Color_UL, str, resp);
3424 break; 3469 break;
3425 case URxvt_Color_IT: 3470 case URxvt_Color_IT:
3426 process_color_seq (op, Color_IT, str, resp); 3471 process_color_seq (op, Color_IT, str, resp);
3427 break; 3472 break;
3428#endif 3473#endif
3429#if ENABLE_TRANSPARENCY 3474 case URxvt_Color_border:
3475 process_color_seq (op, Color_border, str, resp);
3476 break;
3477
3478#if BG_IMAGE_FROM_ROOT
3430 case URxvt_Color_tint: 3479 case URxvt_Color_tint:
3431 process_color_seq (op, Color_tint, str, resp); 3480 process_color_seq (op, Color_tint, str, resp);
3432 { 3481 {
3433 bool changed = false; 3482 bool changed = false;
3483
3434 if (ISSET_PIXCOLOR (Color_tint)) 3484 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3485 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3436 else 3486
3437 changed = bgPixmap.unset_tint ();
3438 if (changed) 3487 if (changed)
3439 bgPixmap.render (); 3488 update_background ();
3440 } 3489 }
3441 3490
3442 break; 3491 break;
3443#endif 3492#endif
3444 3493
3445#if XPM_BACKGROUND 3494#if BG_IMAGE_FROM_FILE
3446 case Rxvt_Pixmap: 3495 case Rxvt_Pixmap:
3447 if (!strcmp (str, "?")) 3496 if (!strcmp (str, "?"))
3448 { 3497 {
3449 char str[256]; 3498 char str[256];
3499 int h_scale = fimage.h_scale;
3500 int v_scale = fimage.v_scale;
3501 int h_align = fimage.h_align;
3502 int v_align = fimage.v_align;
3450 3503
3451 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3504 sprintf (str, "[%dx%d+%d+%d]",
3452 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3505 h_scale, v_scale,
3453 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3506 h_align, v_align);
3454 process_xterm_seq (XTerm_title, str, CHAR_ST); 3507 process_xterm_seq (XTerm_title, str, CHAR_ST);
3455 } 3508 }
3456 else 3509 else
3457 { 3510 {
3458 int changed = 0; 3511 bool changed = false;
3459 3512
3460 if (*str != ';') 3513 if (*str != ';')
3461 { 3514 {
3462 /* reset to default scaling :*/ 3515 try
3463 bgPixmap.unset_geometry (); 3516 {
3464 if (bgPixmap.set_file (str)) /* change pixmap */ 3517 fimage.set_file_geometry (this, str);
3465 changed++; 3518 changed = true;
3466 str = strchr (str, ';'); 3519 }
3467 if (str == NULL) 3520 catch (const class rxvt_failure_exception &e)
3468 bgPixmap.set_defaultGeometry (); 3521 {
3522 }
3469 } 3523 }
3470 while (str) 3524 else
3471 { 3525 {
3472 str++; 3526 str++;
3473 if (bgPixmap.set_geometry (str)) 3527 if (fimage.set_geometry (str, true))
3474 changed++; 3528 changed = true;
3475 str = strchr (str, ';');
3476 } 3529 }
3530
3477 if (changed) 3531 if (changed)
3478 { 3532 {
3479 bgPixmap.render (); 3533 if (bg_window_position_sensitive ())
3480 scr_touch (true); 3534 {
3535 int x, y;
3536 get_window_origin (x, y);
3537 parent_x = x;
3538 parent_y = y;
3539 }
3540 update_background ();
3481 } 3541 }
3482 } 3542 }
3483 break; 3543 break;
3484#endif 3544#endif
3485
3486 case Rxvt_restoreFG:
3487 set_window_color (Color_fg, str);
3488 break;
3489 case Rxvt_restoreBG:
3490 set_window_color (Color_bg, str);
3491 break;
3492 3545
3493 case XTerm_logfile: 3546 case XTerm_logfile:
3494 // TODO, when secure mode? 3547 // TODO, when secure mode?
3495 break; 3548 break;
3496 3549
… …
3563 break; 3616 break;
3564#endif 3617#endif
3565 3618
3566#if ENABLE_PERL 3619#if ENABLE_PERL
3567 case URxvt_perl: 3620 case URxvt_perl:
3568 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3621 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3569 ; // no responses yet
3570 break; 3622 break;
3571#endif 3623#endif
3572 } 3624 }
3573} 3625}
3574/*----------------------------------------------------------------------*/ 3626/*----------------------------------------------------------------------*/
… …
3581 * 's' = save 3633 * 's' = save
3582 * 'r' = restore 3634 * 'r' = restore
3583 * 't' = toggle 3635 * 't' = toggle
3584 * so no need for fancy checking 3636 * so no need for fancy checking
3585 */ 3637 */
3586int 3638int ecb_cold
3587rxvt_term::privcases (int mode, unsigned long bit) 3639rxvt_term::privcases (int mode, unsigned long bit)
3588{ 3640{
3589 int state; 3641 int state;
3590 3642
3591 if (mode == 's') 3643 if (mode == 's')
3592 { 3644 {
3593 SavedModes |= (priv_modes & bit); 3645 if (priv_modes & bit)
3646 SavedModes |= bit;
3647 else
3648 SavedModes &= ~bit;
3594 return -1; 3649 return -1;
3595 } 3650 }
3596 else 3651 else
3597 { 3652 {
3598 if (mode == 'r') 3653 if (mode == 'r')
3599 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3654 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3600 else 3655 else
3601 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3656 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3602 PrivMode (state, bit); 3657
3658 if (state)
3659 priv_modes |= bit;
3660 else
3661 priv_modes &= ~bit;
3603 } 3662 }
3604 3663
3605 return state; 3664 return state;
3606} 3665}
3607 3666
3608/* we're not using priv _yet_ */ 3667/* we're not using priv _yet_ */
3609void 3668void
3610rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3669rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3611{ 3670{
3612 unsigned int i, j; 3671 unsigned int i, j;
3613 int state; 3672 int state;
3614 3673
3615 static const struct 3674 static const struct
3616 { 3675 {
3617 const int argval; 3676 const int argval;
3618 const unsigned long bit; 3677 const unsigned long bit;
3619 } argtopriv[] = { 3678 } argtopriv[] = {
3620 { 1, PrivMode_aplCUR }, 3679 { 1, PrivMode_aplCUR }, // DECCKM
3621 { 2, PrivMode_vt52 }, 3680 { 2, PrivMode_vt52 }, // DECANM
3622 { 3, PrivMode_132 }, 3681 { 3, PrivMode_132 }, // DECCOLM
3623 { 4, PrivMode_smoothScroll }, 3682 { 4, PrivMode_smoothScroll }, // DECSCLM
3624 { 5, PrivMode_rVideo }, 3683 { 5, PrivMode_rVideo }, // DECSCNM
3625 { 6, PrivMode_relOrigin }, 3684 { 6, PrivMode_relOrigin }, // DECOM
3626 { 7, PrivMode_Autowrap }, 3685 { 7, PrivMode_Autowrap }, // DECAWM
3627 // 8, bi-directional support mode 3686 // 8, auto-repeat keys // DECARM
3628 { 9, PrivMode_MouseX10 }, 3687 { 9, PrivMode_MouseX10 },
3629 // 18, 19 printing-related
3630 { 25, PrivMode_VisibleCursor }, 3688 { 12, PrivMode_BlinkingCursor },
3689 // 18 end FF to printer after print screen
3690 // 19 Print screen prints full screen/scroll region
3691 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3631#ifdef scrollBar_esc 3692#ifdef scrollBar_esc
3632 { scrollBar_esc, PrivMode_scrollBar }, 3693 { scrollBar_esc, PrivMode_scrollBar },
3633#endif 3694#endif
3634 { 35, PrivMode_ShiftKeys }, // rxvt extension 3695 { 35, PrivMode_ShiftKeys }, // rxvt extension
3696 // 38, tektronix mode // DECTEK
3635 { 40, PrivMode_132OK }, 3697 { 40, PrivMode_132OK },
3636 // 41 xterm more fixes NYI 3698 // 41 xterm more fixes NYI
3637 // 45 margin bell NYI 3699 // 45 margin bell NYI
3638 // 46 start logging 3700 // 46 start logging
3639 { 47, PrivMode_Screen }, 3701 { 47, PrivMode_Screen },
3640 { 66, PrivMode_aplKP }, 3702 { 66, PrivMode_aplKP }, // DECNKM
3641#ifndef NO_BACKSPACE_KEY 3703#ifndef NO_BACKSPACE_KEY
3642 { 67, PrivMode_BackSpace }, 3704 { 67, PrivMode_BackSpace }, // DECBKM
3643#endif 3705#endif
3644 { 1000, PrivMode_MouseX11 }, 3706 { 1000, PrivMode_MouseX11 },
3645 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3707 { 1002, PrivMode_MouseBtnEvent },
3646 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3708 { 1003, PrivMode_MouseAnyEvent },
3647 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3709#if ENABLE_FRILLS
3710 { 1005, PrivMode_ExtModeMouse },
3711#endif
3648 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3712 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3649 { 1011, PrivMode_Keypress }, // rxvt extension 3713 { 1011, PrivMode_Keypress }, // rxvt extension
3714#if ENABLE_FRILLS
3715 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3716#endif
3650 // 1035 enable modifiers for alt, numlock NYI 3717 // 1035 enable modifiers for alt, numlock NYI
3651 // 1036 send ESC for meta keys NYI 3718 // 1036 send ESC for meta keys NYI
3652 // 1037 send DEL for keypad delete NYI 3719 // 1037 send DEL for keypad delete NYI
3653 { 1047, PrivMode_Screen }, 3720 { 1047, PrivMode_Screen },
3654 // 1048 save and restore cursor 3721 // 1048 save and restore cursor, implemented in code
3655 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3722 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3656 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3723 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3724 { 2004, PrivMode_BracketPaste },
3657 }; 3725 };
3658 3726
3659 if (nargs == 0) 3727 if (nargs == 0)
3660 return; 3728 return;
3661 3729
… …
3668 for (i = 0; i < nargs; i++) 3736 for (i = 0; i < nargs; i++)
3669 { 3737 {
3670 state = -1; 3738 state = -1;
3671 3739
3672 /* basic handling */ 3740 /* basic handling */
3673 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3741 for (j = 0; j < ecb_array_length (argtopriv); j++)
3674 if (argtopriv[j].argval == arg[i]) 3742 if (argtopriv[j].argval == arg[i])
3675 { 3743 {
3676 state = privcases (mode, argtopriv[j].bit); 3744 state = privcases (mode, argtopriv[j].bit);
3677 break; 3745 break;
3678 } 3746 }
… …
3686 3754
3687 scr_touch (true); 3755 scr_touch (true);
3688 break; 3756 break;
3689#endif 3757#endif
3690 case 1048: /* alternative cursor save */ 3758 case 1048: /* alternative cursor save */
3691 case 1049:
3692 if (option (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
3693 if (mode == 0) 3760 if (mode == 0)
3694 scr_cursor (RESTORE); 3761 scr_cursor (RESTORE);
3695 else if (mode == 1) 3762 else if (mode == 1)
3696 scr_cursor (SAVE); 3763 scr_cursor (SAVE);
… …
3705 case 2: /* VT52 mode */ 3772 case 2: /* VT52 mode */
3706 /* oddball mode. should be set regardless of set/reset 3773 /* oddball mode. should be set regardless of set/reset
3707 * parameter. Return from VT52 mode with an ESC < from 3774 * parameter. Return from VT52 mode with an ESC < from
3708 * within VT52 mode 3775 * within VT52 mode
3709 */ 3776 */
3710 PrivMode (1, PrivMode_vt52); 3777 priv_modes |= PrivMode_vt52;
3711 break; 3778 break;
3712 case 3: /* 80/132 */ 3779 case 3: /* 80/132 */
3713 if (priv_modes & PrivMode_132OK) 3780 if (priv_modes & PrivMode_132OK)
3714 set_widthheight (((state ? 132 : 80) * fwidth), height); 3781 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3715 break; 3782 break;
3716 case 4: /* smooth scrolling */ 3783 case 4: /* smooth scrolling */
3717 set_option (Opt_jumpScroll, !state); 3784 set_option (Opt_jumpScroll, !state);
3718 break; 3785 break;
3719 case 5: /* reverse video */ 3786 case 5: /* reverse video */
… …
3726 scr_autowrap (state); 3793 scr_autowrap (state);
3727 break; 3794 break;
3728 /* case 8: - auto repeat, can't do on a per window basis */ 3795 /* case 8: - auto repeat, can't do on a per window basis */
3729 case 9: /* X10 mouse reporting */ 3796 case 9: /* X10 mouse reporting */
3730 if (state) /* orthogonal */ 3797 if (state) /* orthogonal */
3731 priv_modes &= ~PrivMode_MouseX11; 3798 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3732 break; 3799 break;
3733#ifdef scrollBar_esc 3800#ifdef scrollBar_esc
3734 case scrollBar_esc: 3801 case scrollBar_esc:
3735 if (scrollbar_mapping (state)) 3802 scrollBar.map (state);
3736 {
3737 resize_all_windows (0, 0, 0); 3803 resize_all_windows (0, 0, 0);
3738 scr_touch (true); 3804 scr_touch (true);
3739 } 3805 break;
3806#endif
3807#ifdef CURSOR_BLINK
3808 case 12:
3809 cursor_blink_reset ();
3740 break; 3810 break;
3741#endif 3811#endif
3742 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
3743 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
3744 break; 3814 break;
… …
3749 break; 3819 break;
3750 /* case 66: - application key pad */ 3820 /* case 66: - application key pad */
3751 /* case 67: - backspace key */ 3821 /* case 67: - backspace key */
3752 case 1000: /* X11 mouse reporting */ 3822 case 1000: /* X11 mouse reporting */
3753 if (state) /* orthogonal */ 3823 if (state) /* orthogonal */
3754 priv_modes &= ~PrivMode_MouseX10; 3824 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3755 break; 3825 break;
3756#if 0
3757 case 1001: 3826 case 1002:
3758 break; /* X11 mouse highlighting */ 3827 case 1003:
3759#endif 3828 if (state)
3829 {
3830 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3831 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3832 mouse_row = mouse_col = 0;
3833 vt_emask_mouse = PointerMotionMask;
3834 }
3835 else
3836 vt_emask_mouse = NoEventMask;
3837
3838 vt_select_input ();
3839 break;
3760 case 1010: /* scroll to bottom on TTY output inhibit */ 3840 case 1010: /* scroll to bottom on TTY output inhibit */
3761 set_option (Opt_scrollTtyOutput, !state); 3841 set_option (Opt_scrollTtyOutput, !state);
3762 break; 3842 break;
3763 case 1011: /* scroll to bottom on key press */ 3843 case 1011: /* scroll to bottom on key press */
3764 set_option (Opt_scrollTtyKeypress, state); 3844 set_option (Opt_scrollTtyKeypress, state);
3765 break; 3845 break;
3766 case 1047: /* secondary screen w/ clearing last */ 3846 case 1047: /* secondary screen w/ clearing last */
3767 if (option (Opt_secondaryScreen)) 3847 if (option (Opt_secondaryScreen))
3768 if (current_screen != PRIMARY) 3848 if (!state)
3769 scr_erase_screen (2); 3849 scr_erase_screen (2);
3850
3770 scr_change_screen (state); 3851 scr_change_screen (state);
3771 break; 3852 break;
3772 case 1049: /* secondary screen w/ clearing first */ 3853 case 1049: /* secondary screen w/ clearing first */
3854 if (option (Opt_secondaryScreen))
3855 if (state)
3856 scr_cursor (SAVE);
3857
3773 scr_change_screen (state); 3858 scr_change_screen (state);
3859
3774 if (option (Opt_secondaryScreen)) 3860 if (option (Opt_secondaryScreen))
3775 if (current_screen != PRIMARY) 3861 if (state)
3776 scr_erase_screen (2); 3862 scr_erase_screen (2);
3863 else
3864 scr_cursor (RESTORE);
3777 break; 3865 break;
3778 default: 3866 default:
3779 break; 3867 break;
3780 } 3868 }
3781 } 3869 }
3782} 3870}
3783/*}}} */ 3871/*}}} */
3784 3872
3785/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
3786void 3874void ecb_hot
3787rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3788{ 3876{
3789 unsigned int i; 3877 unsigned int i;
3790 short rendset; 3878 short rendset;
3791 int rendstyle; 3879 int rendstyle;
… …
3833 //case 19: // ninth alt font 3921 //case 19: // ninth alt font
3834 //case 20: // gothic 3922 //case 20: // gothic
3835 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3923 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3836 rendset = 0, rendstyle = RS_Bold; 3924 rendset = 0, rendstyle = RS_Bold;
3837 break; 3925 break;
3838 case 22: // normal intensity 3926 case 22: // bold off (vt220)
3839 rendset = 0, rendstyle = RS_Bold; 3927 rendset = 0, rendstyle = RS_Bold;
3840 break; 3928 break;
3841 case 23: // disable italic 3929 case 23: // disable italic
3842 rendset = 0, rendstyle = RS_Italic; 3930 rendset = 0, rendstyle = RS_Italic;
3843 break; 3931 break;
3844 case 24: 3932 case 24: // underline off (vt220)
3845 rendset = 0, rendstyle = RS_Uline; 3933 rendset = 0, rendstyle = RS_Uline;
3846 break; 3934 break;
3847 case 25: 3935 case 25: // blink off (vt220)
3848 rendset = 0, rendstyle = RS_Blink; 3936 rendset = 0, rendstyle = RS_Blink;
3849 break; 3937 break;
3850 case 26: // variable spacing (iso 8613) 3938 case 26: // variable spacing (iso 8613)
3851 rendset = 0, rendstyle = RS_Blink; 3939 rendset = 0, rendstyle = RS_Blink;
3852 break; 3940 break;
3853 case 27: 3941 case 27: // reverse off (vt220)
3854 rendset = 0, rendstyle = RS_RVid; 3942 rendset = 0, rendstyle = RS_RVid;
3855 break; 3943 break;
3856 //case 28: // visible. NYI 3944 //case 28: // visible. NYI
3857 //case 29: // not crossed-out 3945 //case 29: // not crossed-out
3858 } 3946 }
… …
3932 break; 4020 break;
3933#endif 4021#endif
3934 } 4022 }
3935 } 4023 }
3936} 4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 6))
4030 return;
4031
4032 if (style == 0)
4033 style = 1;
4034
4035 cursor_type = (style - 1) / 2;
4036 set_option (Opt_cursorUnderline, cursor_type == 1);
4037
4038#ifdef CURSOR_BLINK
4039 set_option (Opt_cursorBlink, style & 1);
4040 cursor_blink_reset ();
4041#endif
4042
4043 want_refresh = 1;
4044}
3937/*}}} */ 4045/*}}} */
3938 4046
3939/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3940void
3941rxvt_term::process_graphics ()
3942{
3943 unicode_t ch, cmd = cmd_getc ();
3944
3945 if (cmd == 'Q')
3946 { /* query graphics */
3947 tt_printf ("\033G0\012"); /* no graphics */
3948 return;
3949 }
3950 /* swallow other graphics sequences until terminating ':' */
3951 do
3952 ch = cmd_getc ();
3953 while (ch != ':');
3954}
3955/*}}} */
3956
3957/* ------------------------------------------------------------------------- */ 4047/* ---------------------------------------------------------------------- */
4048/* Write data to the pty as typed by the user, pasted with the mouse,
4049 * or generated by us in response to a query ESC sequence.
4050 */
3958 4051
3959/* 4052/*
3960 * Send printf () formatted output to the command. 4053 * Send printf () formatted output to the command.
3961 * Only use for small amounts of data. 4054 * Only use for small amounts of data.
3962 */ 4055 */
… …
3970 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4063 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3971 va_end (arg_ptr); 4064 va_end (arg_ptr);
3972 tt_write (buf, strlen (buf)); 4065 tt_write (buf, strlen (buf));
3973} 4066}
3974 4067
3975/* ---------------------------------------------------------------------- */
3976/* Write data to the pty as typed by the user, pasted with the mouse, 4068/* Write data to the pty as typed by the user. */
3977 * or generated by us in response to a query ESC sequence. 4069void
3978 */ 4070rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3979const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4071{
4072 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4073 return;
4074
4075 if (option (Opt_scrollTtyKeypress))
4076 if (view_start)
4077 {
4078 view_start = 0;
4079 want_refresh = 1;
4080 }
4081
4082 tt_write_ (data, len);
4083}
3980 4084
3981void 4085void
3982rxvt_term::tt_write (const char *data, unsigned int len) 4086rxvt_term::tt_write (const char *data, unsigned int len)
3983{ 4087{
3984 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4088 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3985 return; 4089 return;
3986 4090
4091 tt_write_ (data, len);
4092}
4093
4094static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4095
4096void
4097rxvt_term::tt_write_ (const char *data, unsigned int len)
4098{
3987 if (pty->pty < 0) 4099 if (pty->pty < 0)
3988 return; 4100 return;
3989 4101
3990 if (v_buflen == 0) 4102 if (v_buflen == 0)
3991 { 4103 {
3992 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4104 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3993 4105
4106 max_it (written, 0);
4107
3994 if ((unsigned int)written == len) 4108 if (written == len)
3995 return; 4109 return;
3996 4110
3997 data += written; 4111 data += written;
3998 len -= written; 4112 len -= written;
3999 } 4113 }
4000 4114
4001 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4115 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4002 4116
4003 memcpy (v_buffer + v_buflen, data, len); 4117 memcpy (v_buffer + v_buflen, data, len);
4004 v_buflen += len; 4118 v_buflen += len;
4005 4119
4006 pty_ev.set (EVENT_READ | EVENT_WRITE); 4120 pty_ev.set (ev::READ | ev::WRITE);
4007} 4121}
4008 4122
4009void rxvt_term::pty_write () 4123void rxvt_term::pty_write ()
4010{ 4124{
4011 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4125 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4016 4130
4017 if (v_buflen == 0) 4131 if (v_buflen == 0)
4018 { 4132 {
4019 free (v_buffer); 4133 free (v_buffer);
4020 v_buffer = 0; 4134 v_buffer = 0;
4021 v_buflen = 0;
4022 4135
4023 pty_ev.set (EVENT_READ); 4136 pty_ev.set (ev::READ);
4024 return; 4137 return;
4025 } 4138 }
4026 4139
4027 memmove (v_buffer, v_buffer + written, v_buflen); 4140 memmove (v_buffer, v_buffer + written, v_buflen);
4028 } 4141 }
4029 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4142 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4030 pty_ev.set (EVENT_READ); 4143 pty_ev.set (ev::READ);
4031} 4144}
4032 4145
4033/*----------------------- end-of-file (C source) -----------------------*/ 4146/*----------------------- end-of-file (C source) -----------------------*/
4034 4147

Diff Legend

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