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

Diff Legend

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