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.365 by ayin, Thu Nov 15 10:13:37 2007 UTC vs.
Revision 1.551 by sf-exg, Wed Jul 16 14:29:23 2014 UTC

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

Diff Legend

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