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.348 by sasha, Thu Aug 16 21:26:20 2007 UTC vs.
Revision 1.571 by sf-exg, Thu Jun 30 11:33:42 2016 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322 XK_KP_1, // XK_KP_End
323 XK_KP_5, // XK_KP_Begin
324 };
325
326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
327 {
328 unsigned int index = keysym - XK_KP_Home;
329 keysym = kp ? keypadtrans[index] : XK_Home + index;
330 }
331 else if (keysym == XK_KP_Insert)
332 keysym = kp ? XK_KP_0 : XK_Insert;
333# ifndef NO_DELETE_KEY
334 else if (keysym == XK_KP_Delete)
335 keysym = kp ? XK_KP_Decimal : XK_Delete;
336# endif
337#endif
338 return keysym;
339}
340
341static inline int ecb_cold
342map_function_key (KeySym keysym)
343{
344 int param = 0;
345
346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
347 {
348 param = 11 + keysym - XK_F1;
349 if (keysym >= XK_F17)
350 param += 4;
351 else if (keysym >= XK_F15)
352 param += 3;
353 else if (keysym >= XK_F11)
354 param += 2;
355 else if (keysym >= XK_F6)
356 param += 1;
357 }
358 else
359 switch (keysym)
360 {
361 case XK_Find:
362 param = 1;
363 break;
364 case XK_Insert:
365 param = 2;
366 break;
367#ifdef DXK_Remove
368 case DXK_Remove:
369#endif
370 case XK_Execute:
371 param = 3;
372 break;
373 case XK_Select:
374 param = 4;
375 break;
376 case XK_Prior:
377 param = 5;
378 break;
379 case XK_Next:
380 param = 6;
381 break;
382 case XK_Home:
383 param = 7;
384 break;
385 case XK_End:
386 param = 8;
387 break;
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
304{ 409{
305 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
306 unsigned int newlen; 411 KeySym keysym = NoSymbol;
307 KeySym keysym;
308 int valid_keysym;
309 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
310 414
311#if ISO_14755 415#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
313 return; 417 return;
314#endif 418#endif
… …
321 */ 425 */
322 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
325 429
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 430 kbuf[0] = 0;
333 431
334#ifdef USE_XIM 432#if USE_XIM
335 if (Input_Context) 433 if (Input_Context)
336 { 434 {
337 Status status_return; 435 Status status_return;
338 436
339#if 0 437#if 0
… …
377 } 475 }
378 } 476 }
379 else 477 else
380 len = 0; 478 len = 0;
381 } 479 }
382
383 valid_keysym = status_return == XLookupKeySym
384 || status_return == XLookupBoth;
385 } 480 }
386 else 481 else
387#endif 482#endif
388 { 483 {
389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
390 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
391 } 488 {
489 KeySym orig_keysym = keysym;
392 490
393 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
394 { 704 {
395#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
397 return; 707 return;
398#endif 708#endif
399 709
400 if (saveLines) 710 if (saveLines)
401 { 711 {
… …
410#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 722#else
413 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
414#endif 724#endif
725 max_it (lnsppg, 1);
726
415 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
416 { 728 {
417 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
418 return; 730 return;
419 } 731 }
420 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
421 { 733 {
422 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
423 return; 735 return;
424 } 736 }
425 } 737 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
428 { 740 {
429 if (keysym == XK_Up) 741 if (keysym == XK_Up)
430 { 742 {
431 scr_page (UP, 1); 743 scr_page (1);
432 return; 744 return;
433 } 745 }
434 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
435 { 747 {
436 scr_page (DN, 1); 748 scr_page (-1);
437 return; 749 return;
438 } 750 }
439 } 751 }
440#endif 752#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
443 { 755 {
444 if (keysym == XK_Home) 756 if (keysym == XK_Home)
445 { 757 {
446 scr_move_to (0, 1); 758 scr_changeview (top_row);
447 return; 759 return;
448 } 760 }
449 else if (keysym == XK_End) 761 else if (keysym == XK_End)
450 { 762 {
451 scr_move_to (1, 1); 763 scr_changeview (0);
452 return; 764 return;
453 } 765 }
454 } 766 }
455#endif 767#endif
456 } 768 }
457 769
458 if (shft) 770 if (shft)
459 { 771 {
460 /* Shift + F1 - F10 generates F11 - F20 */
461 if (keysym >= XK_F1 && keysym <= XK_F10)
462 {
463 keysym += (XK_F11 - XK_F1);
464 shft = 0; /* turn off Shift */
465 }
466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
467 { 773 {
468 switch (keysym) 774 switch (keysym)
469 { 775 {
470 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
471 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
472 selection_request (ev.time); 778 selection_request (ev.time);
473 return; 779 return;
474#if TODO 780#if TODO
475 /* rxvt extras */ 781 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 783 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 785 return;
482#endif 786#endif
483 } 787 }
484 } 788 }
485 } 789 }
486 790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
804 }
805
487#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 807 // ISO 14755 support
489 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 809 {
491 int hv; 810 int hv;
492 811
493 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 843 scr_overlay_off ();
525# endif 844# endif
526 iso14755buf = 0; 845 iso14755buf = 0;
527 } 846 }
528 } 847 }
848 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
532 { 852 {
533 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 854# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
543 { 863 {
544 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
545 return; 865 return;
546 } 866 }
547#endif 867#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 newlen = 1;
553 switch (keysym)
554 {
555#ifndef NO_BACKSPACE_KEY
556 case XK_BackSpace:
557 if (priv_modes & PrivMode_HaveBackSpace)
558 {
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0';
562 }
563 else
564 strcpy (kbuf, key_backspace);
565 break;
566#endif
567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete:
579 strcpy (kbuf, key_delete);
580 break;
581#endif
582 case XK_Tab:
583 if (shft)
584 strcpy (kbuf, "\033[Z");
585 else
586 {
587#ifdef CTRL_TAB_MAKES_META
588 if (ctrl)
589 meta = 1;
590#endif
591#ifdef MOD4_TAB_MAKES_META
592 if (ev.state & Mod4Mask)
593 meta = 1;
594#endif
595 newlen = 0;
596 }
597 break;
598
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z");
620 kbuf[2] = "DACB"[keysym - XK_Left];
621 /* do Shift first */
622 if (shft)
623 kbuf[2] = "dacb"[keysym - XK_Left];
624 else if (ctrl)
625 {
626 kbuf[1] = 'O';
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 }
629 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O';
631 break;
632
633#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior:
645 strcpy (kbuf, "\033[5~");
646 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next:
658 strcpy (kbuf, "\033[6~");
659 break;
660#endif
661 case XK_KP_Enter:
662 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
664 {
665 strcpy (kbuf, "\033OM");
666 break;
667 }
668
669 /* FALLTHROUGH */
670
671 case XK_Return:
672 if (priv_modes & PrivMode_LFNL)
673 {
674 kbuf[0] = '\015';
675 kbuf[1] = '\012';
676 kbuf[2] = '\0';
677 }
678 else
679 {
680 kbuf[0] = '\015';
681 kbuf[1] = '\0';
682 }
683 break;
684
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP");
696 kbuf[2] += (keysym - XK_KP_F1);
697 break;
698
699 case XK_KP_Multiply: /* "\033Oj" : "*" */
700 case XK_KP_Add: /* "\033Ok" : "+" */
701 case XK_KP_Separator: /* "\033Ol" : "," */
702 case XK_KP_Subtract: /* "\033Om" : "-" */
703 case XK_KP_Decimal: /* "\033On" : "." */
704 case XK_KP_Divide: /* "\033Oo" : "/" */
705 case XK_KP_0: /* "\033Op" : "0" */
706 case XK_KP_1: /* "\033Oq" : "1" */
707 case XK_KP_2: /* "\033Or" : "2" */
708 case XK_KP_3: /* "\033Os" : "3" */
709 case XK_KP_4: /* "\033Ot" : "4" */
710 case XK_KP_5: /* "\033Ou" : "5" */
711 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
717 {
718 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply);
720 }
721 else
722 {
723 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_Find:
729 strcpy (kbuf, "\033[1~");
730 break;
731
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert:
743 strcpy (kbuf, "\033[2~");
744 break;
745#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove:
747 /* FALLTHROUGH */
748#endif
749 case XK_Execute:
750 strcpy (kbuf, "\033[3~");
751 break;
752 case XK_Select:
753 strcpy (kbuf, "\033[4~");
754 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End:
766 strcpy (kbuf, KS_END);
767 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home:
779 strcpy (kbuf, KS_HOME);
780 break;
781
782#define FKEY(n, fkey) \
783 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
784
785 case XK_F1: /* "\033[11~" */
786 case XK_F2: /* "\033[12~" */
787 case XK_F3: /* "\033[13~" */
788 case XK_F4: /* "\033[14~" */
789 case XK_F5: /* "\033[15~" */
790 FKEY (11, XK_F1);
791 break;
792 case XK_F6: /* "\033[17~" */
793 case XK_F7: /* "\033[18~" */
794 case XK_F8: /* "\033[19~" */
795 case XK_F9: /* "\033[20~" */
796 case XK_F10: /* "\033[21~" */
797 FKEY (17, XK_F6);
798 break;
799 case XK_F11: /* "\033[23~" */
800 case XK_F12: /* "\033[24~" */
801 case XK_F13: /* "\033[25~" */
802 case XK_F14: /* "\033[26~" */
803 FKEY (23, XK_F11);
804 break;
805 case XK_F15: /* "\033[28~" */
806 case XK_F16: /* "\033[29~" */
807 FKEY (28, XK_F15);
808 break;
809 case XK_Help: /* "\033[28~" */
810 FKEY (28, XK_Help);
811 break;
812 case XK_Menu: /* "\033[29~" */
813 FKEY (29, XK_Menu);
814 break;
815 case XK_F17: /* "\033[31~" */
816 case XK_F18: /* "\033[32~" */
817 case XK_F19: /* "\033[33~" */
818 case XK_F20: /* "\033[34~" */
819 case XK_F21: /* "\033[35~" */
820 case XK_F22: /* "\033[36~" */
821 case XK_F23: /* "\033[37~" */
822 case XK_F24: /* "\033[38~" */
823 case XK_F25: /* "\033[39~" */
824 case XK_F26: /* "\033[40~" */
825 case XK_F27: /* "\033[41~" */
826 case XK_F28: /* "\033[42~" */
827 case XK_F29: /* "\033[43~" */
828 case XK_F30: /* "\033[44~" */
829 case XK_F31: /* "\033[45~" */
830 case XK_F32: /* "\033[46~" */
831 case XK_F33: /* "\033[47~" */
832 case XK_F34: /* "\033[48~" */
833 case XK_F35: /* "\033[49~" */
834 FKEY (31, XK_F17);
835 break;
836#undef FKEY
837 default:
838 newlen = 0;
839 break;
840 }
841
842 if (newlen)
843 len = strlen (kbuf);
844 }
845
846 /*
847 * Pass meta for all function keys, if 'meta' option set
848 */
849#ifdef META8_OPTION
850 if (meta && (meta_char == 0x80) && len > 0)
851 kbuf[len - 1] |= 0x80;
852#endif
853
854 }
855 else if (ctrl && keysym == XK_minus)
856 {
857 len = 1;
858 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
859 }
860 else if (keysym == XK_ISO_Left_Tab)
861 {
862 strcpy (kbuf, "\033[Z");
863 len = 3;
864 }
865 else
866 {
867#ifdef META8_OPTION
868 /* set 8-bit on */
869 if (meta && (meta_char == 0x80))
870 {
871 char *ch;
872
873 for (ch = kbuf; ch < kbuf + len; ch++)
874 *ch |= 0x80;
875
876 meta = 0;
877 }
878#endif
879 /* nil */ ;
880 }
881 } 868 }
882
883 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
884 return;
885 869
886 if (len <= 0) 870 if (len <= 0)
887 return; /* not mapped */ 871 return; /* not mapped */
888 872
889 if (option (Opt_scrollTtyKeypress))
890 if (view_start)
891 {
892 view_start = 0;
893 want_refresh = 1;
894 }
895
896 /*
897 * these modifications only affect the static keybuffer
898 * pass Shift/Control indicators for function keys ending with `~'
899 *
900 * eg,
901 * Prior = "ESC[5~"
902 * Shift+Prior = "ESC[5$"
903 * Ctrl+Prior = "ESC[5^"
904 * Ctrl+Shift+Prior = "ESC[5@"
905 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
906 */
907 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
908 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
909
910 /* escape prefix */
911 if (meta
912#ifdef META8_OPTION
913 && meta_char == C0_ESC
914#endif
915 )
916 {
917 const char ch = C0_ESC;
918 tt_write (&ch, 1);
919 }
920
921 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
922} 874}
923 875
924void 876void ecb_cold
925rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
926{ 878{
927#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
928 KeySym keysym; 880 KeySym keysym;
929 881
… …
949 commit_iso14755 (); 901 commit_iso14755 ();
950 902
951 return; 903 return;
952 } 904 }
953 905
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
955 if (i[0] == keysym) 907 if (i[0] == keysym)
956 { 908 {
957 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 (); 910 commit_iso14755 ();
959 911
… …
996 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
997 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
998#endif 950#endif
999} 951}
1000 952
1001#if defined (KEYSYM_RESOURCE)
1002unsigned int
1003rxvt_term::cmd_write (const char *str, unsigned int count)
1004{
1005 unsigned int n, s;
1006
1007 n = cmdbuf_ptr - cmdbuf_base;
1008 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1009
1010 if (n > 0 && s < count)
1011 {
1012 memmove (cmdbuf_base, cmdbuf_ptr,
1013 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1014 cmdbuf_ptr = cmdbuf_base;
1015 cmdbuf_endp -= n;
1016 s += n;
1017 }
1018
1019 if (count > s)
1020 {
1021 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1022 count = s;
1023 }
1024
1025 for (; count--;)
1026 *cmdbuf_endp++ = *str++;
1027
1028 cmd_parse ();
1029
1030 return 0;
1031}
1032#endif
1033
1034void 953void
1035rxvt_term::flush () 954rxvt_term::flush ()
1036{ 955{
1037 flush_ev.stop (); 956 flush_ev.stop ();
1038 957
1039#ifdef ENABLE_TRANSPARENCY 958#ifdef HAVE_IMG
1040 if (want_full_refresh) 959 if (bg_flags & BG_NEEDS_REFRESH)
1041 { 960 {
1042 want_full_refresh = 0; 961 bg_flags &= ~BG_NEEDS_REFRESH;
1043 scr_clear ();
1044 scr_touch (false); 962 scr_touch (false);
1045 } 963 }
1046#endif 964#endif
1047 965
1048 if (want_refresh) 966 if (want_refresh)
… …
1084 } 1002 }
1085 while (row < end_row); 1003 while (row < end_row);
1086 } 1004 }
1087 1005
1088 scr_refresh (); 1006 scr_refresh ();
1089 scrollbar_show (1); 1007 scrollBar.show (1);
1090#ifdef USE_XIM 1008#if USE_XIM
1091 IMSendSpot (); 1009 im_send_spot ();
1092#endif 1010#endif
1093 } 1011 }
1094 1012
1095 display->flush (); 1013 display->flush ();
1096} 1014}
1097 1015
1016/* checks whether a refresh is requested and starts the refresh timer */
1098void 1017void
1099rxvt_term::check_cb (check_watcher &w) 1018rxvt_term::refresh_check ()
1100{ 1019{
1101 make_current (); 1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1022
1103 display->flush (); 1023 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1024}
1108 1025
1109void 1026void
1110rxvt_term::flush_cb (time_watcher &w) 1027rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1028{
1112 make_current (); 1029 make_current ();
1113 1030
1114 refresh_count = 0; 1031 refresh_count = 0;
1115 flush (); 1032 flush ();
1116} 1033}
1117 1034
1118#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1119void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!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 (!bypass_keystate
1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1619 || priv_modes & PrivMode_MouseAnyEvent))
1620 mouse_report (ev.xbutton);
1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586 break; 1622 break;
1587 1623
1588 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
1589 { 1625 {
… …
1600 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1601 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1602 &ev.xbutton.state); 1638 &ev.xbutton.state);
1603#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1604 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1605 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1606 { 1643 {
1607#endif
1608#if ISO_14755 1644#if ISO_14755
1609 // 5.4 1645 // 5.4
1610 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1611 { 1647 {
1612 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1618 1654
1619#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1620 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1621 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1622 { 1658 {
1659 page_dirn scroll_selection_dir;
1623 int dist; 1660 int dist;
1624 1661
1625 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1626 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1627 */ 1664 */
1628 if (!sel_scroll_ev.active) 1665 if (!sel_scroll_ev.is_active ())
1629 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1666 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1630 1667
1631 /* save the event params so we can highlight 1668 /* save the event params so we can highlight
1632 * the selection in the pending-scroll loop 1669 * the selection in the pending-scroll loop
1633 */ 1670 */
1634 selection_save_x = ev.xbutton.x; 1671 selection_save_x = ev.xbutton.x;
… …
1642 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1643 } 1680 }
1644 else 1681 else
1645 { 1682 {
1646 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1647 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1648 } 1685 }
1649 1686
1650 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1651 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1652 + 1; 1689 + 1;
1653 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1654 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1655 } 1693 }
1656 else 1694 else
1657 { 1695 {
1658 /* we are within the text window, so we 1696 /* we are within the text window, so we
1659 * shouldn't be scrolling 1697 * shouldn't be scrolling
1660 */ 1698 */
1661 if (sel_scroll_ev.active)
1662 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1663 } 1700 }
1664#endif 1701#endif
1665#ifdef MOUSE_THRESHOLD
1666 } 1702 }
1667#endif
1668 } 1703 }
1669 } 1704 }
1670 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1706 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1674 ; 1709 ;
1675 1710
1676 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1677 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1715 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682 scrollbar_size ()); 1717 scrollBar.size ());
1683 want_refresh = 1; 1718 want_refresh = 1;
1684 scrollbar_show (1); 1719 scrollBar.show (1);
1685 } 1720 }
1686 break; 1721 break;
1687 } 1722 }
1688 1723
1689#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1691 { 1726 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 1727#endif
1701 1728
1702#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1731 {
… …
1710 1737
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1738 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1739 pointer_blank ();
1713 } 1740 }
1714#endif 1741#endif
1715}
1716 1742
1717void 1743 refresh_check ();
1744}
1745
1746#if ENABLE_FRILLS
1747void ecb_cold
1748rxvt_term::set_urgency (bool enable)
1749{
1750 if (enable == urgency_hint)
1751 return;
1752
1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1754 {
1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1756 XSetWMHints (dpy, parent, h);
1757 urgency_hint = enable;
1758 XFree (h);
1759 }
1760}
1761#endif
1762
1763void ecb_cold
1718rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1719{ 1765{
1720 if (!focus) 1766 if (!focus)
1721 { 1767 {
1722 focus = 1; 1768 focus = 1;
1723 want_refresh = 1; 1769 want_refresh = 1;
1724 1770
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1727#if USE_XIM 1771#if USE_XIM
1728 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1729 { 1773 {
1730 IMSetPosition (); 1774 im_set_position ();
1731 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1732 } 1776 }
1733#endif 1777#endif
1734#if CURSOR_BLINK 1778#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1780 cursor_blink_ev.again ();
1737#endif 1781#endif
1738#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1740 { 1784 {
1741 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1786 scr_recolor ();
1743 } 1787 }
1744#endif 1788#endif
1745#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1747 { 1791 set_urgency (0);
1748 XWMHints *h;
1749 1792
1750 h = XGetWMHints(dpy, parent[0]); 1793 if (priv_modes & PrivMode_FocusEvent)
1751 if (h != NULL) 1794 tt_printf ("\x1b[I");
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif 1795#endif
1758 }
1759}
1760 1796
1761void 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1798 }
1799}
1800
1801void ecb_cold
1762rxvt_term::focus_out () 1802rxvt_term::focus_out ()
1763{ 1803{
1764 if (focus) 1804 if (focus)
1765 { 1805 {
1766 focus = 0; 1806 focus = 0;
1767 want_refresh = 1; 1807 want_refresh = 1;
1768 1808
1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1809#if ENABLE_FRILLS
1810 if (option (Opt_urgentOnBell))
1811 set_urgency (0);
1770 1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1815#endif
1771#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf) 1817 if (iso14755buf)
1773 { 1818 {
1774 iso14755buf = 0; 1819 iso14755buf = 0;
1775# if ISO_14755 1820# if ISO_14755
… …
1782 XUnsetICFocus (Input_Context); 1827 XUnsetICFocus (Input_Context);
1783#endif 1828#endif
1784#if CURSOR_BLINK 1829#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink)) 1830 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop (); 1831 cursor_blink_ev.stop ();
1832
1787 hidden_cursor = 0; 1833 hidden_cursor = 0;
1788#endif 1834#endif
1789#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1791 { 1837 {
1792 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1793 scr_recolour (); 1839 scr_recolor ();
1794 } 1840 }
1795#endif 1841#endif
1796 }
1797}
1798 1842
1799void 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1844 }
1845}
1846
1847void ecb_cold
1800rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1801{ 1849{
1802#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1804 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1805 rgba c; 1856 rgba c;
1806 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 } 1859 }
1809#endif 1860#endif
1810} 1861}
1811 1862
1812#if ENABLE_TRANSPARENCY || ENABLE_PERL 1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1813void 1864void ecb_hot
1814rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1815{ 1866{
1816 make_current (); 1867 make_current ();
1817 1868
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return; 1871 return;
1821 1872
1822# if ENABLE_TRANSPARENCY
1823 switch (ev.type) 1873 switch (ev.type)
1824 { 1874 {
1825 case PropertyNotify: 1875 case PropertyNotify:
1826 /* 1876 /*
1827 * if user used some Esetroot compatible prog to set the root bg, 1877 * if user used some Esetroot compatible prog to set the root bg,
1828 * use the property to determine the pixmap. We use it later on. 1878 * use the property to determine the pixmap. We use it later on.
1829 */ 1879 */
1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 { 1882 {
1833 bgPixmap.set_root_pixmap (); 1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1834 update_background (); 1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1835 } 1891 }
1892
1836 break; 1893 break;
1837 } 1894 }
1838# endif 1895
1896 refresh_check ();
1839} 1897}
1840#endif 1898#endif
1841 1899
1842void 1900void
1843rxvt_term::button_press (XButtonEvent &ev) 1901rxvt_term::button_press (XButtonEvent &ev)
… …
1864 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1865 return; 1923 return;
1866 } 1924 }
1867#endif 1925#endif
1868 1926
1869 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1870 1928
1871 if (reportmode) 1929 if (reportmode)
1872 { 1930 {
1873 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1874 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
1875 MEvent.state = ev.state; 1933 MEvent.state = ev.state;
1876#ifdef MOUSE_REPORT_DOUBLECLICK 1934#ifdef MOUSE_REPORT_DOUBLECLICK
1877 if (ev.button == MEvent.button && clickintime) 1935 if (ev.button == MEvent.button && clickintime)
1878 { 1936 {
1879 /* same button, within alloted time */ 1937 /* same button, within allowed time */
1880 MEvent.clicks++; 1938 MEvent.clicks++;
1881 1939
1882 if (MEvent.clicks > 1) 1940 if (MEvent.clicks > 1)
1883 { 1941 {
1884 /* only report double clicks */ 1942 /* only report double clicks */
… …
1898 mouse_report (ev); 1956 mouse_report (ev);
1899 } 1957 }
1900#else 1958#else
1901 MEvent.button = ev.button; 1959 MEvent.button = ev.button;
1902 mouse_report (ev); 1960 mouse_report (ev);
1903#endif /* MOUSE_REPORT_DOUBLECLICK */ 1961#endif /* MOUSE_REPORT_DOUBLECLICK */
1904 1962
1905 } 1963 }
1906 else 1964 else
1907 { 1965 {
1908 if (ev.button != MEvent.button) 1966 if (ev.button != MEvent.button)
… …
1956 } 2014 }
1957 2015
1958 /* 2016 /*
1959 * Scrollbar window processing of button press 2017 * Scrollbar window processing of button press
1960 */ 2018 */
1961 if (isScrollbarWindow (ev.window)) 2019 if (scrollBar.state && ev.window == scrollBar.win)
1962 { 2020 {
1963 scrollBar.setIdle (); 2021 page_dirn direction = NO_DIR;
2022
2023 if (scrollBar.upButton (ev.y))
2024 direction = UP; /* up */
2025 else if (scrollBar.dnButton (ev.y))
2026 direction = DN; /* down */
2027
2028 scrollBar.state = SB_STATE_IDLE;
1964 /* 2029 /*
1965 * Rxvt-style scrollbar: 2030 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 2031 * move up if mouse is above slider
1967 * move dn if mouse is below slider 2032 * move dn if mouse is below slider
1968 * 2033 *
… …
1977 /* 2042 /*
1978 * Mouse report disabled scrollbar: 2043 * Mouse report disabled scrollbar:
1979 * arrow buttons - send up/down 2044 * arrow buttons - send up/down
1980 * click on scrollbar - send pageup/down 2045 * click on scrollbar - send pageup/down
1981 */ 2046 */
1982 if ((scrollBar.style == R_SB_NEXT 2047 if (direction == UP)
1983 && scrollbarnext_upButton (ev.y))
1984 || (scrollBar.style == R_SB_RXVT
1985 && scrollbarrxvt_upButton (ev.y)))
1986 tt_printf ("\033[A"); 2048 tt_printf ("\033[A");
1987 else if ((scrollBar.style == R_SB_NEXT 2049 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"); 2050 tt_printf ("\033[B");
1992 else 2051 else
1993 switch (ev.button) 2052 switch (ev.button)
1994 { 2053 {
1995 case Button2: 2054 case Button2:
… …
2002 tt_printf ("\033[5~"); 2061 tt_printf ("\033[5~");
2003 break; 2062 break;
2004 } 2063 }
2005 } 2064 }
2006 else 2065 else
2007#endif /* NO_SCROLLBAR_REPORT */ 2066#endif /* NO_SCROLLBAR_REPORT */
2008
2009 {
2010 char upordown = 0;
2011
2012 if (scrollBar.style == R_SB_NEXT)
2013 { 2067 {
2014 if (scrollbarnext_upButton (ev.y)) 2068 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 { 2069 {
2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2071 if (!cont_scroll_ev.is_active ())
2029 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2072 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2073#endif
2031 if (scr_page (upordown < 0 ? UP : DN, 1)) 2074 if (scr_page (direction, 1))
2032 { 2075 {
2033 if (upordown < 0) 2076 if (direction == UP)
2034 scrollBar.setUp (); 2077 scrollBar.state = SB_STATE_UP;
2035 else 2078 else
2036 scrollBar.setDn (); 2079 scrollBar.state = SB_STATE_DOWN;
2037 } 2080 }
2038 } 2081 }
2039 else 2082 else
2040 switch (ev.button) 2083 switch (ev.button)
2041 { 2084 {
2042 case Button2: 2085 case Button2:
2043 switch (scrollbar_align) 2086 switch (scrollBar.align)
2044 { 2087 {
2045 case R_SB_ALIGN_TOP: 2088 case SB_ALIGN_TOP:
2046 csrO = 0; 2089 csrO = 0;
2047 break; 2090 break;
2048 case R_SB_ALIGN_CENTRE: 2091 case SB_ALIGN_CENTRE:
2049 csrO = (scrollBar.bot - scrollBar.top) / 2; 2092 csrO = (scrollBar.bot - scrollBar.top) / 2;
2050 break; 2093 break;
2051 case R_SB_ALIGN_BOTTOM: 2094 case SB_ALIGN_BOTTOM:
2052 csrO = scrollBar.bot - scrollBar.top; 2095 csrO = scrollBar.bot - scrollBar.top;
2053 break; 2096 break;
2054 } 2097 }
2055 2098
2056 if (scrollBar.style == R_SB_XTERM 2099 if (scrollBar.style == SB_STYLE_XTERM
2057 || scrollbar_above_slider (ev.y) 2100 || scrollBar.above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2101 || scrollBar.below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2102 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2060 2103
2061 scrollBar.setMotion (); 2104 scrollBar.state = SB_STATE_MOTION;
2062 break; 2105 break;
2063 2106
2064 case Button1: 2107 case Button1:
2065 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2108 if (scrollBar.align == SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2109 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2110 /* FALLTHROUGH */
2068 2111
2069 case Button3: 2112 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2113 if (scrollBar.style != SB_STYLE_XTERM)
2071 { 2114 {
2072 if (scrollbar_above_slider (ev.y)) 2115 if (scrollBar.above_slider (ev.y))
2073# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2074 scr_page (UP, nrow - 1); 2117 scr_page (UP, nrow - 1);
2075# else 2118# else
2076 scr_page (UP, nrow / 4); 2119 scr_page (UP, nrow / 4);
2077# endif 2120# endif
2078 else if (scrollbar_below_slider (ev.y)) 2121 else if (scrollBar.below_slider (ev.y))
2079# ifdef RXVT_SCROLL_FULL 2122# ifdef RXVT_SCROLL_FULL
2080 scr_page (DN, nrow - 1); 2123 scr_page (DN, nrow - 1);
2081# else 2124# else
2082 scr_page (DN, nrow / 4); 2125 scr_page (DN, nrow / 4);
2083# endif 2126# endif
2084 else 2127 else
2085 scrollBar.setMotion (); 2128 scrollBar.state = SB_STATE_MOTION;
2086 } 2129 }
2087 else 2130 else
2088 { 2131 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2132 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2133 (nrow
2091 * scrollbar_position (ev.y) 2134 * scrollBar.position (ev.y)
2092 / scrollbar_size ())); 2135 / scrollBar.size ()));
2093 } 2136 }
2094 2137
2095 break; 2138 break;
2096 } 2139 }
2097 } 2140 }
… …
2107 2150
2108 csrO = 0; /* reset csr Offset */ 2151 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2152 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2153 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2154
2112 if (scrollbar_isUpDn ()) 2155 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2113 { 2156 {
2114 scrollBar.setIdle (); 2157 scrollBar.state = SB_STATE_IDLE;
2115 scrollbar_show (0); 2158 scrollBar.show (0);
2116 } 2159 }
2117 2160
2118#ifdef SELECTION_SCROLLING 2161#ifdef SELECTION_SCROLLING
2119 if (sel_scroll_ev.active)
2120 sel_scroll_ev.stop(); 2162 sel_scroll_ev.stop();
2121#endif 2163#endif
2122 2164
2123 if (ev.window == vt) 2165 if (ev.window == vt)
2124 { 2166 {
2125 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2167 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2140#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2141 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2142 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2143 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2144 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2145 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2146 { 2188 {
2147 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2148 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2149 mouse_report (ev); 2191 mouse_report (ev);
2150 } 2192 }
2151#else /* MOUSE_REPORT_DOUBLECLICK */ 2193#else /* MOUSE_REPORT_DOUBLECLICK */
2152 MEvent.button = AnyButton; 2194 MEvent.button = AnyButton;
2153 mouse_report (ev); 2195 mouse_report (ev);
2154#endif /* MOUSE_REPORT_DOUBLECLICK */ 2196#endif /* MOUSE_REPORT_DOUBLECLICK */
2155 return; 2197 return;
2156 } 2198 }
2157 2199
2158 /* 2200 /*
2159 * dumb hack to compensate for the failure of click-and-drag 2201 * dumb hack to compensate for the failure of click-and-drag
… …
2170 case Button3: 2212 case Button3:
2171 selection_make (ev.time); 2213 selection_make (ev.time);
2172 break; 2214 break;
2173 2215
2174 case Button2: 2216 case Button2:
2175 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2217 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2218 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2177 break; 2219 break;
2178 2220
2179#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2180 case Button4: 2222 case Button4:
2181 case Button5: 2223 case Button5:
2182 { 2224 {
2183 int i; 2225 int lines;
2184 page_dirn v; 2226 page_dirn dirn;
2185 2227
2186 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2187 2229
2188 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2189 i = 1; 2231 lines = 1;
2190 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2191 i = nrow - 1; 2233 lines = nrow - 1;
2192 else 2234 else
2193 i = 5; 2235 lines = 5;
2194 2236
2195# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2196 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2197 { 2239 {
2198 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201 2242
2202 if (slip_wheel_ev.at < NOW) 2243 if (!slip_wheel_ev.is_active ())
2203 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204
2205 slip_wheel_ev.start ();
2206 } 2245 }
2207 else 2246 else
2247# endif
2208 { 2248 {
2209# endif
2210 scr_page (v, i); 2249 scr_page (dirn, lines);
2211 scrollbar_show (1); 2250 scrollBar.show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2251 }
2214# endif
2215 } 2252 }
2216 break; 2253 break;
2217#endif 2254#endif
2218 } 2255 }
2219 } 2256 }
2220} 2257}
2221 2258
2222/*}}} */ 2259/*}}} */
2223 2260
2224bool 2261void ecb_hot
2225rxvt_term::cmd_parse () 2262rxvt_term::cmd_parse ()
2226{ 2263{
2227 bool flag = false;
2228 wchar_t ch = NOCHAR; 2264 wchar_t ch = NOCHAR;
2229 char *seq_begin; // remember start of esc-sequence here 2265 char *seq_begin; // remember start of esc-sequence here
2230 2266
2231 for (;;) 2267 for (;;)
2232 { 2268 {
2233 if (ch == NOCHAR) 2269 if (ecb_unlikely (ch == NOCHAR))
2234 { 2270 {
2235 seq_begin = cmdbuf_ptr; 2271 seq_begin = cmdbuf_ptr;
2236 ch = next_char (); 2272 ch = next_char ();
2237 2273
2238 if (ch == NOCHAR) 2274 if (ch == NOCHAR)
2239 break; 2275 break;
2240 } 2276 }
2241 2277
2242 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2278 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2243 { 2279 {
2244 if (!seen_input) 2280 if (ecb_unlikely (!seen_input))
2245 { 2281 {
2246 seen_input = 1; 2282 seen_input = 1;
2247 // many badly-written programs (e.g. jed) contain a race condition: 2283 // many badly-written programs (e.g. jed) contain a race condition:
2248 // they first read the screensize and then install a SIGWINCH handler. 2284 // they first read the screensize and then install a SIGWINCH handler.
2249 // some window managers resize the window early, and these programs 2285 // some window managers resize the window early, and these programs
… …
2262 wchar_t *str = buf; 2298 wchar_t *str = buf;
2263 wchar_t *eol = str + min (ncol, UBUFSIZ); 2299 wchar_t *eol = str + min (ncol, UBUFSIZ);
2264 2300
2265 for (;;) 2301 for (;;)
2266 { 2302 {
2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2303 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2268 break; 2304 break;
2269 2305
2270 *str++ = ch; 2306 *str++ = ch;
2271 2307
2272 if (ch == C0_LF || str >= eol) 2308 if (ecb_unlikely (ch == C0_LF || str >= eol))
2273 { 2309 {
2274 if (ch == C0_LF) 2310 if (ch == C0_LF)
2275 nlines++; 2311 nlines++;
2276 2312
2277 refresh_count++; 2313 refresh_count++;
2278 2314
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2315 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2316 {
2281 refresh_count = 0; 2317 refresh_count = 0;
2282 2318
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2319 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2320 {
2285 refreshnow = true; 2321 refreshnow = true;
2286 ch = NOCHAR; 2322 ch = NOCHAR;
2287 break; 2323 break;
2288 } 2324 }
… …
2326 * What the heck we'll cheat and only refresh less than every page-full. 2362 * What the heck we'll cheat and only refresh less than every page-full.
2327 * if skipScroll is enabled. 2363 * if skipScroll is enabled.
2328 */ 2364 */
2329 if (refreshnow) 2365 if (refreshnow)
2330 { 2366 {
2331 flag = true;
2332 scr_refresh (); 2367 scr_refresh ();
2333 want_refresh = 1; 2368 want_refresh = 1;
2334 } 2369 }
2335
2336 } 2370 }
2337 else 2371 else
2338 { 2372 {
2339 try 2373 try
2340 { 2374 {
… …
2348 } 2382 }
2349 2383
2350 ch = NOCHAR; 2384 ch = NOCHAR;
2351 } 2385 }
2352 } 2386 }
2353
2354 return flag;
2355} 2387}
2356 2388
2357// read the next character 2389// read the next character
2358wchar_t 2390wchar_t ecb_hot
2359rxvt_term::next_char () NOTHROW 2391rxvt_term::next_char () NOTHROW
2360{ 2392{
2361 while (cmdbuf_ptr < cmdbuf_endp) 2393 while (cmdbuf_ptr < cmdbuf_endp)
2362 { 2394 {
2363 // assume 7-bit to be ascii ALWAYS 2395 // assume 7-bit to be ascii ALWAYS
2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2365 return *cmdbuf_ptr++; 2397 return *cmdbuf_ptr++;
2366 2398
2367 wchar_t wc; 2399 wchar_t wc;
2368 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2369 2401
… …
2373 cmdbuf_ptr = cmdbuf_endp; 2405 cmdbuf_ptr = cmdbuf_endp;
2374 break; 2406 break;
2375 } 2407 }
2376 2408
2377 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2410 {
2411 mbstate.reset (); // reset now undefined conversion state
2412 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2413 // in which case we "erroneously" return the next byte which might be valid.
2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2414 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2415 }
2379 2416
2380 // assume wchar == unicode 2417 // assume wchar == unicode
2381 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
2382 return wc & UNICODE_MASK; 2419 return wc & UNICODE_MASK;
2383 } 2420 }
2384 2421
2385 return NOCHAR; 2422 return NOCHAR;
2386} 2423}
2387 2424
2388// read the next octet 2425// read the next octet
2389uint32_t 2426uint32_t ecb_hot
2390rxvt_term::next_octet () NOTHROW 2427rxvt_term::next_octet () NOTHROW
2391{ 2428{
2392 return cmdbuf_ptr < cmdbuf_endp 2429 return cmdbuf_ptr < cmdbuf_endp
2393 ? (unsigned char)*cmdbuf_ptr++ 2430 ? (unsigned char)*cmdbuf_ptr++
2394 : NOCHAR; 2431 : NOCHAR;
2395} 2432}
2396 2433
2397static class out_of_input out_of_input; 2434static class out_of_input out_of_input;
2398 2435
2399/* rxvt_cmd_getc () - Return next input character */ 2436wchar_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)) 2437rxvt_term::cmd_getc () THROW ((class out_of_input))
2406{ 2438{
2407 wchar_t c = next_char (); 2439 wchar_t c = next_char ();
2408 2440
2409 if (c == NOCHAR) 2441 if (c == NOCHAR)
2410 throw out_of_input; 2442 throw out_of_input;
2411 2443
2412 return c; 2444 return c;
2413} 2445}
2414 2446
2415uint32_t 2447uint32_t ecb_hot
2416rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2448rxvt_term::cmd_get8 () THROW ((class out_of_input))
2417{ 2449{
2418 uint32_t c = next_octet (); 2450 uint32_t c = next_octet ();
2419 2451
2420 if (c == NOCHAR) 2452 if (c == NOCHAR)
… …
2424} 2456}
2425 2457
2426/*{{{ print pipe */ 2458/*{{{ print pipe */
2427/*----------------------------------------------------------------------*/ 2459/*----------------------------------------------------------------------*/
2428#ifdef PRINTPIPE 2460#ifdef PRINTPIPE
2429FILE * 2461FILE * ecb_cold
2430rxvt_term::popen_printer () 2462rxvt_term::popen_printer ()
2431{ 2463{
2432 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2464 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2433 2465
2434 if (stream == NULL) 2466 if (stream == NULL)
2435 rxvt_warn ("can't open printer pipe, not printing.\n"); 2467 rxvt_warn ("can't open printer pipe, not printing.\n");
2436 2468
2437 return stream; 2469 return stream;
2438} 2470}
2439 2471
2440int 2472int ecb_cold
2441rxvt_term::pclose_printer (FILE *stream) 2473rxvt_term::pclose_printer (FILE *stream)
2442{ 2474{
2443 fflush (stream); 2475 fflush (stream);
2444 return pclose (stream); 2476 return pclose (stream);
2445} 2477}
2446 2478
2447/* 2479/*
2448 * simulate attached vt100 printer 2480 * simulate attached vt100 printer
2449 */ 2481 */
2450void 2482void ecb_cold
2451rxvt_term::process_print_pipe () 2483rxvt_term::process_print_pipe ()
2452{ 2484{
2453 int done; 2485 FILE *fd = popen_printer ();
2454 FILE *fd;
2455 2486
2456 if ((fd = popen_printer ()) == NULL) 2487 if (!fd)
2457 return; 2488 return;
2458 2489
2459 /* 2490 /*
2460 * Send all input to the printer until either ESC[4i or ESC[?4i 2491 * Send all input to the printer until either ESC[4i or ESC[?4i
2461 * is received. 2492 * is received.
2462 */ 2493 */
2463 for (done = 0; !done;) 2494 for (int done = 0; !done; )
2464 { 2495 {
2465 unsigned char buf[8]; 2496 unsigned char buf[8];
2466 unicode_t ch; 2497 unicode_t ch;
2467 unsigned int i, len; 2498 unsigned int i, len;
2468 2499
… …
2499 } 2530 }
2500 } 2531 }
2501 2532
2502 pclose_printer (fd); 2533 pclose_printer (fd);
2503} 2534}
2504#endif /* PRINTPIPE */ 2535#endif /* PRINTPIPE */
2505/*}}} */ 2536/*}}} */
2506 2537
2507/* *INDENT-OFF* */
2508enum { 2538enum {
2509 C1_40 = 0x40, 2539 C1_40 = 0x40,
2510 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2540 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2511 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2541 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2512 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2542 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2513 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2543 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2514}; 2544};
2515/* *INDENT-ON* */
2516 2545
2517/*{{{ process non-printing single characters */ 2546/*{{{ process non-printing single characters */
2518void 2547void ecb_hot
2519rxvt_term::process_nonprinting (unicode_t ch) 2548rxvt_term::process_nonprinting (unicode_t ch)
2520{ 2549{
2521 switch (ch) 2550 switch (ch)
2522 { 2551 {
2523 case C0_ESC: 2552 case C0_ESC:
… …
2553 scr_charset_choose (0); 2582 scr_charset_choose (0);
2554 break; 2583 break;
2555 2584
2556#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2557 // 8-bit controls 2586 // 8-bit controls
2558 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2559 process_dcs_seq (); 2588 process_dcs_seq ();
2560 break; 2589 break;
2561 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2562 process_csi_seq (); 2591 process_csi_seq ();
2563 break; 2592 break;
2564 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2565 process_osc_seq (); 2594 process_osc_seq ();
2566 break; 2595 break;
2567#endif 2596#endif
2568 } 2597 }
2569} 2598}
2570/*}}} */ 2599/*}}} */
2571 2600
2572 2601
2573/*{{{ process VT52 escape sequences */ 2602/*{{{ process VT52 escape sequences */
2574void 2603void ecb_cold
2575rxvt_term::process_escape_vt52 (unicode_t ch) 2604rxvt_term::process_escape_vt52 (unicode_t ch)
2576{ 2605{
2577 int row, col; 2606 int row, col;
2578 2607
2579 switch (ch) 2608 switch (ch)
… …
2613 break; 2642 break;
2614 case 'Z': /* identify the terminal type */ 2643 case 'Z': /* identify the terminal type */
2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2644 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2616 break; 2645 break;
2617 case '<': /* turn off VT52 mode */ 2646 case '<': /* turn off VT52 mode */
2618 PrivMode (0, PrivMode_vt52); 2647 priv_modes &= ~PrivMode_vt52;
2619 break; 2648 break;
2620 case 'F': /* use special graphics character set */ 2649 case 'F': /* use special graphics character set */
2621 case 'G': /* use regular character set */ 2650 case 'G': /* use regular character set */
2622 /* unimplemented */ 2651 /* unimplemented */
2623 break; 2652 break;
… …
2629} 2658}
2630/*}}} */ 2659/*}}} */
2631 2660
2632 2661
2633/*{{{ process escape sequences */ 2662/*{{{ process escape sequences */
2634void 2663void ecb_hot
2635rxvt_term::process_escape_seq () 2664rxvt_term::process_escape_seq ()
2636{ 2665{
2637 unicode_t ch = cmd_getc (); 2666 unicode_t ch = cmd_getc ();
2638 2667
2639 if (priv_modes & PrivMode_vt52) 2668 if (priv_modes & PrivMode_vt52)
… …
2642 return; 2671 return;
2643 } 2672 }
2644 2673
2645 switch (ch) 2674 switch (ch)
2646 { 2675 {
2647 /* case 1: do_tek_mode (); break; */
2648 case '#': 2676 case '#':
2649 if (cmd_getc () == '8') 2677 if (cmd_getc () == '8')
2650 scr_E (); 2678 scr_E ();
2651 break; 2679 break;
2652 case '(': 2680 case '(':
… …
2675#if !ENABLE_MINIMAL 2703#if !ENABLE_MINIMAL
2676 case '9': 2704 case '9':
2677 scr_forwardindex (); 2705 scr_forwardindex ();
2678 break; 2706 break;
2679#endif 2707#endif
2708 // DECPAM/DECPNM
2680 case '=': 2709 case '=':
2710 priv_modes |= PrivMode_aplKP;
2711 break;
2681 case '>': 2712 case '>':
2682 PrivMode ((ch == '='), PrivMode_aplKP); 2713 priv_modes &= ~PrivMode_aplKP;
2683 break; 2714 break;
2684 2715
2685 case C1_40: 2716 case C1_40:
2686 cmd_getc (); 2717 cmd_getc ();
2687 break; 2718 break;
… …
2691 2722
2692 /* 8.3.87: NEXT LINE */ 2723 /* 8.3.87: NEXT LINE */
2693 case C1_NEL: /* ESC E */ 2724 case C1_NEL: /* ESC E */
2694 { 2725 {
2695 wchar_t nlcr[] = { C0_LF, C0_CR }; 2726 wchar_t nlcr[] = { C0_LF, C0_CR };
2696 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2697 } 2728 }
2698 break; 2729 break;
2699 2730
2700 /* kidnapped escape sequence: Should be 8.3.48 */ 2731 /* kidnapped escape sequence: Should be 8.3.48 */
2701 case C1_ESA: /* ESC G */ 2732 case C1_ESA: /* ESC G */
2702 process_graphics (); 2733 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q')
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2703 break; 2736 break;
2704 2737
2705 /* 8.3.63: CHARACTER TABULATION SET */ 2738 /* 8.3.63: CHARACTER TABULATION SET */
2706 case C1_HTS: /* ESC H */ 2739 case C1_HTS: /* ESC H */
2707 scr_set_tab (1); 2740 scr_set_tab (1);
… …
2711 case C1_RI: /* ESC M */ 2744 case C1_RI: /* ESC M */
2712 scr_index (DN); 2745 scr_index (DN);
2713 break; 2746 break;
2714 2747
2715 /* 8.3.142: SINGLE-SHIFT TWO */ 2748 /* 8.3.142: SINGLE-SHIFT TWO */
2716 /*case C1_SS2: scr_single_shift (2); break; */ 2749 /* case C1_SS2: break; */
2717 2750
2718 /* 8.3.143: SINGLE-SHIFT THREE */ 2751 /* 8.3.143: SINGLE-SHIFT THREE */
2719 /*case C1_SS3: scr_single_shift (3); break; */ 2752 /* case C1_SS3: break; */
2720 2753
2721 /* 8.3.27: DEVICE CONTROL STRING */ 2754 /* 8.3.27: DEVICE CONTROL STRING */
2722 case C1_DCS: /* ESC P */ 2755 case C1_DCS: /* ESC P */
2723 process_dcs_seq (); 2756 process_dcs_seq ();
2724 break; 2757 break;
… …
2726 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2759 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2727 case C1_SCI: /* ESC Z */ 2760 case C1_SCI: /* ESC Z */
2728 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2761 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2729 break; /* steal obsolete ESC [ c */ 2762 break; /* steal obsolete ESC [ c */
2730 2763
2731 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2764 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2732 case C1_CSI: /* ESC [ */ 2765 case C1_CSI: /* ESC [ */
2733 process_csi_seq (); 2766 process_csi_seq ();
2734 break; 2767 break;
2735 2768
2736 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2769 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2737 case C1_OSC: /* ESC ] */ 2770 case C1_OSC: /* ESC ] */
2738 process_osc_seq (); 2771 process_osc_seq ();
2739 break; 2772 break;
2740 2773
2741 /* 8.3.106: RESET TO INITIAL STATE */ 2774 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2742 case 'c': 2775 case 'c':
2743 mbstate.reset (); 2776 mbstate.reset ();
2744 scr_poweron (); 2777 scr_poweron ();
2745 scrollbar_show (1); 2778 scrollBar.show (1);
2746 break; 2779 break;
2747 2780
2748 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2781 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2749 case 'n': 2782 case 'n':
2750 scr_charset_choose (2); 2783 scr_charset_choose (2);
… …
2757 } 2790 }
2758} 2791}
2759/*}}} */ 2792/*}}} */
2760 2793
2761/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2794/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2762/* *INDENT-OFF* */
2763enum { 2795enum {
2764 CSI_ICH = 0x40, 2796 CSI_ICH = 0x40,
2765 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2797 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2766 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2798 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2767 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2799 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2770 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2802 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2771 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2803 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2772 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2804 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2773}; 2805};
2774 2806
2775#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2807#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2776 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2808 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2777 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2809 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2778#define get_byte_array_bit(array, bit) \ 2810#define get_byte_array_bit(array, bit) \
2779 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2811 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2780 2812
2781const unsigned char csi_defaults[] = 2813static const unsigned char csi_defaults[] =
2782 { 2814 {
2783 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2815 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2784 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2816 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2785 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2817 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2786 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2818 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2787 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2819 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2788 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2820 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2789 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2821 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2790 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2791 }; 2823 };
2792/* *INDENT-ON* */
2793 2824
2794void 2825void ecb_hot
2795rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2796{ 2827{
2797 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2798 unsigned int nargs, p; 2829 unsigned int nargs, p;
2799 int n, ndef; 2830 int n, ndef;
2800 int arg[ESC_ARGS]; 2831 int arg[ESC_ARGS] = { };
2801 2832
2802 memset (arg, 0, sizeof (arg));
2803 nargs = 0; 2833 nargs = 0;
2804 2834
2805 priv = 0; 2835 priv = 0;
2806 ch = cmd_getc (); 2836 ch = cmd_getc ();
2807 if (ch >= '<' && ch <= '?') 2837 if ((ch >= '<' && ch <= '?') || ch == '!')
2838 {
2808 { /* '<' '=' '>' '?' */ 2839 /* '<' '=' '>' '?' '!' */
2809 priv = ch; 2840 priv = ch;
2810 ch = cmd_getc (); 2841 ch = cmd_getc ();
2811 } 2842 }
2812 2843
2844 prev_ch = 0;
2813 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2814 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2815 { 2847 {
2816 if (isdigit (ch)) 2848 if (isdigit (ch))
2817 { 2849 {
… …
2827 n = -1; 2859 n = -1;
2828 } 2860 }
2829 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2830 process_nonprinting (ch); 2862 process_nonprinting (ch);
2831 2863
2864 prev_ch = ch;
2832 ch = cmd_getc (); 2865 ch = cmd_getc ();
2833 } 2866 }
2834 2867
2835 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2836 return; 2869 return;
… …
2856 { 2889 {
2857 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2890 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2858 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2891 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2859 // 2892 //
2860 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2893 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2861 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2894 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2862 // that we do not support xterm mouse reporting (should be 95 when we do). 2895 // versions.
2863 // 2896 //
2864 tt_printf ("\033[>%d;94;0c", 'U'); 2897 tt_printf ("\033[>%d;95;0c", 'U');
2865 } 2898 }
2866 break; 2899 break;
2900
2867 case '?': 2901 case '?':
2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2902 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2869 process_terminal_mode (ch, priv, nargs, arg); 2903 process_terminal_mode (ch, priv, nargs, arg);
2870 break; 2904 break;
2905
2906 case '!':
2907 if (ch == CSI_70)
2908 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset ();
2911
2912 static const int pm_h[] = { 7, 25 };
2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2914
2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2871 } 2917 }
2918 break;
2919 }
2920
2872 return; 2921 return;
2873 } 2922 }
2874 2923
2875 switch (ch) 2924 switch (ch)
2876 { 2925 {
… …
2890 } 2939 }
2891 break; 2940 break;
2892#endif 2941#endif
2893 2942
2894 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2943 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2895 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2944 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2896 arg[0] = -arg[0]; 2945 arg[0] = -arg[0];
2897 /* FALLTHROUGH */ 2946 /* FALLTHROUGH */
2898 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2947 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2900 scr_gotorc (arg[0], 0, RELATIVE); 2949 scr_gotorc (arg[0], 0, RELATIVE);
2901 break; 2950 break;
2902 2951
2903 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2904 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3054 scr_insert_mode (1); 3103 scr_insert_mode (1);
3055 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3056 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3057 break; 3106 break;
3058 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3059 /* 3113 /*
3060 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3061 */ 3115 */
3062 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3063 if (nargs == 1) 3117 if (nargs == 1)
… …
3091 } 3145 }
3092} 3146}
3093/*}}} */ 3147/*}}} */
3094 3148
3095#if !ENABLE_MINIMAL 3149#if !ENABLE_MINIMAL
3096/* ARGSUSED */
3097void 3150void
3098rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3151rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3099{ 3152{
3100 int x, y; 3153 int x, y;
3101 XWindowAttributes wattr; 3154 XWindowAttributes wattr;
… …
3110 { 3163 {
3111 /* 3164 /*
3112 * commands 3165 * commands
3113 */ 3166 */
3114 case 1: /* deiconify window */ 3167 case 1: /* deiconify window */
3115 XMapWindow (dpy, parent[0]); 3168 XMapWindow (dpy, parent);
3116 break; 3169 break;
3117 case 2: /* iconify window */ 3170 case 2: /* iconify window */
3118 XIconifyWindow (dpy, parent[0], display->screen); 3171 XIconifyWindow (dpy, parent, display->screen);
3119 break; 3172 break;
3120 case 3: /* set position (pixels) */ 3173 case 3: /* set position (pixels) */
3121 XMoveWindow (dpy, parent[0], args[1], args[2]); 3174 XMoveWindow (dpy, parent, args[1], args[2]);
3122 break; 3175 break;
3123 case 4: /* set size (pixels) */ 3176 case 4: /* set size (pixels) */
3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3177 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3125 break; 3178 break;
3126 case 5: /* raise window */ 3179 case 5: /* raise window */
3127 XRaiseWindow (dpy, parent[0]); 3180 XRaiseWindow (dpy, parent);
3128 break; 3181 break;
3129 case 6: /* lower window */ 3182 case 6: /* lower window */
3130 XLowerWindow (dpy, parent[0]); 3183 XLowerWindow (dpy, parent);
3131 break; 3184 break;
3132 case 7: /* refresh window */ 3185 case 7: /* refresh window */
3133 scr_touch (true); 3186 scr_touch (true);
3134 break; 3187 break;
3135 case 8: /* set size (chars) */ 3188 case 8: /* set size (chars) */
… …
3138 break; 3191 break;
3139 3192
3140 //case 9: NYI, TODO, restore maximized window or maximize window 3193 //case 9: NYI, TODO, restore maximized window or maximize window
3141 default: 3194 default:
3142 if (args[0] >= 24) /* set height (chars) */ 3195 if (args[0] >= 24) /* set height (chars) */
3143 set_widthheight ((unsigned int)width, 3196 set_widthheight ((unsigned int)vt_width,
3144 (unsigned int) (args[1] * fheight)); 3197 (unsigned int) (args[1] * fheight));
3145 break; 3198 break;
3146 3199
3147 /* 3200 /*
3148 * reports - some output format copied from XTerm 3201 * reports - some output format copied from XTerm
3149 */ 3202 */
3150 case 11: /* report window state */ 3203 case 11: /* report window state */
3151 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3205 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3153 break; 3206 break;
3154 case 13: /* report window position */ 3207 case 13: /* report window position */
3155 XGetWindowAttributes (dpy, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3156 XTranslateCoordinates (dpy, parent[0], wattr.root, 3209 XTranslateCoordinates (dpy, parent, wattr.root,
3157 -wattr.border_width, -wattr.border_width, 3210 -wattr.border_width, -wattr.border_width,
3158 &x, &y, &wdummy); 3211 &x, &y, &wdummy);
3159 tt_printf ("\033[3;%d;%dt", x, y); 3212 tt_printf ("\033[3;%d;%dt", x, y);
3160 break; 3213 break;
3161 case 14: /* report window size (pixels) */ 3214 case 14: /* report window size (pixels) */
3162 XGetWindowAttributes (dpy, parent[0], &wattr); 3215 XGetWindowAttributes (dpy, parent, &wattr);
3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3216 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3164 break; 3217 break;
3165 case 18: /* report text area size (chars) */ 3218 case 18: /* report text area size (chars) */
3166 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3219 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3167 break; 3220 break;
… …
3169 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3222 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3170 break; 3223 break;
3171 case 20: /* report icon label */ 3224 case 20: /* report icon label */
3172 { 3225 {
3173 char *s; 3226 char *s;
3174 XGetIconName (dpy, parent[0], &s); 3227 XGetIconName (dpy, parent, &s);
3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3228 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3176 XFree (s); 3229 XFree (s);
3177 } 3230 }
3178 break; 3231 break;
3179 case 21: /* report window title */ 3232 case 21: /* report window title */
3180 { 3233 {
3181 char *s; 3234 char *s;
3182 XFetchName (dpy, parent[0], &s); 3235 XFetchName (dpy, parent, &s);
3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3236 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3184 XFree (s); 3237 XFree (s);
3185 } 3238 }
3186 break; 3239 break;
3187 } 3240 }
… …
3197rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3198{ 3251{
3199 unicode_t ch; 3252 unicode_t ch;
3200 bool seen_esc = false; 3253 bool seen_esc = false;
3201 unsigned int n = 0; 3254 unsigned int n = 0;
3202 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3203 3256
3204 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3205 { 3258 {
3206 if (seen_esc) 3259 if (seen_esc)
3207 { 3260 {
… …
3222 else if (ch < 0x20) 3275 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3224 3277
3225 seen_esc = false; 3278 seen_esc = false;
3226 3279
3227 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3228 // stop at some sane length 3281 // stop at some sane length
3229 return NULL; 3282 return NULL;
3230 3283
3231 string[n++] = ch; 3284 string[n++] = ch;
3232 } 3285 }
… …
3243 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3296 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3244 */ 3297 */
3245void 3298void
3246rxvt_term::process_dcs_seq () 3299rxvt_term::process_dcs_seq ()
3247{ 3300{
3248 char *s;
3249 unicode_t eh;
3250
3251 /* 3301 /*
3252 * Not handled yet 3302 * Not handled yet
3253 */ 3303 */
3304
3305 unicode_t eh;
3254 s = get_to_st (eh); 3306 char *s = get_to_st (eh);
3255 if (s) 3307 if (s)
3256 free (s); 3308 free (s);
3257 3309
3258 return; 3310 return;
3259} 3311}
… …
3263 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3315 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3264 */ 3316 */
3265void 3317void
3266rxvt_term::process_osc_seq () 3318rxvt_term::process_osc_seq ()
3267{ 3319{
3268 unicode_t ch, eh;
3269 int arg; 3320 int arg;
3270 3321
3271 ch = cmd_getc (); 3322 unicode_t ch = cmd_getc ();
3272 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3323 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3273 arg = arg * 10 + (ch - '0'); 3324 arg = arg * 10 + (ch - '0');
3274 3325
3275 if (ch == ';') 3326 if (ch == ';')
3276 { 3327 {
3328 unicode_t eh;
3277 char *s = get_to_st (eh); 3329 char *s = get_to_st (eh);
3278 3330
3279 if (s) 3331 if (s)
3280 { 3332 {
3281 process_xterm_seq (arg, s, eh); 3333 process_xterm_seq (arg, s, eh);
3282 free (s); 3334 free (s);
3283 } 3335 }
3284 } 3336 }
3285} 3337}
3286 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363
3364 unsigned int color = (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r / (0xff / (Red_levels - 1));
3366 unsigned int idx_g = g / (0xff / (Green_levels - 1));
3367 unsigned int idx_b = b / (0xff / (Blue_levels - 1));
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369
3370 // minor issue: could update idx 0 few more times
3371 if (rgb24_seqno[idx] == 0
3372 && rgb24_color[idx] == 0)
3373 goto update;
3374
3375 if (rgb24_color[idx] == color)
3376 return idx + minTermCOLOR24;
3377
3378 for (int i = idx_r - 1; i <= (signed) idx_r + 1; i++)
3379 {
3380 if (!IN_RANGE_EXC (i, 0, Red_levels))
3381 continue;
3382
3383 for (int j = idx_g - 1; j <= (signed) idx_g + 1; j++)
3384 {
3385 if (!IN_RANGE_EXC (j, 0, Green_levels))
3386 continue;
3387
3388 for (int k = idx_b - 1; k <= (signed) idx_b + 1; k++)
3389 {
3390 if (!IN_RANGE_EXC (k, 0, Blue_levels))
3391 continue;
3392
3393 unsigned int index = colorcube_index (i, j, k);
3394
3395 // minor issue: could update index 0 few more times
3396 if (rgb24_seqno[index] == 0
3397 && rgb24_color[index] == 0)
3398 {
3399 idx = index;
3400 goto update;
3401 }
3402
3403 if (rgb24_color[index] == color)
3404 return index + minTermCOLOR24;
3405
3406 if (IN_RANGE_INC (rgb24_seqno[idx], rgb24_seqno[index], 0x7fff))
3407 idx = index;
3408 }
3409 }
3410 }
3411
3412update:
3413 rgb24_color[idx] = color;
3414 rgb24_seqno[idx] = ++rgb24_sequence;
3415
3416 idx += minTermCOLOR24;
3417 pix_colors_focused [idx].free (this);
3418 pix_colors_focused [idx].set (this, rgba (r * 0x0101,
3419 g * 0x0101,
3420 b * 0x0101));
3421 update_fade_color (idx, false);
3422
3423 return idx;
3424}
3425
3287void 3426void
3288rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3427rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3289{ 3428{
3290 if (str[0] == '?' && !str[1]) 3429 if (str[0] == '?' && !str[1])
3291 { 3430 {
3292 rgba c; 3431 rgba c;
3293 pix_colors_focused[color].get (c); 3432 pix_colors_focused[color].get (c);
3294 3433
3295#if XFT 3434#if XFT
3296 if (c.a != rgba::MAX_CC) 3435 if (c.a != rgba::MAX_CC)
3297 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3436 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3298 else 3437 else
3299#endif 3438#endif
3300 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3439 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3301 } 3440 }
3302 else 3441 else
… …
3305 3444
3306/* 3445/*
3307 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3446 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3308 */ 3447 */
3309void 3448void
3310rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3449rxvt_term::process_xterm_seq (int op, char *str, char resp)
3311{ 3450{
3312 int color; 3451 int color;
3313 char *buf, *name; 3452 char *buf, *name;
3314 bool query = str[0] == '?' && !str[1]; 3453 bool query = str[0] == '?' && !str[1];
3315 int saveop = op; 3454 int saveop = op;
… …
3342 unsigned long bytes_after; 3481 unsigned long bytes_after;
3343 unsigned char *value = 0; 3482 unsigned char *value = 0;
3344 const char *str = ""; 3483 const char *str = "";
3345 3484
3346 if (prop 3485 if (prop
3347 && XGetWindowProperty (dpy, parent[0], 3486 && XGetWindowProperty (dpy, parent,
3348 prop, 0, 1<<16, 0, AnyPropertyType, 3487 prop, 0, 1<<16, 0, AnyPropertyType,
3349 &actual_type, &actual_format, 3488 &actual_type, &actual_format,
3350 &nitems, &bytes_after, &value) == Success 3489 &nitems, &bytes_after, &value) == Success
3351 && actual_type != None 3490 && actual_type != None
3352 && actual_format == 8) 3491 && actual_format == 8)
3353 str = (const char *)(value); 3492 str = (const char *)(value);
3354 3493
3355 tt_printf ("\033]%d;%s%c", op, str, resp); 3494 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3356 3495
3357 XFree (value); 3496 XFree (value);
3358 } 3497 }
3359 else 3498 else
3360 { 3499 {
3361 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3500 char *eq = strchr (str, '=');
3362 3501
3363 if (eq) 3502 if (eq)
3364 { 3503 {
3365 *eq = 0; 3504 *eq = 0;
3366 set_utf8_property (display->atom (str), eq + 1); 3505 set_utf8_property (display->atom (str), eq + 1);
3367 } 3506 }
3368 else 3507 else
3369 XDeleteProperty (dpy, parent[0], 3508 XDeleteProperty (dpy, parent,
3370 display->atom (str)); 3509 display->atom (str));
3371 } 3510 }
3372 break; 3511 break;
3373 3512
3374 case XTerm_Color: 3513 case XTerm_Color:
… …
3387 *buf++ = '\0'; 3526 *buf++ = '\0';
3388 3527
3389 process_color_seq (op, color, name, resp); 3528 process_color_seq (op, color, name, resp);
3390 } 3529 }
3391 break; 3530 break;
3531 case Rxvt_restoreFG:
3392 case XTerm_Color00: 3532 case XTerm_Color00:
3393 process_color_seq (op, Color_fg, str, resp); 3533 process_color_seq (op, Color_fg, str, resp);
3394 break; 3534 break;
3535 case Rxvt_restoreBG:
3395 case XTerm_Color01: 3536 case XTerm_Color01:
3396 process_color_seq (op, Color_bg, str, resp); 3537 process_color_seq (op, Color_bg, str, resp);
3397 break; 3538 break;
3398#ifndef NO_CURSORCOLOR 3539#ifndef NO_CURSORCOLOR
3399 case XTerm_Color_cursor: 3540 case XTerm_Color_cursor:
… …
3404 process_color_seq (op, Color_pointer_fg, str, resp); 3545 process_color_seq (op, Color_pointer_fg, str, resp);
3405 break; 3546 break;
3406 case XTerm_Color_pointer_bg: 3547 case XTerm_Color_pointer_bg:
3407 process_color_seq (op, Color_pointer_bg, str, resp); 3548 process_color_seq (op, Color_pointer_bg, str, resp);
3408 break; 3549 break;
3550#ifdef OPTION_HC
3551 case XTerm_Color_HC:
3552 process_color_seq (op, Color_HC, str, resp);
3553 break;
3554 case XTerm_Color_HTC:
3555 process_color_seq (op, Color_HTC, str, resp);
3556 break;
3557#endif
3409#ifndef NO_BOLD_UNDERLINE_REVERSE 3558#ifndef NO_BOLD_UNDERLINE_REVERSE
3410 case XTerm_Color_RV:
3411 process_color_seq (op, Color_RV, str, resp);
3412 break;
3413 case Rxvt_Color_BD:
3414 case URxvt_Color_BD: 3559 case URxvt_Color_BD:
3415 process_color_seq (op, Color_BD, str, resp); 3560 process_color_seq (op, Color_BD, str, resp);
3416 break; 3561 break;
3417 case Rxvt_Color_UL:
3418 case URxvt_Color_UL: 3562 case URxvt_Color_UL:
3419 process_color_seq (op, Color_UL, str, resp); 3563 process_color_seq (op, Color_UL, str, resp);
3420 break; 3564 break;
3421 case URxvt_Color_IT: 3565 case URxvt_Color_IT:
3422 process_color_seq (op, Color_IT, str, resp); 3566 process_color_seq (op, Color_IT, str, resp);
3423 break; 3567 break;
3424#endif 3568#endif
3425#if ENABLE_TRANSPARENCY 3569 case URxvt_Color_border:
3570 process_color_seq (op, Color_border, str, resp);
3571 break;
3572
3573#if BG_IMAGE_FROM_ROOT
3426 case URxvt_Color_tint: 3574 case URxvt_Color_tint:
3427 process_color_seq (op, Color_tint, str, resp); 3575 process_color_seq (op, Color_tint, str, resp);
3428 { 3576 {
3429 bool changed = false; 3577 bool changed = false;
3578
3430 if (ISSET_PIXCOLOR (Color_tint)) 3579 if (ISSET_PIXCOLOR (Color_tint))
3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3580 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3432 else 3581
3433 changed = bgPixmap.unset_tint ();
3434 if (changed) 3582 if (changed)
3435 update_background (); 3583 update_background ();
3436 } 3584 }
3437 3585
3438 break; 3586 break;
3439#endif 3587#endif
3440 3588
3441#if XPM_BACKGROUND 3589#if BG_IMAGE_FROM_FILE
3442 case Rxvt_Pixmap: 3590 case Rxvt_Pixmap:
3443 if (!strcmp (str, "?")) 3591 if (!strcmp (str, "?"))
3444 { 3592 {
3445 char str[256]; 3593 char str[256];
3594 int h_scale = fimage.h_scale;
3595 int v_scale = fimage.v_scale;
3596 int h_align = fimage.h_align;
3597 int v_align = fimage.v_align;
3446 3598
3447 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3599 sprintf (str, "[%dx%d+%d+%d]",
3448 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3600 h_scale, v_scale,
3449 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3601 h_align, v_align);
3450 process_xterm_seq (XTerm_title, str, CHAR_ST); 3602 process_xterm_seq (XTerm_title, str, CHAR_ST);
3451 } 3603 }
3452 else 3604 else
3453 { 3605 {
3454 int changed = 0; 3606 bool changed = false;
3455 3607
3456 if (*str != ';') 3608 if (*str != ';')
3457 { 3609 {
3458 /* reset to default scaling :*/ 3610 try
3459 bgPixmap.unset_geometry (); 3611 {
3460 if (bgPixmap.set_file (str)) /* change pixmap */ 3612 fimage.set_file_geometry (this, str);
3461 changed++; 3613 changed = true;
3462 str = strchr (str, ';'); 3614 }
3463 if (str == NULL) 3615 catch (const class rxvt_failure_exception &e)
3464 bgPixmap.set_defaultGeometry (); 3616 {
3617 }
3465 } 3618 }
3466 while (str) 3619 else
3467 { 3620 {
3468 str++; 3621 str++;
3469 if (bgPixmap.set_geometry (str)) 3622 if (fimage.set_geometry (str, true))
3470 changed++; 3623 changed = true;
3471 str = strchr (str, ';');
3472 } 3624 }
3625
3473 if (changed) 3626 if (changed)
3627 {
3628 if (bg_window_position_sensitive ())
3629 {
3630 int x, y;
3631 get_window_origin (x, y);
3632 parent_x = x;
3633 parent_y = y;
3634 }
3474 update_background (); 3635 update_background ();
3636 }
3475 } 3637 }
3476 break; 3638 break;
3477#endif 3639#endif
3478
3479 case Rxvt_restoreFG:
3480 set_window_color (Color_fg, str);
3481 break;
3482 case Rxvt_restoreBG:
3483 set_window_color (Color_bg, str);
3484 break;
3485 3640
3486 case XTerm_logfile: 3641 case XTerm_logfile:
3487 // TODO, when secure mode? 3642 // TODO, when secure mode?
3488 break; 3643 break;
3489 3644
… …
3556 break; 3711 break;
3557#endif 3712#endif
3558 3713
3559#if ENABLE_PERL 3714#if ENABLE_PERL
3560 case URxvt_perl: 3715 case URxvt_perl:
3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3716 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3562 ; // no responses yet
3563 break; 3717 break;
3564#endif 3718#endif
3565 } 3719 }
3566} 3720}
3567/*----------------------------------------------------------------------*/ 3721/*----------------------------------------------------------------------*/
… …
3574 * 's' = save 3728 * 's' = save
3575 * 'r' = restore 3729 * 'r' = restore
3576 * 't' = toggle 3730 * 't' = toggle
3577 * so no need for fancy checking 3731 * so no need for fancy checking
3578 */ 3732 */
3579int 3733int ecb_cold
3580rxvt_term::privcases (int mode, unsigned long bit) 3734rxvt_term::privcases (int mode, unsigned long bit)
3581{ 3735{
3582 int state; 3736 int state;
3583 3737
3584 if (mode == 's') 3738 if (mode == 's')
3585 { 3739 {
3586 SavedModes |= (priv_modes & bit); 3740 if (priv_modes & bit)
3741 SavedModes |= bit;
3742 else
3743 SavedModes &= ~bit;
3587 return -1; 3744 return -1;
3588 } 3745 }
3589 else 3746 else
3590 { 3747 {
3591 if (mode == 'r') 3748 if (mode == 'r')
3592 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3749 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3593 else 3750 else
3594 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3751 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3595 PrivMode (state, bit); 3752
3753 if (state)
3754 priv_modes |= bit;
3755 else
3756 priv_modes &= ~bit;
3596 } 3757 }
3597 3758
3598 return state; 3759 return state;
3599} 3760}
3600 3761
3601/* we're not using priv _yet_ */ 3762/* we're not using priv _yet_ */
3602void 3763void
3603rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3764rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3604{ 3765{
3605 unsigned int i, j; 3766 unsigned int i, j;
3606 int state; 3767 int state;
3607 3768
3608 static const struct 3769 static const struct
3609 { 3770 {
3610 const int argval; 3771 const int argval;
3611 const unsigned long bit; 3772 const unsigned long bit;
3612 } argtopriv[] = { 3773 } argtopriv[] = {
3613 { 1, PrivMode_aplCUR }, 3774 { 1, PrivMode_aplCUR }, // DECCKM
3614 { 2, PrivMode_vt52 }, 3775 { 2, PrivMode_vt52 }, // DECANM
3615 { 3, PrivMode_132 }, 3776 { 3, PrivMode_132 }, // DECCOLM
3616 { 4, PrivMode_smoothScroll }, 3777 { 4, PrivMode_smoothScroll }, // DECSCLM
3617 { 5, PrivMode_rVideo }, 3778 { 5, PrivMode_rVideo }, // DECSCNM
3618 { 6, PrivMode_relOrigin }, 3779 { 6, PrivMode_relOrigin }, // DECOM
3619 { 7, PrivMode_Autowrap }, 3780 { 7, PrivMode_Autowrap }, // DECAWM
3620 // 8, bi-directional support mode 3781 // 8, auto-repeat keys // DECARM
3621 { 9, PrivMode_MouseX10 }, 3782 { 9, PrivMode_MouseX10 },
3622 // 18, 19 printing-related
3623 { 25, PrivMode_VisibleCursor }, 3783 { 12, PrivMode_BlinkingCursor },
3784 // 18 end FF to printer after print screen
3785 // 19 Print screen prints full screen/scroll region
3786 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3624#ifdef scrollBar_esc 3787#ifdef scrollBar_esc
3625 { scrollBar_esc, PrivMode_scrollBar }, 3788 { scrollBar_esc, PrivMode_scrollBar },
3626#endif 3789#endif
3627 { 35, PrivMode_ShiftKeys }, // rxvt extension 3790 { 35, PrivMode_ShiftKeys }, // rxvt extension
3791 // 38, tektronix mode // DECTEK
3628 { 40, PrivMode_132OK }, 3792 { 40, PrivMode_132OK },
3629 // 41 xterm more fixes NYI 3793 // 41 xterm more fixes NYI
3630 // 45 margin bell NYI 3794 // 45 margin bell NYI
3631 // 46 start logging 3795 // 46 start logging
3632 { 47, PrivMode_Screen }, 3796 { 47, PrivMode_Screen },
3633 { 66, PrivMode_aplKP }, 3797 { 66, PrivMode_aplKP }, // DECNKM
3634#ifndef NO_BACKSPACE_KEY 3798#ifndef NO_BACKSPACE_KEY
3635 { 67, PrivMode_BackSpace }, 3799 { 67, PrivMode_BackSpace }, // DECBKM
3636#endif 3800#endif
3637 { 1000, PrivMode_MouseX11 }, 3801 { 1000, PrivMode_MouseX11 },
3638 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3802 { 1002, PrivMode_MouseBtnEvent },
3639 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3803 { 1003, PrivMode_MouseAnyEvent },
3640 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3804#if ENABLE_FRILLS
3805 { 1004, PrivMode_FocusEvent },
3806 { 1005, PrivMode_ExtModeMouse },
3807#endif
3641 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3808 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3642 { 1011, PrivMode_Keypress }, // rxvt extension 3809 { 1011, PrivMode_Keypress }, // rxvt extension
3810#if ENABLE_FRILLS
3811 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3812#endif
3643 // 1035 enable modifiers for alt, numlock NYI 3813 // 1035 enable modifiers for alt, numlock NYI
3644 // 1036 send ESC for meta keys NYI 3814 // 1036 send ESC for meta keys NYI
3645 // 1037 send DEL for keypad delete NYI 3815 // 1037 send DEL for keypad delete NYI
3646 { 1047, PrivMode_Screen }, 3816 { 1047, PrivMode_Screen },
3647 // 1048 save and restore cursor 3817 // 1048 save and restore cursor, implemented in code
3648 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3818 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3649 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3819 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3820 { 2004, PrivMode_BracketPaste },
3650 }; 3821 };
3651 3822
3652 if (nargs == 0) 3823 if (nargs == 0)
3653 return; 3824 return;
3654 3825
… …
3661 for (i = 0; i < nargs; i++) 3832 for (i = 0; i < nargs; i++)
3662 { 3833 {
3663 state = -1; 3834 state = -1;
3664 3835
3665 /* basic handling */ 3836 /* basic handling */
3666 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3837 for (j = 0; j < ecb_array_length (argtopriv); j++)
3667 if (argtopriv[j].argval == arg[i]) 3838 if (argtopriv[j].argval == arg[i])
3668 { 3839 {
3669 state = privcases (mode, argtopriv[j].bit); 3840 state = privcases (mode, argtopriv[j].bit);
3670 break; 3841 break;
3671 } 3842 }
… …
3679 3850
3680 scr_touch (true); 3851 scr_touch (true);
3681 break; 3852 break;
3682#endif 3853#endif
3683 case 1048: /* alternative cursor save */ 3854 case 1048: /* alternative cursor save */
3684 case 1049:
3685 if (option (Opt_secondaryScreen)) 3855 if (option (Opt_secondaryScreen))
3686 if (mode == 0) 3856 if (mode == 0)
3687 scr_cursor (RESTORE); 3857 scr_cursor (RESTORE);
3688 else if (mode == 1) 3858 else if (mode == 1)
3689 scr_cursor (SAVE); 3859 scr_cursor (SAVE);
… …
3698 case 2: /* VT52 mode */ 3868 case 2: /* VT52 mode */
3699 /* oddball mode. should be set regardless of set/reset 3869 /* oddball mode. should be set regardless of set/reset
3700 * parameter. Return from VT52 mode with an ESC < from 3870 * parameter. Return from VT52 mode with an ESC < from
3701 * within VT52 mode 3871 * within VT52 mode
3702 */ 3872 */
3703 PrivMode (1, PrivMode_vt52); 3873 priv_modes |= PrivMode_vt52;
3704 break; 3874 break;
3705 case 3: /* 80/132 */ 3875 case 3: /* 80/132 */
3706 if (priv_modes & PrivMode_132OK) 3876 if (priv_modes & PrivMode_132OK)
3707 set_widthheight (((state ? 132 : 80) * fwidth), height); 3877 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3708 break; 3878 break;
3709 case 4: /* smooth scrolling */ 3879 case 4: /* smooth scrolling */
3710 set_option (Opt_jumpScroll, !state); 3880 set_option (Opt_jumpScroll, !state);
3711 break; 3881 break;
3712 case 5: /* reverse video */ 3882 case 5: /* reverse video */
… …
3719 scr_autowrap (state); 3889 scr_autowrap (state);
3720 break; 3890 break;
3721 /* case 8: - auto repeat, can't do on a per window basis */ 3891 /* case 8: - auto repeat, can't do on a per window basis */
3722 case 9: /* X10 mouse reporting */ 3892 case 9: /* X10 mouse reporting */
3723 if (state) /* orthogonal */ 3893 if (state) /* orthogonal */
3724 priv_modes &= ~PrivMode_MouseX11; 3894 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3725 break; 3895 break;
3726#ifdef scrollBar_esc 3896#ifdef scrollBar_esc
3727 case scrollBar_esc: 3897 case scrollBar_esc:
3728 if (scrollbar_mapping (state)) 3898 scrollBar.map (state);
3729 {
3730 resize_all_windows (0, 0, 0); 3899 resize_all_windows (0, 0, 0);
3731 scr_touch (true); 3900 scr_touch (true);
3732 } 3901 break;
3902#endif
3903#ifdef CURSOR_BLINK
3904 case 12:
3905 cursor_blink_reset ();
3733 break; 3906 break;
3734#endif 3907#endif
3735 case 25: /* visible/invisible cursor */ 3908 case 25: /* visible/invisible cursor */
3736 scr_cursor_visible (state); 3909 scr_cursor_visible (state);
3737 break; 3910 break;
… …
3742 break; 3915 break;
3743 /* case 66: - application key pad */ 3916 /* case 66: - application key pad */
3744 /* case 67: - backspace key */ 3917 /* case 67: - backspace key */
3745 case 1000: /* X11 mouse reporting */ 3918 case 1000: /* X11 mouse reporting */
3746 if (state) /* orthogonal */ 3919 if (state) /* orthogonal */
3747 priv_modes &= ~PrivMode_MouseX10; 3920 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3748 break; 3921 break;
3749#if 0
3750 case 1001: 3922 case 1002:
3751 break; /* X11 mouse highlighting */ 3923 case 1003:
3752#endif 3924 if (state)
3925 {
3926 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3927 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3928 mouse_row = mouse_col = 0;
3929 vt_emask_mouse = PointerMotionMask;
3930 }
3931 else
3932 vt_emask_mouse = NoEventMask;
3933
3934 vt_select_input ();
3935 break;
3753 case 1010: /* scroll to bottom on TTY output inhibit */ 3936 case 1010: /* scroll to bottom on TTY output inhibit */
3754 set_option (Opt_scrollTtyOutput, !state); 3937 set_option (Opt_scrollTtyOutput, !state);
3755 break; 3938 break;
3756 case 1011: /* scroll to bottom on key press */ 3939 case 1011: /* scroll to bottom on key press */
3757 set_option (Opt_scrollTtyKeypress, state); 3940 set_option (Opt_scrollTtyKeypress, state);
3758 break; 3941 break;
3759 case 1047: /* secondary screen w/ clearing last */ 3942 case 1047: /* secondary screen w/ clearing last */
3760 if (option (Opt_secondaryScreen)) 3943 if (option (Opt_secondaryScreen))
3761 if (current_screen != PRIMARY) 3944 if (!state)
3762 scr_erase_screen (2); 3945 scr_erase_screen (2);
3946
3763 scr_change_screen (state); 3947 scr_change_screen (state);
3764 break; 3948 break;
3765 case 1049: /* secondary screen w/ clearing first */ 3949 case 1049: /* secondary screen w/ clearing first */
3950 if (option (Opt_secondaryScreen))
3951 if (state)
3952 scr_cursor (SAVE);
3953
3766 scr_change_screen (state); 3954 scr_change_screen (state);
3955
3767 if (option (Opt_secondaryScreen)) 3956 if (option (Opt_secondaryScreen))
3768 if (current_screen != PRIMARY) 3957 if (state)
3769 scr_erase_screen (2); 3958 scr_erase_screen (2);
3959 else
3960 scr_cursor (RESTORE);
3770 break; 3961 break;
3771 default: 3962 default:
3772 break; 3963 break;
3773 } 3964 }
3774 } 3965 }
3775} 3966}
3776/*}}} */ 3967/*}}} */
3777 3968
3778/*{{{ process sgr sequences */ 3969/*{{{ process sgr sequences */
3779void 3970void ecb_hot
3780rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3971rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3781{ 3972{
3782 unsigned int i; 3973 unsigned int i;
3783 short rendset; 3974 short rendset;
3784 int rendstyle; 3975 int rendstyle;
… …
3826 //case 19: // ninth alt font 4017 //case 19: // ninth alt font
3827 //case 20: // gothic 4018 //case 20: // gothic
3828 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4019 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3829 rendset = 0, rendstyle = RS_Bold; 4020 rendset = 0, rendstyle = RS_Bold;
3830 break; 4021 break;
3831 case 22: // normal intensity 4022 case 22: // bold off (vt220)
3832 rendset = 0, rendstyle = RS_Bold; 4023 rendset = 0, rendstyle = RS_Bold;
3833 break; 4024 break;
3834 case 23: // disable italic 4025 case 23: // disable italic
3835 rendset = 0, rendstyle = RS_Italic; 4026 rendset = 0, rendstyle = RS_Italic;
3836 break; 4027 break;
3837 case 24: 4028 case 24: // underline off (vt220)
3838 rendset = 0, rendstyle = RS_Uline; 4029 rendset = 0, rendstyle = RS_Uline;
3839 break; 4030 break;
3840 case 25: 4031 case 25: // blink off (vt220)
3841 rendset = 0, rendstyle = RS_Blink; 4032 rendset = 0, rendstyle = RS_Blink;
3842 break; 4033 break;
3843 case 26: // variable spacing (iso 8613) 4034 case 26: // variable spacing (iso 8613)
3844 rendset = 0, rendstyle = RS_Blink; 4035 rendset = 0, rendstyle = RS_Blink;
3845 break; 4036 break;
3846 case 27: 4037 case 27: // reverse off (vt220)
3847 rendset = 0, rendstyle = RS_RVid; 4038 rendset = 0, rendstyle = RS_RVid;
3848 break; 4039 break;
3849 //case 28: // visible. NYI 4040 //case 28: // visible. NYI
3850 //case 29: // not crossed-out 4041 //case 29: // not crossed-out
3851 } 4042 }
… …
3872 if (nargs > i + 2 && arg[i + 1] == 5) 4063 if (nargs > i + 2 && arg[i + 1] == 5)
3873 { 4064 {
3874 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4065 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3875 i += 2; 4066 i += 2;
3876 } 4067 }
4068 else if (nargs > i + 4 && arg[i + 1] == 2)
4069 {
4070 unsigned int r = arg[i + 2];
4071 unsigned int g = arg[i + 3];
4072 unsigned int b = arg[i + 4];
4073 unsigned int idx = map_rgb24_color (r, g, b);
4074 scr_color (idx, Color_fg);
4075 i += 4;
4076 }
3877 break; 4077 break;
3878 case 39: /* default fg */ 4078 case 39: /* default fg */
3879 scr_color (Color_fg, Color_fg); 4079 scr_color (Color_fg, Color_fg);
3880 break; 4080 break;
3881 4081
… …
3892 case 48: // set bg color, ISO 8613-6 4092 case 48: // set bg color, ISO 8613-6
3893 if (nargs > i + 2 && arg[i + 1] == 5) 4093 if (nargs > i + 2 && arg[i + 1] == 5)
3894 { 4094 {
3895 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4095 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3896 i += 2; 4096 i += 2;
4097 }
4098 else if (nargs > i + 4 && arg[i + 1] == 2)
4099 {
4100 unsigned int r = arg[i + 2];
4101 unsigned int g = arg[i + 3];
4102 unsigned int b = arg[i + 4];
4103 unsigned int idx = map_rgb24_color (r, g, b);
4104 scr_color (idx, Color_bg);
4105 i += 4;
3897 } 4106 }
3898 break; 4107 break;
3899 case 49: /* default bg */ 4108 case 49: /* default bg */
3900 scr_color (Color_bg, Color_bg); 4109 scr_color (Color_bg, Color_bg);
3901 break; 4110 break;
… …
3925 break; 4134 break;
3926#endif 4135#endif
3927 } 4136 }
3928 } 4137 }
3929} 4138}
4139
4140void
4141rxvt_term::set_cursor_style (int style)
4142{
4143 if (!IN_RANGE_INC (style, 0, 6))
4144 return;
4145
4146 if (style == 0)
4147 style = 1;
4148
4149 cursor_type = (style - 1) / 2;
4150 set_option (Opt_cursorUnderline, cursor_type == 1);
4151
4152#ifdef CURSOR_BLINK
4153 set_option (Opt_cursorBlink, style & 1);
4154 cursor_blink_reset ();
4155#endif
4156
4157 want_refresh = 1;
4158}
3930/*}}} */ 4159/*}}} */
3931 4160
3932/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3933void
3934rxvt_term::process_graphics ()
3935{
3936 unicode_t ch, cmd = cmd_getc ();
3937
3938 if (cmd == 'Q')
3939 { /* query graphics */
3940 tt_printf ("\033G0\012"); /* no graphics */
3941 return;
3942 }
3943 /* swallow other graphics sequences until terminating ':' */
3944 do
3945 ch = cmd_getc ();
3946 while (ch != ':');
3947}
3948/*}}} */
3949
3950/* ------------------------------------------------------------------------- */ 4161/* ---------------------------------------------------------------------- */
4162/* Write data to the pty as typed by the user, pasted with the mouse,
4163 * or generated by us in response to a query ESC sequence.
4164 */
3951 4165
3952/* 4166/*
3953 * Send printf () formatted output to the command. 4167 * Send printf () formatted output to the command.
3954 * Only use for small amounts of data. 4168 * Only use for small amounts of data.
3955 */ 4169 */
… …
3963 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4177 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3964 va_end (arg_ptr); 4178 va_end (arg_ptr);
3965 tt_write (buf, strlen (buf)); 4179 tt_write (buf, strlen (buf));
3966} 4180}
3967 4181
3968/* ---------------------------------------------------------------------- */
3969/* Write data to the pty as typed by the user, pasted with the mouse, 4182/* Write data to the pty as typed by the user. */
3970 * or generated by us in response to a query ESC sequence. 4183void
3971 */ 4184rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3972const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4185{
4186 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4187 return;
4188
4189 if (option (Opt_scrollTtyKeypress))
4190 if (view_start)
4191 {
4192 view_start = 0;
4193 want_refresh = 1;
4194 }
4195
4196 tt_write_ (data, len);
4197}
3973 4198
3974void 4199void
3975rxvt_term::tt_write (const char *data, unsigned int len) 4200rxvt_term::tt_write (const char *data, unsigned int len)
3976{ 4201{
3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4202 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3978 return; 4203 return;
3979 4204
4205 tt_write_ (data, len);
4206}
4207
4208static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4209
4210void
4211rxvt_term::tt_write_ (const char *data, unsigned int len)
4212{
3980 if (pty->pty < 0) 4213 if (pty->pty < 0)
3981 return; 4214 return;
3982 4215
3983 if (v_buflen == 0) 4216 if (v_buflen == 0)
3984 { 4217 {
3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4218 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3986 4219
4220 max_it (written, 0);
4221
3987 if ((unsigned int)written == len) 4222 if (written == len)
3988 return; 4223 return;
3989 4224
3990 data += written; 4225 data += written;
3991 len -= written; 4226 len -= written;
3992 } 4227 }
3993 4228
3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4229 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3995 4230
3996 memcpy (v_buffer + v_buflen, data, len); 4231 memcpy (v_buffer + v_buflen, data, len);
3997 v_buflen += len; 4232 v_buflen += len;
3998 4233
3999 pty_ev.set (EVENT_READ | EVENT_WRITE); 4234 pty_ev.set (ev::READ | ev::WRITE);
4000} 4235}
4001 4236
4002void rxvt_term::pty_write () 4237void rxvt_term::pty_write ()
4003{ 4238{
4004 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4239 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4009 4244
4010 if (v_buflen == 0) 4245 if (v_buflen == 0)
4011 { 4246 {
4012 free (v_buffer); 4247 free (v_buffer);
4013 v_buffer = 0; 4248 v_buffer = 0;
4014 v_buflen = 0;
4015 4249
4016 pty_ev.set (EVENT_READ); 4250 pty_ev.set (ev::READ);
4017 return; 4251 return;
4018 } 4252 }
4019 4253
4020 memmove (v_buffer, v_buffer + written, v_buflen); 4254 memmove (v_buffer, v_buffer + written, v_buflen);
4021 } 4255 }
4022 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4256 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4023 pty_ev.set (EVENT_READ); 4257 pty_ev.set (ev::READ);
4024} 4258}
4025 4259
4026/*----------------------- end-of-file (C source) -----------------------*/ 4260/*----------------------- end-of-file (C source) -----------------------*/
4027 4261

Diff Legend

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