ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.378 by root, Fri Dec 14 02:27:54 2007 UTC vs.
Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 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 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
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
405void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
304{ 407{
305 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 409 KeySym keysym;
308 int valid_keysym; 410 int valid_keysym;
309 char kbuf[KBUFSZ]; 411 char kbuf[KBUFSZ];
310 412
311#if ISO_14755 413#if ISO_14755
… …
321 */ 423 */
322 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
325 427
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; 428 kbuf[0] = 0;
333 429
334#ifdef USE_XIM 430#if USE_XIM
335 if (Input_Context) 431 if (Input_Context)
336 { 432 {
337 Status status_return; 433 Status status_return;
338 434
339#if 0 435#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 508#else
413 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
414#endif 510#endif
511 max_it (lnsppg, 1);
512
415 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
416 { 514 {
417 scr_page (UP, lnsppg); 515 scr_page (UP, lnsppg);
418 return; 516 return;
419 } 517 }
… …
472 selection_request (ev.time); 570 selection_request (ev.time);
473 return; 571 return;
474#if TODO 572#if TODO
475 /* rxvt extras */ 573 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 575 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 577 return;
482#endif 578#endif
483 } 579 }
484 } 580 }
485 } 581 }
486 582
487#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 584 // ISO 14755 support
489 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 586 {
491 int hv; 587 int hv;
492 588
493 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 620 scr_overlay_off ();
525# endif 621# endif
526 iso14755buf = 0; 622 iso14755buf = 0;
527 } 623 }
528 } 624 }
625 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
532 { 629 {
533 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 631# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 643 }
547#endif 644#endif
548 645
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 647 {
648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
649 unsigned int newlen = 1;
650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
551 { 657 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 658#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 659 case XK_BackSpace:
554#ifdef XK_KP_Home 660 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 661 {
556 XK_KP_7, // XK_KP_Home 662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 663 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 664 kbuf[1] = '\0';
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 }; 665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
571 691
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
573 { 772 {
574 unsigned int index = keysym - XK_KP_Home; 773 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 774 if (param > 0)
775 sprintf (kbuf,"\033[%d~", param);
776 else
777 newlen = 0;
576 } 778 }
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; 779 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 } 780 }
794 781
782 if (newlen)
783 len = strlen (kbuf);
784
785 if (len > 0)
786 {
795 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
796 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
797 */ 801 */
798#ifdef META8_OPTION 802#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
801#endif 805#endif
806 }
802 807
803 } 808 }
804 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
805 { 810 {
806 len = 1; 811 len = 1;
… …
840 { 845 {
841 view_start = 0; 846 view_start = 0;
842 want_refresh = 1; 847 want_refresh = 1;
843 } 848 }
844 849
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 */ 850 /* escape prefix */
860 if (meta 851 if (meta
861#ifdef META8_OPTION 852#ifdef META8_OPTION
862 && meta_char == C0_ESC 853 && meta_char == C0_ESC
863#endif 854#endif
… …
868 } 859 }
869 860
870 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
871} 862}
872 863
873void 864void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
875{ 866{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 868 KeySym keysym;
878 869
… …
898 commit_iso14755 (); 889 commit_iso14755 ();
899 890
900 return; 891 return;
901 } 892 }
902 893
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 895 if (i[0] == keysym)
905 { 896 {
906 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 898 commit_iso14755 ();
908 899
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
947#endif 938#endif
948} 939}
949 940
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 941void
984rxvt_term::flush () 942rxvt_term::flush ()
985{ 943{
986 flush_ev.stop (); 944 flush_ev.stop ();
987 945
988#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
989 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
990 { 948 {
991// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 950 scr_touch (false);
993 } 951 }
994#endif 952#endif
995 953
996 if (want_refresh) 954 if (want_refresh)
… …
1032 } 990 }
1033 while (row < end_row); 991 while (row < end_row);
1034 } 992 }
1035 993
1036 scr_refresh (); 994 scr_refresh ();
1037 scrollbar_show (1); 995 scrollBar.show (1);
1038#ifdef USE_XIM 996#if USE_XIM
1039 IMSendSpot (); 997 im_send_spot ();
1040#endif 998#endif
1041 } 999 }
1042 1000
1043 display->flush (); 1001 display->flush ();
1044} 1002}
1045 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
1046void 1005void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1006rxvt_term::refresh_check ()
1048{ 1007{
1049 make_current ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1010
1011 display->flush ();
1055} 1012}
1056 1013
1057void 1014void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1015rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1016{
… …
1063 flush (); 1020 flush ();
1064} 1021}
1065 1022
1066#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1067void 1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1039void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1041{
1070 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1043 want_refresh = 1;
1044 refresh_check ();
1072} 1045}
1073#endif 1046#endif
1074 1047
1075#ifdef TEXT_BLINK 1048#ifdef TEXT_BLINK
1076void 1049void
… …
1078{ 1051{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1052 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1053 {
1081 hidden_text = !hidden_text; 1054 hidden_text = !hidden_text;
1082 want_refresh = 1; 1055 want_refresh = 1;
1056 refresh_check ();
1083 } 1057 }
1084 else 1058 else
1085 w.stop (); 1059 w.stop ();
1086} 1060}
1087#endif 1061#endif
1088 1062
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1064void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1066{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1069 {
1095 want_refresh = 1; 1070 want_refresh = 1;
1071 refresh_check ();
1072 }
1096 else 1073 else
1097 w.stop (); 1074 w.stop ();
1098} 1075}
1099#endif 1076#endif
1100 1077
… …
1104{ 1081{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1083 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1085 want_refresh = 1;
1086 refresh_check ();
1109 } 1087 }
1110 else 1088 else
1111 w.stop (); 1089 w.stop ();
1112} 1090}
1113#endif 1091#endif
1114 1092
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1094void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1096{
1119 if (mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 : scr_page (UP, mouse_slip_wheel_speed)) 1098 {
1121 want_refresh = 1; 1099 want_refresh = 1;
1100 refresh_check ();
1101 }
1122 1102
1123 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0) 1103 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1124 { 1104 {
1125 mouse_slip_wheel_speed = 0; 1105 mouse_slip_wheel_speed = 0;
1126 w.stop (); 1106 w.stop ();
… …
1137 { 1117 {
1138 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than 1119 // 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 1120 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS. 1121 // allowed by the sus... as is returning ENOSYS.
1122 // since the linux guys additionally thought that breaking the only
1123 // known workaround against their unusable sched_yield hack is cool,
1124 // we just nanosleep a bit and hope for the best.
1142 1125
1143 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1144 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1145 1128
1146 w.stop (); 1129 w.stop ();
1147 } 1130 }
1148 1131
… …
1151 { 1134 {
1152 } 1135 }
1153} event_handler; 1136} event_handler;
1154#endif 1137#endif
1155 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1156bool 1172bool
1157rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1158{ 1174{
1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1160 1176
1161 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1162 { 1178
1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1164 n = 0;
1165 } 1180 {
1166 1181 // 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; 1182 cmdbuf_ptr = cmdbuf_base;
1169 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1170 1186
1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1172 1188
1173 if (r > 0) 1189 if (r > 0)
1174 { 1190 {
1175 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1176 return true; 1192 return true;
… …
1198{ 1214{
1199 make_current (); 1215 make_current ();
1200 1216
1201 if (revents & ev::READ) 1217 if (revents & ev::READ)
1202 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1203 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1204 if (cmd_parse ()) 1220 cmd_parse ();
1205 break;
1206 1221
1207 if (revents & ev::WRITE) 1222 if (revents & ev::WRITE)
1208 pty_write (); 1223 pty_write ();
1209}
1210 1224
1211void 1225 refresh_check ();
1226}
1227
1228void ecb_cold
1212rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1213{ 1230{
1214 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1215 recolour_cursor (); 1232 recolour_cursor ();
1216 1233
… …
1221 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1222#endif 1239#endif
1223} 1240}
1224 1241
1225#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1226void 1243void ecb_cold
1227rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1228{ 1245{
1229 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1230 return; 1247 return;
1231 1248
… …
1233 XFlush (dpy); 1250 XFlush (dpy);
1234 1251
1235 hidden_pointer = 1; 1252 hidden_pointer = 1;
1236} 1253}
1237 1254
1238void 1255void ecb_cold
1239rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1240{ 1257{
1241 make_current (); 1258 make_current ();
1242 1259
1243 pointer_blank (); 1260 pointer_blank ();
… …
1249{ 1266{
1250 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1251 int x, y; 1268 int x, y;
1252 int code = 32; 1269 int code = 32;
1253 1270
1254 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1255 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1256 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1257 { 1275 {
1258 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1259 return; 1277 return;
1278
1260 mouse_row = x; 1279 mouse_row = x;
1261 mouse_col = y; 1280 mouse_col = y;
1262 code += 32; 1281 code += 32;
1263 } 1282 }
1264 1283
… …
1267 else 1286 else
1268 { 1287 {
1269 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1270 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1271 if (button_number >= 3) 1290 if (button_number >= 3)
1272 button_number += (64 - 3); 1291 button_number += 64 - 3;
1273 } 1292 }
1274 1293
1275 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1276 { 1295 {
1277 /* 1296 /*
… …
1309 fputc ('A', stderr); 1328 fputc ('A', stderr);
1310 if (key_state & 32) 1329 if (key_state & 32)
1311 fputc ('2', stderr); 1330 fputc ('2', stderr);
1312 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1313 button_number, 1332 button_number,
1314 x + 1, 1333 x,
1315 y + 1); 1334 y);
1316#endif 1335#endif
1317 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1318 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1319 (code + button_number + key_state), 1351 code + button_number + key_state,
1320 (32 + x + 1), 1352 32 + x,
1321 (32 + y + 1)); 1353 32 + y);
1322} 1354}
1323 1355
1324/*{{{ process an X event */ 1356/*{{{ process an X event */
1325void 1357void ecb_hot
1326rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1327{ 1359{
1328 make_current (); 1360 make_current ();
1329 1361
1330 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1428 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1461 focus_out ();
1430 break; 1462 break;
1431 1463
1432 case ConfigureNotify: 1464 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]) 1465 if (ev.xconfigure.window == parent)
1437 { 1466 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ())
1475 {
1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID))
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1484 int x, y;
1485
1486 if (ev.xconfigure.send_event)
1487 {
1488 x = ev.xconfigure.x;
1489 y = ev.xconfigure.y;
1490 }
1491 else
1492 get_window_origin (x, y);
1493
1494 if (x != parent_x || y != parent_y)
1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 }
1501 }
1440 1502
1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1442 { 1504 {
1443 seen_resize = 1; 1505 seen_resize = 1;
1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1445 } 1507 }
1446 else 1508 else
1447 { 1509 {
1448#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1511 if (moved)
1450 update_background (); 1512 update_background ();
1451#endif 1513#endif
1452 } 1514 }
1515
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1517 }
1455 break; 1518 break;
1456 1519
1457 case PropertyNotify: 1520 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 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; 1522 break;
1464 1523
1465 case SelectionClear: 1524 case SelectionClear:
1466 selection_clear (); 1525 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; 1526 break;
1473 1527
1474 case SelectionRequest: 1528 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1476 break; 1530 break;
1477 1531
1478 case MapNotify: 1532 case MapNotify:
1533#ifdef HAVE_BG_PIXMAP
1534 // This is needed at startup for the case of no window manager
1535 // or a non-reparenting window manager and also because we
1536 // defer bg image updates if the window is not mapped. The
1537 // short delay is to optimize for multiple ConfigureNotify
1538 // events at startup when the window manager reparents the
1539 // window, so as to perform the computation after we have
1540 // received all of them.
1541 if (!(bg_flags & BG_IS_VALID))
1542 update_background_ev.start (0.025);
1543#endif
1479 mapped = 1; 1544 mapped = 1;
1480#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1481 text_blink_ev.start (); 1546 text_blink_ev.start ();
1482#endif 1547#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1496 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1497 { 1562 {
1498 do 1563 do
1499 { 1564 {
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1502 } 1567 }
1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1504 1569
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1571
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1573 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1511 } 1576 }
1577
1512 want_refresh = 1; 1578 want_refresh = 1;
1513 } 1579 }
1514 else 1580 else
1515 { 1581 {
1516 XEvent unused_event; 1582 XEvent unused_event;
… …
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1585 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1587 ;
1522 1588
1523 if (isScrollbarWindow (ev.xany.window)) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1590 {
1525 scrollBar.setIdle (); 1591 scrollBar.state = SB_STATE_IDLE;
1526 scrollbar_show (0); 1592 scrollBar.show (0);
1527 } 1593 }
1528 } 1594 }
1529 break; 1595 break;
1530 1596
1531 case MotionNotify: 1597 case MotionNotify:
… …
1596 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1597 } 1663 }
1598 else 1664 else
1599 { 1665 {
1600 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1601 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1602 } 1668 }
1603 1669
1604 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1605 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1606 + 1; 1672 + 1;
… …
1618#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1619 } 1685 }
1620#endif 1686#endif
1621 } 1687 }
1622 } 1688 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1624 { 1690 {
1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1626 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1627 ; 1693 ;
1628 1694
1629 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1630 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1699 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1701 scrollBar.size ());
1636 want_refresh = 1; 1702 want_refresh = 1;
1637 scrollbar_show (1); 1703 scrollBar.show (1);
1638 } 1704 }
1639 break; 1705 break;
1640 } 1706 }
1641 1707
1642#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1643 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1644 {
1645 if (hidden_cursor)
1646 {
1647 hidden_cursor = 0;
1648 want_refresh = 1;
1649 }
1650
1651 cursor_blink_ev.again (); 1710 cursor_blink_reset ();
1652 }
1653#endif 1711#endif
1654 1712
1655#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1657 { 1715 {
… …
1663 1721
1664 if (ev.type == KeyPress && hidden_pointer == 0) 1722 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank (); 1723 pointer_blank ();
1666 } 1724 }
1667#endif 1725#endif
1668}
1669 1726
1670void 1727 refresh_check ();
1728}
1729
1730#if ENABLE_FRILLS
1731void ecb_cold
1732rxvt_term::set_urgency (bool enable)
1733{
1734 if (enable == urgency_hint)
1735 return;
1736
1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1738 {
1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1740 XSetWMHints (dpy, parent, h);
1741 urgency_hint = enable;
1742 XFree (h);
1743 }
1744}
1745#endif
1746
1747void ecb_cold
1671rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1672{ 1749{
1673 if (!focus) 1750 if (!focus)
1674 { 1751 {
1675 focus = 1; 1752 focus = 1;
1676 want_refresh = 1; 1753 want_refresh = 1;
1677 1754
1678 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1679
1680#if USE_XIM 1755#if USE_XIM
1681 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1682 { 1757 {
1683 IMSetPosition (); 1758 im_set_position ();
1684 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1685 } 1760 }
1686#endif 1761#endif
1687#if CURSOR_BLINK 1762#if CURSOR_BLINK
1688 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
… …
1695 scr_recolour (); 1770 scr_recolour ();
1696 } 1771 }
1697#endif 1772#endif
1698#if ENABLE_FRILLS 1773#if ENABLE_FRILLS
1699 if (option (Opt_urgentOnBell)) 1774 if (option (Opt_urgentOnBell))
1700 { 1775 set_urgency (0);
1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1702 {
1703 h->flags &= ~XUrgencyHint;
1704 XSetWMHints (dpy, parent[0], h);
1705 }
1706 }
1707#endif 1776#endif
1708 }
1709}
1710 1777
1711void 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1779 }
1780}
1781
1782void ecb_cold
1712rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1713{ 1784{
1714 if (focus) 1785 if (focus)
1715 { 1786 {
1716 focus = 0; 1787 focus = 0;
1717 want_refresh = 1; 1788 want_refresh = 1;
1718 1789
1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1790#if ENABLE_FRILLS
1720 1791 if (option (Opt_urgentOnBell))
1792 set_urgency (0);
1793#endif
1721#if ENABLE_FRILLS || ISO_14755 1794#if ENABLE_FRILLS || ISO_14755
1722 if (iso14755buf) 1795 if (iso14755buf)
1723 { 1796 {
1724 iso14755buf = 0; 1797 iso14755buf = 0;
1725# if ISO_14755 1798# if ISO_14755
… …
1742 { 1815 {
1743 pix_colors = pix_colors_unfocused; 1816 pix_colors = pix_colors_unfocused;
1744 scr_recolour (); 1817 scr_recolour ();
1745 } 1818 }
1746#endif 1819#endif
1747 }
1748}
1749 1820
1750void 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1822 }
1823}
1824
1825void ecb_cold
1751rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1752{ 1827{
1753#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1755 { 1830 {
… …
1758 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1759 } 1834 }
1760#endif 1835#endif
1761} 1836}
1762 1837
1763#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1764void 1839void ecb_hot
1765rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1766{ 1841{
1767 make_current (); 1842 make_current ();
1768 1843
1769 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1770 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1771 return; 1846 return;
1772 1847
1773# if ENABLE_TRANSPARENCY
1774 switch (ev.type) 1848 switch (ev.type)
1775 { 1849 {
1776 case PropertyNotify: 1850 case PropertyNotify:
1777 /* 1851 /*
1778 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1779 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1780 */ 1854 */
1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 { 1857 {
1858#if BG_IMAGE_FROM_ROOT
1784 bgPixmap.set_root_pixmap (); 1859 bg_set_root_pixmap ();
1785 update_background (); 1860 update_background ();
1861#endif
1862#if ENABLE_PERL
1863 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1864#endif
1786 } 1865 }
1866
1787 break; 1867 break;
1788 } 1868 }
1789# endif 1869
1870 refresh_check ();
1790} 1871}
1791#endif 1872#endif
1792 1873
1793void 1874void
1794rxvt_term::button_press (XButtonEvent &ev) 1875rxvt_term::button_press (XButtonEvent &ev)
… …
1825 /* save the xbutton state (for ButtonRelease) */ 1906 /* save the xbutton state (for ButtonRelease) */
1826 MEvent.state = ev.state; 1907 MEvent.state = ev.state;
1827#ifdef MOUSE_REPORT_DOUBLECLICK 1908#ifdef MOUSE_REPORT_DOUBLECLICK
1828 if (ev.button == MEvent.button && clickintime) 1909 if (ev.button == MEvent.button && clickintime)
1829 { 1910 {
1830 /* same button, within alloted time */ 1911 /* same button, within allowed time */
1831 MEvent.clicks++; 1912 MEvent.clicks++;
1832 1913
1833 if (MEvent.clicks > 1) 1914 if (MEvent.clicks > 1)
1834 { 1915 {
1835 /* only report double clicks */ 1916 /* only report double clicks */
… …
1907 } 1988 }
1908 1989
1909 /* 1990 /*
1910 * Scrollbar window processing of button press 1991 * Scrollbar window processing of button press
1911 */ 1992 */
1912 if (isScrollbarWindow (ev.window)) 1993 if (scrollBar.state && ev.window == scrollBar.win)
1913 { 1994 {
1914 scrollBar.setIdle (); 1995 page_dirn direction = NO_DIR;
1996
1997 if (scrollBar.upButton (ev.y))
1998 direction = UP; /* up */
1999 else if (scrollBar.dnButton (ev.y))
2000 direction = DN; /* down */
2001
2002 scrollBar.state = SB_STATE_IDLE;
1915 /* 2003 /*
1916 * Rxvt-style scrollbar: 2004 * Rxvt-style scrollbar:
1917 * move up if mouse is above slider 2005 * move up if mouse is above slider
1918 * move dn if mouse is below slider 2006 * move dn if mouse is below slider
1919 * 2007 *
… …
1928 /* 2016 /*
1929 * Mouse report disabled scrollbar: 2017 * Mouse report disabled scrollbar:
1930 * arrow buttons - send up/down 2018 * arrow buttons - send up/down
1931 * click on scrollbar - send pageup/down 2019 * click on scrollbar - send pageup/down
1932 */ 2020 */
1933 if ((scrollBar.style == R_SB_NEXT 2021 if (direction == UP)
1934 && scrollbarnext_upButton (ev.y))
1935 || (scrollBar.style == R_SB_RXVT
1936 && scrollbarrxvt_upButton (ev.y)))
1937 tt_printf ("\033[A"); 2022 tt_printf ("\033[A");
1938 else if ((scrollBar.style == R_SB_NEXT 2023 else if (direction == DN)
1939 && scrollbarnext_dnButton (ev.y))
1940 || (scrollBar.style == R_SB_RXVT
1941 && scrollbarrxvt_dnButton (ev.y)))
1942 tt_printf ("\033[B"); 2024 tt_printf ("\033[B");
1943 else 2025 else
1944 switch (ev.button) 2026 switch (ev.button)
1945 { 2027 {
1946 case Button2: 2028 case Button2:
… …
1954 break; 2036 break;
1955 } 2037 }
1956 } 2038 }
1957 else 2039 else
1958#endif /* NO_SCROLLBAR_REPORT */ 2040#endif /* NO_SCROLLBAR_REPORT */
1959
1960 {
1961 char upordown = 0;
1962
1963 if (scrollBar.style == R_SB_NEXT)
1964 { 2041 {
1965 if (scrollbarnext_upButton (ev.y)) 2042 if (direction != NO_DIR)
1966 upordown = -1; /* up */
1967 else if (scrollbarnext_dnButton (ev.y))
1968 upordown = 1; /* down */
1969 }
1970 else if (scrollBar.style == R_SB_RXVT)
1971 {
1972 if (scrollbarrxvt_upButton (ev.y))
1973 upordown = -1; /* up */
1974 else if (scrollbarrxvt_dnButton (ev.y))
1975 upordown = 1; /* down */
1976 }
1977
1978 if (upordown)
1979 { 2043 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1981 if (!cont_scroll_ev.is_active ()) 2045 if (!cont_scroll_ev.is_active ())
1982 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2046 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1983#endif 2047#endif
1984 if (scr_page (upordown < 0 ? UP : DN, 1)) 2048 if (scr_page (direction, 1))
1985 { 2049 {
1986 if (upordown < 0) 2050 if (direction == UP)
1987 scrollBar.setUp (); 2051 scrollBar.state = SB_STATE_UP;
1988 else 2052 else
1989 scrollBar.setDn (); 2053 scrollBar.state = SB_STATE_DOWN;
1990 } 2054 }
1991 } 2055 }
1992 else 2056 else
1993 switch (ev.button) 2057 switch (ev.button)
1994 { 2058 {
1995 case Button2: 2059 case Button2:
1996 switch (scrollbar_align) 2060 switch (scrollBar.align)
1997 { 2061 {
1998 case R_SB_ALIGN_TOP: 2062 case SB_ALIGN_TOP:
1999 csrO = 0; 2063 csrO = 0;
2000 break; 2064 break;
2001 case R_SB_ALIGN_CENTRE: 2065 case SB_ALIGN_CENTRE:
2002 csrO = (scrollBar.bot - scrollBar.top) / 2; 2066 csrO = (scrollBar.bot - scrollBar.top) / 2;
2003 break; 2067 break;
2004 case R_SB_ALIGN_BOTTOM: 2068 case SB_ALIGN_BOTTOM:
2005 csrO = scrollBar.bot - scrollBar.top; 2069 csrO = scrollBar.bot - scrollBar.top;
2006 break; 2070 break;
2007 } 2071 }
2008 2072
2009 if (scrollBar.style == R_SB_XTERM 2073 if (scrollBar.style == SB_STYLE_XTERM
2010 || scrollbar_above_slider (ev.y) 2074 || scrollBar.above_slider (ev.y)
2011 || scrollbar_below_slider (ev.y)) 2075 || scrollBar.below_slider (ev.y))
2012 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2076 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2013 2077
2014 scrollBar.setMotion (); 2078 scrollBar.state = SB_STATE_MOTION;
2015 break; 2079 break;
2016 2080
2017 case Button1: 2081 case Button1:
2018 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2082 if (scrollBar.align == SB_ALIGN_CENTRE)
2019 csrO = ev.y - scrollBar.top; 2083 csrO = ev.y - scrollBar.top;
2020 /* FALLTHROUGH */ 2084 /* FALLTHROUGH */
2021 2085
2022 case Button3: 2086 case Button3:
2023 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != SB_STYLE_XTERM)
2024 { 2088 {
2025 if (scrollbar_above_slider (ev.y)) 2089 if (scrollBar.above_slider (ev.y))
2026# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
2027 scr_page (UP, nrow - 1); 2091 scr_page (UP, nrow - 1);
2028# else 2092# else
2029 scr_page (UP, nrow / 4); 2093 scr_page (UP, nrow / 4);
2030# endif 2094# endif
2031 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollBar.below_slider (ev.y))
2032# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
2033 scr_page (DN, nrow - 1); 2097 scr_page (DN, nrow - 1);
2034# else 2098# else
2035 scr_page (DN, nrow / 4); 2099 scr_page (DN, nrow / 4);
2036# endif 2100# endif
2037 else 2101 else
2038 scrollBar.setMotion (); 2102 scrollBar.state = SB_STATE_MOTION;
2039 } 2103 }
2040 else 2104 else
2041 { 2105 {
2042 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
2043 (nrow 2107 (nrow
2044 * scrollbar_position (ev.y) 2108 * scrollBar.position (ev.y)
2045 / scrollbar_size ())); 2109 / scrollBar.size ()));
2046 } 2110 }
2047 2111
2048 break; 2112 break;
2049 } 2113 }
2050 } 2114 }
… …
2060 2124
2061 csrO = 0; /* reset csr Offset */ 2125 csrO = 0; /* reset csr Offset */
2062 if (!bypass_keystate) 2126 if (!bypass_keystate)
2063 reportmode = !! (priv_modes & PrivMode_mouse_report); 2127 reportmode = !! (priv_modes & PrivMode_mouse_report);
2064 2128
2065 if (scrollbar_isUpDn ()) 2129 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2066 { 2130 {
2067 scrollBar.setIdle (); 2131 scrollBar.state = SB_STATE_IDLE;
2068 scrollbar_show (0); 2132 scrollBar.show (0);
2069 } 2133 }
2070 2134
2071#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2072 sel_scroll_ev.stop(); 2136 sel_scroll_ev.stop();
2073#endif 2137#endif
… …
2122 case Button3: 2186 case Button3:
2123 selection_make (ev.time); 2187 selection_make (ev.time);
2124 break; 2188 break;
2125 2189
2126 case Button2: 2190 case Button2:
2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2191 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); 2192 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2129 break; 2193 break;
2130 2194
2131#ifdef MOUSE_WHEEL 2195#ifdef MOUSE_WHEEL
2132 case Button4: 2196 case Button4:
2133 case Button5: 2197 case Button5:
… …
2153 2217
2154 if (!slip_wheel_ev.is_active ()) 2218 if (!slip_wheel_ev.is_active ())
2155 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2219 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2156 } 2220 }
2157 else 2221 else
2222# endif
2158 { 2223 {
2159# endif
2160 scr_page (v, i); 2224 scr_page (v, i);
2161 scrollbar_show (1); 2225 scrollBar.show (1);
2162# ifdef MOUSE_SLIP_WHEELING
2163 } 2226 }
2164# endif
2165 } 2227 }
2166 break; 2228 break;
2167#endif 2229#endif
2168 } 2230 }
2169 } 2231 }
2170} 2232}
2171 2233
2172/*}}} */ 2234/*}}} */
2173 2235
2174bool 2236void ecb_hot
2175rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
2176{ 2238{
2177 bool flag = false;
2178 wchar_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2179 char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2180 2241
2181 for (;;) 2242 for (;;)
2182 { 2243 {
2183 if (ch == NOCHAR) 2244 if (ecb_unlikely (ch == NOCHAR))
2184 { 2245 {
2185 seq_begin = cmdbuf_ptr; 2246 seq_begin = cmdbuf_ptr;
2186 ch = next_char (); 2247 ch = next_char ();
2187 2248
2188 if (ch == NOCHAR) 2249 if (ch == NOCHAR)
2189 break; 2250 break;
2190 } 2251 }
2191 2252
2192 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2253 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2193 { 2254 {
2194 if (!seen_input) 2255 if (ecb_unlikely (!seen_input))
2195 { 2256 {
2196 seen_input = 1; 2257 seen_input = 1;
2197 // many badly-written programs (e.g. jed) contain a race condition: 2258 // many badly-written programs (e.g. jed) contain a race condition:
2198 // they first read the screensize and then install a SIGWINCH handler. 2259 // they first read the screensize and then install a SIGWINCH handler.
2199 // some window managers resize the window early, and these programs 2260 // some window managers resize the window early, and these programs
… …
2212 wchar_t *str = buf; 2273 wchar_t *str = buf;
2213 wchar_t *eol = str + min (ncol, UBUFSIZ); 2274 wchar_t *eol = str + min (ncol, UBUFSIZ);
2214 2275
2215 for (;;) 2276 for (;;)
2216 { 2277 {
2217 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2278 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2218 break; 2279 break;
2219 2280
2220 *str++ = ch; 2281 *str++ = ch;
2221 2282
2222 if (ch == C0_LF || str >= eol) 2283 if (ecb_unlikely (ch == C0_LF || str >= eol))
2223 { 2284 {
2224 if (ch == C0_LF) 2285 if (ch == C0_LF)
2225 nlines++; 2286 nlines++;
2226 2287
2227 refresh_count++; 2288 refresh_count++;
… …
2276 * What the heck we'll cheat and only refresh less than every page-full. 2337 * What the heck we'll cheat and only refresh less than every page-full.
2277 * if skipScroll is enabled. 2338 * if skipScroll is enabled.
2278 */ 2339 */
2279 if (refreshnow) 2340 if (refreshnow)
2280 { 2341 {
2281 flag = true;
2282 scr_refresh (); 2342 scr_refresh ();
2283 want_refresh = 1; 2343 want_refresh = 1;
2284 } 2344 }
2285
2286 } 2345 }
2287 else 2346 else
2288 { 2347 {
2289 try 2348 try
2290 { 2349 {
… …
2298 } 2357 }
2299 2358
2300 ch = NOCHAR; 2359 ch = NOCHAR;
2301 } 2360 }
2302 } 2361 }
2303
2304 return flag;
2305} 2362}
2306 2363
2307// read the next character 2364// read the next character
2308wchar_t 2365wchar_t ecb_hot
2309rxvt_term::next_char () NOTHROW 2366rxvt_term::next_char () NOTHROW
2310{ 2367{
2311 while (cmdbuf_ptr < cmdbuf_endp) 2368 while (cmdbuf_ptr < cmdbuf_endp)
2312 { 2369 {
2313 // assume 7-bit to be ascii ALWAYS 2370 // assume 7-bit to be ascii ALWAYS
2314 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2371 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2315 return *cmdbuf_ptr++; 2372 return *cmdbuf_ptr++;
2316 2373
2317 wchar_t wc; 2374 wchar_t wc;
2318 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2375 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2319 2376
… …
2323 cmdbuf_ptr = cmdbuf_endp; 2380 cmdbuf_ptr = cmdbuf_endp;
2324 break; 2381 break;
2325 } 2382 }
2326 2383
2327 if (len == (size_t)-1) 2384 if (len == (size_t)-1)
2385 {
2386 mbstate.reset (); // reset now undefined conversion state
2387 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2388 // in which case we "erroneously" return the next byte which might be valid.
2328 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2390 }
2329 2391
2330 // assume wchar == unicode 2392 // assume wchar == unicode
2331 cmdbuf_ptr += len; 2393 cmdbuf_ptr += len;
2332 return wc & UNICODE_MASK; 2394 return wc & UNICODE_MASK;
2333 } 2395 }
2334 2396
2335 return NOCHAR; 2397 return NOCHAR;
2336} 2398}
2337 2399
2338// read the next octet 2400// read the next octet
2339uint32_t 2401uint32_t ecb_hot
2340rxvt_term::next_octet () NOTHROW 2402rxvt_term::next_octet () NOTHROW
2341{ 2403{
2342 return cmdbuf_ptr < cmdbuf_endp 2404 return cmdbuf_ptr < cmdbuf_endp
2343 ? (unsigned char)*cmdbuf_ptr++ 2405 ? (unsigned char)*cmdbuf_ptr++
2344 : NOCHAR; 2406 : NOCHAR;
2345} 2407}
2346 2408
2347static class out_of_input out_of_input; 2409static class out_of_input out_of_input;
2348 2410
2349/* rxvt_cmd_getc () - Return next input character */ 2411wchar_t ecb_hot
2350/*
2351 * Return the next input character after first passing any keyboard input
2352 * to the command.
2353 */
2354wchar_t
2355rxvt_term::cmd_getc () THROW ((class out_of_input)) 2412rxvt_term::cmd_getc () THROW ((class out_of_input))
2356{ 2413{
2357 wchar_t c = next_char (); 2414 wchar_t c = next_char ();
2358 2415
2359 if (c == NOCHAR) 2416 if (c == NOCHAR)
2360 throw out_of_input; 2417 throw out_of_input;
2361 2418
2362 return c; 2419 return c;
2363} 2420}
2364 2421
2365uint32_t 2422uint32_t ecb_hot
2366rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2423rxvt_term::cmd_get8 () THROW ((class out_of_input))
2367{ 2424{
2368 uint32_t c = next_octet (); 2425 uint32_t c = next_octet ();
2369 2426
2370 if (c == NOCHAR) 2427 if (c == NOCHAR)
… …
2374} 2431}
2375 2432
2376/*{{{ print pipe */ 2433/*{{{ print pipe */
2377/*----------------------------------------------------------------------*/ 2434/*----------------------------------------------------------------------*/
2378#ifdef PRINTPIPE 2435#ifdef PRINTPIPE
2379FILE * 2436FILE * ecb_cold
2380rxvt_term::popen_printer () 2437rxvt_term::popen_printer ()
2381{ 2438{
2382 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2439 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2383 2440
2384 if (stream == NULL) 2441 if (stream == NULL)
2385 rxvt_warn ("can't open printer pipe, not printing.\n"); 2442 rxvt_warn ("can't open printer pipe, not printing.\n");
2386 2443
2387 return stream; 2444 return stream;
2388} 2445}
2389 2446
2390int 2447int ecb_cold
2391rxvt_term::pclose_printer (FILE *stream) 2448rxvt_term::pclose_printer (FILE *stream)
2392{ 2449{
2393 fflush (stream); 2450 fflush (stream);
2394 return pclose (stream); 2451 return pclose (stream);
2395} 2452}
2396 2453
2397/* 2454/*
2398 * simulate attached vt100 printer 2455 * simulate attached vt100 printer
2399 */ 2456 */
2400void 2457void ecb_cold
2401rxvt_term::process_print_pipe () 2458rxvt_term::process_print_pipe ()
2402{ 2459{
2403 int done; 2460 FILE *fd = popen_printer ();
2404 FILE *fd;
2405 2461
2406 if ((fd = popen_printer ()) == NULL) 2462 if (!fd)
2407 return; 2463 return;
2408 2464
2409 /* 2465 /*
2410 * Send all input to the printer until either ESC[4i or ESC[?4i 2466 * Send all input to the printer until either ESC[4i or ESC[?4i
2411 * is received. 2467 * is received.
2412 */ 2468 */
2413 for (done = 0; !done;) 2469 for (int done = 0; !done; )
2414 { 2470 {
2415 unsigned char buf[8]; 2471 unsigned char buf[8];
2416 unicode_t ch; 2472 unicode_t ch;
2417 unsigned int i, len; 2473 unsigned int i, len;
2418 2474
… …
2452 pclose_printer (fd); 2508 pclose_printer (fd);
2453} 2509}
2454#endif /* PRINTPIPE */ 2510#endif /* PRINTPIPE */
2455/*}}} */ 2511/*}}} */
2456 2512
2457/* *INDENT-OFF* */
2458enum { 2513enum {
2459 C1_40 = 0x40, 2514 C1_40 = 0x40,
2460 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2515 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2461 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2516 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2462 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2517 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2463 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2518 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2464}; 2519};
2465/* *INDENT-ON* */
2466 2520
2467/*{{{ process non-printing single characters */ 2521/*{{{ process non-printing single characters */
2468void 2522void ecb_hot
2469rxvt_term::process_nonprinting (unicode_t ch) 2523rxvt_term::process_nonprinting (unicode_t ch)
2470{ 2524{
2471 switch (ch) 2525 switch (ch)
2472 { 2526 {
2473 case C0_ESC: 2527 case C0_ESC:
… …
2519} 2573}
2520/*}}} */ 2574/*}}} */
2521 2575
2522 2576
2523/*{{{ process VT52 escape sequences */ 2577/*{{{ process VT52 escape sequences */
2524void 2578void ecb_cold
2525rxvt_term::process_escape_vt52 (unicode_t ch) 2579rxvt_term::process_escape_vt52 (unicode_t ch)
2526{ 2580{
2527 int row, col; 2581 int row, col;
2528 2582
2529 switch (ch) 2583 switch (ch)
… …
2563 break; 2617 break;
2564 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2565 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2566 break; 2620 break;
2567 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2568 PrivMode (0, PrivMode_vt52); 2622 priv_modes &= ~PrivMode_vt52;
2569 break; 2623 break;
2570 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2571 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2572 /* unimplemented */ 2626 /* unimplemented */
2573 break; 2627 break;
… …
2579} 2633}
2580/*}}} */ 2634/*}}} */
2581 2635
2582 2636
2583/*{{{ process escape sequences */ 2637/*{{{ process escape sequences */
2584void 2638void ecb_hot
2585rxvt_term::process_escape_seq () 2639rxvt_term::process_escape_seq ()
2586{ 2640{
2587 unicode_t ch = cmd_getc (); 2641 unicode_t ch = cmd_getc ();
2588 2642
2589 if (priv_modes & PrivMode_vt52) 2643 if (priv_modes & PrivMode_vt52)
… …
2592 return; 2646 return;
2593 } 2647 }
2594 2648
2595 switch (ch) 2649 switch (ch)
2596 { 2650 {
2597 /* case 1: do_tek_mode (); break; */
2598 case '#': 2651 case '#':
2599 if (cmd_getc () == '8') 2652 if (cmd_getc () == '8')
2600 scr_E (); 2653 scr_E ();
2601 break; 2654 break;
2602 case '(': 2655 case '(':
… …
2625#if !ENABLE_MINIMAL 2678#if !ENABLE_MINIMAL
2626 case '9': 2679 case '9':
2627 scr_forwardindex (); 2680 scr_forwardindex ();
2628 break; 2681 break;
2629#endif 2682#endif
2683 // DECPAM/DECPNM
2630 case '=': 2684 case '=':
2685 priv_modes |= PrivMode_aplKP;
2686 break;
2631 case '>': 2687 case '>':
2632 PrivMode ((ch == '='), PrivMode_aplKP); 2688 priv_modes &= ~PrivMode_aplKP;
2633 break; 2689 break;
2634 2690
2635 case C1_40: 2691 case C1_40:
2636 cmd_getc (); 2692 cmd_getc ();
2637 break; 2693 break;
… …
2641 2697
2642 /* 8.3.87: NEXT LINE */ 2698 /* 8.3.87: NEXT LINE */
2643 case C1_NEL: /* ESC E */ 2699 case C1_NEL: /* ESC E */
2644 { 2700 {
2645 wchar_t nlcr[] = { C0_LF, C0_CR }; 2701 wchar_t nlcr[] = { C0_LF, C0_CR };
2646 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2702 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2647 } 2703 }
2648 break; 2704 break;
2649 2705
2650 /* kidnapped escape sequence: Should be 8.3.48 */ 2706 /* kidnapped escape sequence: Should be 8.3.48 */
2651 case C1_ESA: /* ESC G */ 2707 case C1_ESA: /* ESC G */
2652 process_graphics (); 2708 // used by original rxvt for rob nations own graphics mode
2709 if (cmd_getc () == 'Q')
2710 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2653 break; 2711 break;
2654 2712
2655 /* 8.3.63: CHARACTER TABULATION SET */ 2713 /* 8.3.63: CHARACTER TABULATION SET */
2656 case C1_HTS: /* ESC H */ 2714 case C1_HTS: /* ESC H */
2657 scr_set_tab (1); 2715 scr_set_tab (1);
… …
2661 case C1_RI: /* ESC M */ 2719 case C1_RI: /* ESC M */
2662 scr_index (DN); 2720 scr_index (DN);
2663 break; 2721 break;
2664 2722
2665 /* 8.3.142: SINGLE-SHIFT TWO */ 2723 /* 8.3.142: SINGLE-SHIFT TWO */
2666 /*case C1_SS2: scr_single_shift (2); break; */ 2724 /* case C1_SS2: break; */
2667 2725
2668 /* 8.3.143: SINGLE-SHIFT THREE */ 2726 /* 8.3.143: SINGLE-SHIFT THREE */
2669 /*case C1_SS3: scr_single_shift (3); break; */ 2727 /* case C1_SS3: break; */
2670 2728
2671 /* 8.3.27: DEVICE CONTROL STRING */ 2729 /* 8.3.27: DEVICE CONTROL STRING */
2672 case C1_DCS: /* ESC P */ 2730 case C1_DCS: /* ESC P */
2673 process_dcs_seq (); 2731 process_dcs_seq ();
2674 break; 2732 break;
… …
2676 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2734 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2677 case C1_SCI: /* ESC Z */ 2735 case C1_SCI: /* ESC Z */
2678 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2736 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2679 break; /* steal obsolete ESC [ c */ 2737 break; /* steal obsolete ESC [ c */
2680 2738
2681 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2739 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2682 case C1_CSI: /* ESC [ */ 2740 case C1_CSI: /* ESC [ */
2683 process_csi_seq (); 2741 process_csi_seq ();
2684 break; 2742 break;
2685 2743
2686 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2744 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2687 case C1_OSC: /* ESC ] */ 2745 case C1_OSC: /* ESC ] */
2688 process_osc_seq (); 2746 process_osc_seq ();
2689 break; 2747 break;
2690 2748
2691 /* 8.3.106: RESET TO INITIAL STATE */ 2749 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2692 case 'c': 2750 case 'c':
2693 mbstate.reset (); 2751 mbstate.reset ();
2694 scr_poweron (); 2752 scr_poweron ();
2695 scrollbar_show (1); 2753 scrollBar.show (1);
2696 break; 2754 break;
2697 2755
2698 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2756 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2699 case 'n': 2757 case 'n':
2700 scr_charset_choose (2); 2758 scr_charset_choose (2);
… …
2707 } 2765 }
2708} 2766}
2709/*}}} */ 2767/*}}} */
2710 2768
2711/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2769/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2712/* *INDENT-OFF* */
2713enum { 2770enum {
2714 CSI_ICH = 0x40, 2771 CSI_ICH = 0x40,
2715 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2772 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2716 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2773 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2717 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2774 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2720 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2777 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2721 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2778 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2722 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2779 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2723}; 2780};
2724 2781
2725#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2782#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2726 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2783 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2727 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2784 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2728#define get_byte_array_bit(array, bit) \ 2785#define get_byte_array_bit(array, bit) \
2729 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2786 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2730 2787
2731const unsigned char csi_defaults[] = 2788static const unsigned char csi_defaults[] =
2732 { 2789 {
2733 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2790 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2734 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2791 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2735 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2792 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2736 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2793 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2737 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2794 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2738 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2795 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2739 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2740 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2741 }; 2798 };
2742/* *INDENT-ON* */
2743 2799
2744void 2800void ecb_hot
2745rxvt_term::process_csi_seq () 2801rxvt_term::process_csi_seq ()
2746{ 2802{
2747 unicode_t ch, priv, i; 2803 unicode_t ch, priv, i;
2748 unsigned int nargs, p; 2804 unsigned int nargs, p;
2749 int n, ndef; 2805 int n, ndef;
… …
2751 2807
2752 nargs = 0; 2808 nargs = 0;
2753 2809
2754 priv = 0; 2810 priv = 0;
2755 ch = cmd_getc (); 2811 ch = cmd_getc ();
2756 if (ch >= '<' && ch <= '?') 2812 if ((ch >= '<' && ch <= '?') || ch == '!')
2757 { 2813 {
2758 /* '<' '=' '>' '?' */ 2814 /* '<' '=' '>' '?' '!' */
2759 priv = ch; 2815 priv = ch;
2760 ch = cmd_getc (); 2816 ch = cmd_getc ();
2761 } 2817 }
2762 2818
2763 /* read any numerical arguments */ 2819 /* read any numerical arguments */
… …
2812 // versions. 2868 // versions.
2813 // 2869 //
2814 tt_printf ("\033[>%d;95;0c", 'U'); 2870 tt_printf ("\033[>%d;95;0c", 'U');
2815 } 2871 }
2816 break; 2872 break;
2873
2817 case '?': 2874 case '?':
2818 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2875 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2819 process_terminal_mode (ch, priv, nargs, arg); 2876 process_terminal_mode (ch, priv, nargs, arg);
2820 break; 2877 break;
2878
2879 case '!':
2880 if (ch == CSI_70)
2881 {
2882 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2883 scr_soft_reset ();
2884
2885 static const int pm_h[] = { 7, 25 };
2886 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2887
2888 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2889 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2821 } 2890 }
2891 break;
2892 }
2893
2822 return; 2894 return;
2823 } 2895 }
2824 2896
2825 switch (ch) 2897 switch (ch)
2826 { 2898 {
… …
2840 } 2912 }
2841 break; 2913 break;
2842#endif 2914#endif
2843 2915
2844 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2916 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2845 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2917 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2846 arg[0] = -arg[0]; 2918 arg[0] = -arg[0];
2847 /* FALLTHROUGH */ 2919 /* FALLTHROUGH */
2848 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2920 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2849 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2921 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2850 scr_gotorc (arg[0], 0, RELATIVE); 2922 scr_gotorc (arg[0], 0, RELATIVE);
2851 break; 2923 break;
2852 2924
2853 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2925 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2854 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2926 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3041 } 3113 }
3042} 3114}
3043/*}}} */ 3115/*}}} */
3044 3116
3045#if !ENABLE_MINIMAL 3117#if !ENABLE_MINIMAL
3046/* ARGSUSED */
3047void 3118void
3048rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3049{ 3120{
3050 int x, y; 3121 int x, y;
3051 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
… …
3060 { 3131 {
3061 /* 3132 /*
3062 * commands 3133 * commands
3063 */ 3134 */
3064 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3065 XMapWindow (dpy, parent[0]); 3136 XMapWindow (dpy, parent);
3066 break; 3137 break;
3067 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3068 XIconifyWindow (dpy, parent[0], display->screen); 3139 XIconifyWindow (dpy, parent, display->screen);
3069 break; 3140 break;
3070 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3071 XMoveWindow (dpy, parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent, args[1], args[2]);
3072 break; 3143 break;
3073 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3074 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3075 break; 3146 break;
3076 case 5: /* raise window */ 3147 case 5: /* raise window */
3077 XRaiseWindow (dpy, parent[0]); 3148 XRaiseWindow (dpy, parent);
3078 break; 3149 break;
3079 case 6: /* lower window */ 3150 case 6: /* lower window */
3080 XLowerWindow (dpy, parent[0]); 3151 XLowerWindow (dpy, parent);
3081 break; 3152 break;
3082 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3083 scr_touch (true); 3154 scr_touch (true);
3084 break; 3155 break;
3085 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
… …
3088 break; 3159 break;
3089 3160
3090 //case 9: NYI, TODO, restore maximized window or maximize window 3161 //case 9: NYI, TODO, restore maximized window or maximize window
3091 default: 3162 default:
3092 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3093 set_widthheight ((unsigned int)width, 3164 set_widthheight ((unsigned int)vt_width,
3094 (unsigned int) (args[1] * fheight)); 3165 (unsigned int) (args[1] * fheight));
3095 break; 3166 break;
3096 3167
3097 /* 3168 /*
3098 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3099 */ 3170 */
3100 case 11: /* report window state */ 3171 case 11: /* report window state */
3101 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3102 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3103 break; 3174 break;
3104 case 13: /* report window position */ 3175 case 13: /* report window position */
3105 XGetWindowAttributes (dpy, parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent, &wattr);
3106 XTranslateCoordinates (dpy, parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent, wattr.root,
3107 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3108 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3109 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3110 break; 3181 break;
3111 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3112 XGetWindowAttributes (dpy, parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent, &wattr);
3113 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3114 break; 3185 break;
3115 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3116 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3117 break; 3188 break;
… …
3119 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3120 break; 3191 break;
3121 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3122 { 3193 {
3123 char *s; 3194 char *s;
3124 XGetIconName (dpy, parent[0], &s); 3195 XGetIconName (dpy, parent, &s);
3125 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3126 XFree (s); 3197 XFree (s);
3127 } 3198 }
3128 break; 3199 break;
3129 case 21: /* report window title */ 3200 case 21: /* report window title */
3130 { 3201 {
3131 char *s; 3202 char *s;
3132 XFetchName (dpy, parent[0], &s); 3203 XFetchName (dpy, parent, &s);
3133 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3134 XFree (s); 3205 XFree (s);
3135 } 3206 }
3136 break; 3207 break;
3137 } 3208 }
… …
3193 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3194 */ 3265 */
3195void 3266void
3196rxvt_term::process_dcs_seq () 3267rxvt_term::process_dcs_seq ()
3197{ 3268{
3198 char *s;
3199 unicode_t eh;
3200
3201 /* 3269 /*
3202 * Not handled yet 3270 * Not handled yet
3203 */ 3271 */
3272
3273 unicode_t eh;
3204 s = get_to_st (eh); 3274 char *s = get_to_st (eh);
3205 if (s) 3275 if (s)
3206 free (s); 3276 free (s);
3207 3277
3208 return; 3278 return;
3209} 3279}
… …
3213 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3283 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3214 */ 3284 */
3215void 3285void
3216rxvt_term::process_osc_seq () 3286rxvt_term::process_osc_seq ()
3217{ 3287{
3218 unicode_t ch, eh;
3219 int arg; 3288 int arg;
3220 3289
3221 ch = cmd_getc (); 3290 unicode_t ch = cmd_getc ();
3222 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3291 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3223 arg = arg * 10 + (ch - '0'); 3292 arg = arg * 10 + (ch - '0');
3224 3293
3225 if (ch == ';') 3294 if (ch == ';')
3226 { 3295 {
3296 unicode_t eh;
3227 char *s = get_to_st (eh); 3297 char *s = get_to_st (eh);
3228 3298
3229 if (s) 3299 if (s)
3230 { 3300 {
3231 process_xterm_seq (arg, s, eh); 3301 process_xterm_seq (arg, s, eh);
… …
3255 3325
3256/* 3326/*
3257 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3327 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3258 */ 3328 */
3259void 3329void
3260rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3330rxvt_term::process_xterm_seq (int op, char *str, char resp)
3261{ 3331{
3262 int color; 3332 int color;
3263 char *buf, *name; 3333 char *buf, *name;
3264 bool query = str[0] == '?' && !str[1]; 3334 bool query = str[0] == '?' && !str[1];
3265 int saveop = op; 3335 int saveop = op;
… …
3292 unsigned long bytes_after; 3362 unsigned long bytes_after;
3293 unsigned char *value = 0; 3363 unsigned char *value = 0;
3294 const char *str = ""; 3364 const char *str = "";
3295 3365
3296 if (prop 3366 if (prop
3297 && XGetWindowProperty (dpy, parent[0], 3367 && XGetWindowProperty (dpy, parent,
3298 prop, 0, 1<<16, 0, AnyPropertyType, 3368 prop, 0, 1<<16, 0, AnyPropertyType,
3299 &actual_type, &actual_format, 3369 &actual_type, &actual_format,
3300 &nitems, &bytes_after, &value) == Success 3370 &nitems, &bytes_after, &value) == Success
3301 && actual_type != None 3371 && actual_type != None
3302 && actual_format == 8) 3372 && actual_format == 8)
… …
3306 3376
3307 XFree (value); 3377 XFree (value);
3308 } 3378 }
3309 else 3379 else
3310 { 3380 {
3311 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3381 char *eq = strchr (str, '=');
3312 3382
3313 if (eq) 3383 if (eq)
3314 { 3384 {
3315 *eq = 0; 3385 *eq = 0;
3316 set_utf8_property (display->atom (str), eq + 1); 3386 set_utf8_property (display->atom (str), eq + 1);
3317 } 3387 }
3318 else 3388 else
3319 XDeleteProperty (dpy, parent[0], 3389 XDeleteProperty (dpy, parent,
3320 display->atom (str)); 3390 display->atom (str));
3321 } 3391 }
3322 break; 3392 break;
3323 3393
3324 case XTerm_Color: 3394 case XTerm_Color:
… …
3337 *buf++ = '\0'; 3407 *buf++ = '\0';
3338 3408
3339 process_color_seq (op, color, name, resp); 3409 process_color_seq (op, color, name, resp);
3340 } 3410 }
3341 break; 3411 break;
3412 case Rxvt_restoreFG:
3342 case XTerm_Color00: 3413 case XTerm_Color00:
3343 process_color_seq (op, Color_fg, str, resp); 3414 process_color_seq (op, Color_fg, str, resp);
3344 break; 3415 break;
3416 case Rxvt_restoreBG:
3345 case XTerm_Color01: 3417 case XTerm_Color01:
3346 process_color_seq (op, Color_bg, str, resp); 3418 process_color_seq (op, Color_bg, str, resp);
3347 break; 3419 break;
3348#ifndef NO_CURSORCOLOR 3420#ifndef NO_CURSORCOLOR
3349 case XTerm_Color_cursor: 3421 case XTerm_Color_cursor:
… …
3354 process_color_seq (op, Color_pointer_fg, str, resp); 3426 process_color_seq (op, Color_pointer_fg, str, resp);
3355 break; 3427 break;
3356 case XTerm_Color_pointer_bg: 3428 case XTerm_Color_pointer_bg:
3357 process_color_seq (op, Color_pointer_bg, str, resp); 3429 process_color_seq (op, Color_pointer_bg, str, resp);
3358 break; 3430 break;
3431#ifdef OPTION_HC
3432 case XTerm_Color_HC:
3433 process_color_seq (op, Color_HC, str, resp);
3434 break;
3435 case XTerm_Color_HTC:
3436 process_color_seq (op, Color_HTC, str, resp);
3437 break;
3438#endif
3359#ifndef NO_BOLD_UNDERLINE_REVERSE 3439#ifndef NO_BOLD_UNDERLINE_REVERSE
3360 case XTerm_Color_RV:
3361 process_color_seq (op, Color_RV, str, resp);
3362 break;
3363 case Rxvt_Color_BD:
3364 case URxvt_Color_BD: 3440 case URxvt_Color_BD:
3365 process_color_seq (op, Color_BD, str, resp); 3441 process_color_seq (op, Color_BD, str, resp);
3366 break; 3442 break;
3367 case Rxvt_Color_UL:
3368 case URxvt_Color_UL: 3443 case URxvt_Color_UL:
3369 process_color_seq (op, Color_UL, str, resp); 3444 process_color_seq (op, Color_UL, str, resp);
3370 break; 3445 break;
3371 case URxvt_Color_IT: 3446 case URxvt_Color_IT:
3372 process_color_seq (op, Color_IT, str, resp); 3447 process_color_seq (op, Color_IT, str, resp);
3373 break; 3448 break;
3374#endif 3449#endif
3375#if ENABLE_TRANSPARENCY 3450 case URxvt_Color_border:
3451 process_color_seq (op, Color_border, str, resp);
3452 break;
3453
3454#if BG_IMAGE_FROM_ROOT
3376 case URxvt_Color_tint: 3455 case URxvt_Color_tint:
3377 process_color_seq (op, Color_tint, str, resp); 3456 process_color_seq (op, Color_tint, str, resp);
3378 { 3457 {
3379 bool changed = false; 3458 bool changed = false;
3459
3380 if (ISSET_PIXCOLOR (Color_tint)) 3460 if (ISSET_PIXCOLOR (Color_tint))
3381 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3461 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3382 else 3462
3383 changed = bgPixmap.unset_tint ();
3384 if (changed) 3463 if (changed)
3385 update_background (); 3464 update_background ();
3386 } 3465 }
3387 3466
3388 break; 3467 break;
… …
3391#if BG_IMAGE_FROM_FILE 3470#if BG_IMAGE_FROM_FILE
3392 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3393 if (!strcmp (str, "?")) 3472 if (!strcmp (str, "?"))
3394 { 3473 {
3395 char str[256]; 3474 char str[256];
3475 int h_scale = fimage.h_scale;
3476 int v_scale = fimage.v_scale;
3477 int h_align = fimage.h_align;
3478 int v_align = fimage.v_align;
3396 3479
3397 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3480 sprintf (str, "[%dx%d+%d+%d]",
3398 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3481 h_scale, v_scale,
3399 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3482 h_align, v_align);
3400 process_xterm_seq (XTerm_title, str, CHAR_ST); 3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3401 } 3484 }
3402 else 3485 else
3403 { 3486 {
3404 int changed = 0; 3487 bool changed = false;
3405 3488
3406 if (*str != ';') 3489 if (*str != ';')
3407 { 3490 {
3408 /* reset to default scaling :*/ 3491 try
3409 bgPixmap.unset_geometry (); 3492 {
3410 if (bgPixmap.set_file (str)) /* change pixmap */ 3493 fimage.set_file_geometry (this, str);
3411 changed++; 3494 changed = true;
3412 str = strchr (str, ';'); 3495 }
3413 if (str == NULL) 3496 catch (const class rxvt_failure_exception &e)
3414 bgPixmap.set_defaultGeometry (); 3497 {
3498 }
3415 } 3499 }
3416 while (str) 3500 else
3417 { 3501 {
3418 str++; 3502 str++;
3419 if (bgPixmap.set_geometry (str)) 3503 if (fimage.set_geometry (str, true))
3420 changed++; 3504 changed = true;
3421 str = strchr (str, ';');
3422 } 3505 }
3506
3423 if (changed) 3507 if (changed)
3508 {
3509 if (bg_window_position_sensitive ())
3510 {
3511 int x, y;
3512 get_window_origin (x, y);
3513 parent_x = x;
3514 parent_y = y;
3515 }
3424 update_background (); 3516 update_background ();
3517 }
3425 } 3518 }
3426 break; 3519 break;
3427#endif 3520#endif
3428
3429 case Rxvt_restoreFG:
3430 set_window_color (Color_fg, str);
3431 break;
3432 case Rxvt_restoreBG:
3433 set_window_color (Color_bg, str);
3434 break;
3435 3521
3436 case XTerm_logfile: 3522 case XTerm_logfile:
3437 // TODO, when secure mode? 3523 // TODO, when secure mode?
3438 break; 3524 break;
3439 3525
… …
3506 break; 3592 break;
3507#endif 3593#endif
3508 3594
3509#if ENABLE_PERL 3595#if ENABLE_PERL
3510 case URxvt_perl: 3596 case URxvt_perl:
3511 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3597 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3512 ; // no responses yet
3513 break; 3598 break;
3514#endif 3599#endif
3515 } 3600 }
3516} 3601}
3517/*----------------------------------------------------------------------*/ 3602/*----------------------------------------------------------------------*/
… …
3524 * 's' = save 3609 * 's' = save
3525 * 'r' = restore 3610 * 'r' = restore
3526 * 't' = toggle 3611 * 't' = toggle
3527 * so no need for fancy checking 3612 * so no need for fancy checking
3528 */ 3613 */
3529int 3614int ecb_cold
3530rxvt_term::privcases (int mode, unsigned long bit) 3615rxvt_term::privcases (int mode, unsigned long bit)
3531{ 3616{
3532 int state; 3617 int state;
3533 3618
3534 if (mode == 's') 3619 if (mode == 's')
3535 { 3620 {
3536 SavedModes |= (priv_modes & bit); 3621 if (priv_modes & bit)
3622 SavedModes |= bit;
3623 else
3624 SavedModes &= ~bit;
3537 return -1; 3625 return -1;
3538 } 3626 }
3539 else 3627 else
3540 { 3628 {
3541 if (mode == 'r') 3629 if (mode == 'r')
3542 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3630 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3543 else 3631 else
3544 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3632 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3545 PrivMode (state, bit); 3633
3634 if (state)
3635 priv_modes |= bit;
3636 else
3637 priv_modes &= ~bit;
3546 } 3638 }
3547 3639
3548 return state; 3640 return state;
3549} 3641}
3550 3642
3551/* we're not using priv _yet_ */ 3643/* we're not using priv _yet_ */
3552void 3644void
3553rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3645rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3554{ 3646{
3555 unsigned int i, j; 3647 unsigned int i, j;
3556 int state; 3648 int state;
3557 3649
3558 static const struct 3650 static const struct
3559 { 3651 {
3560 const int argval; 3652 const int argval;
3561 const unsigned long bit; 3653 const unsigned long bit;
3562 } argtopriv[] = { 3654 } argtopriv[] = {
3563 { 1, PrivMode_aplCUR }, 3655 { 1, PrivMode_aplCUR }, // DECCKM
3564 { 2, PrivMode_vt52 }, 3656 { 2, PrivMode_vt52 }, // DECANM
3565 { 3, PrivMode_132 }, 3657 { 3, PrivMode_132 }, // DECCOLM
3566 { 4, PrivMode_smoothScroll }, 3658 { 4, PrivMode_smoothScroll }, // DECSCLM
3567 { 5, PrivMode_rVideo }, 3659 { 5, PrivMode_rVideo }, // DECSCNM
3568 { 6, PrivMode_relOrigin }, 3660 { 6, PrivMode_relOrigin }, // DECOM
3569 { 7, PrivMode_Autowrap }, 3661 { 7, PrivMode_Autowrap }, // DECAWM
3570 // 8, bi-directional support mode 3662 // 8, auto-repeat keys // DECARM
3571 { 9, PrivMode_MouseX10 }, 3663 { 9, PrivMode_MouseX10 },
3572 // 18, 19 printing-related 3664 // 18 end FF to printer after print screen
3665 // 19 Print screen prints full screen/scroll region
3573 { 25, PrivMode_VisibleCursor }, 3666 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3574#ifdef scrollBar_esc 3667#ifdef scrollBar_esc
3575 { scrollBar_esc, PrivMode_scrollBar }, 3668 { scrollBar_esc, PrivMode_scrollBar },
3576#endif 3669#endif
3577 { 35, PrivMode_ShiftKeys }, // rxvt extension 3670 { 35, PrivMode_ShiftKeys }, // rxvt extension
3671 // 38, tektronix mode // DECTEK
3578 { 40, PrivMode_132OK }, 3672 { 40, PrivMode_132OK },
3579 // 41 xterm more fixes NYI 3673 // 41 xterm more fixes NYI
3580 // 45 margin bell NYI 3674 // 45 margin bell NYI
3581 // 46 start logging 3675 // 46 start logging
3582 { 47, PrivMode_Screen }, 3676 { 47, PrivMode_Screen },
3583 { 66, PrivMode_aplKP }, 3677 { 66, PrivMode_aplKP }, // DECNKM
3584#ifndef NO_BACKSPACE_KEY 3678#ifndef NO_BACKSPACE_KEY
3585 { 67, PrivMode_BackSpace }, 3679 { 67, PrivMode_BackSpace }, // DECBKM
3586#endif 3680#endif
3587 { 1000, PrivMode_MouseX11 }, 3681 { 1000, PrivMode_MouseX11 },
3588 { 1002, PrivMode_MouseBtnEvent }, 3682 { 1002, PrivMode_MouseBtnEvent },
3589 { 1003, PrivMode_MouseAnyEvent }, 3683 { 1003, PrivMode_MouseAnyEvent },
3684#if ENABLE_FRILLS
3685 { 1005, PrivMode_ExtModeMouse },
3686#endif
3590 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3687 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3591 { 1011, PrivMode_Keypress }, // rxvt extension 3688 { 1011, PrivMode_Keypress }, // rxvt extension
3689#if ENABLE_FRILLS
3690 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3691#endif
3592 // 1035 enable modifiers for alt, numlock NYI 3692 // 1035 enable modifiers for alt, numlock NYI
3593 // 1036 send ESC for meta keys NYI 3693 // 1036 send ESC for meta keys NYI
3594 // 1037 send DEL for keypad delete NYI 3694 // 1037 send DEL for keypad delete NYI
3595 { 1047, PrivMode_Screen }, 3695 { 1047, PrivMode_Screen },
3596 // 1048 save and restore cursor 3696 // 1048 save and restore cursor, implemented in code
3597 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3697 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3598 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3698 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3699 { 2004, PrivMode_BracketPaste },
3599 }; 3700 };
3600 3701
3601 if (nargs == 0) 3702 if (nargs == 0)
3602 return; 3703 return;
3603 3704
… …
3610 for (i = 0; i < nargs; i++) 3711 for (i = 0; i < nargs; i++)
3611 { 3712 {
3612 state = -1; 3713 state = -1;
3613 3714
3614 /* basic handling */ 3715 /* basic handling */
3615 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3716 for (j = 0; j < ecb_array_length (argtopriv); j++)
3616 if (argtopriv[j].argval == arg[i]) 3717 if (argtopriv[j].argval == arg[i])
3617 { 3718 {
3618 state = privcases (mode, argtopriv[j].bit); 3719 state = privcases (mode, argtopriv[j].bit);
3619 break; 3720 break;
3620 } 3721 }
… …
3628 3729
3629 scr_touch (true); 3730 scr_touch (true);
3630 break; 3731 break;
3631#endif 3732#endif
3632 case 1048: /* alternative cursor save */ 3733 case 1048: /* alternative cursor save */
3633 case 1049:
3634 if (option (Opt_secondaryScreen)) 3734 if (option (Opt_secondaryScreen))
3635 if (mode == 0) 3735 if (mode == 0)
3636 scr_cursor (RESTORE); 3736 scr_cursor (RESTORE);
3637 else if (mode == 1) 3737 else if (mode == 1)
3638 scr_cursor (SAVE); 3738 scr_cursor (SAVE);
… …
3647 case 2: /* VT52 mode */ 3747 case 2: /* VT52 mode */
3648 /* oddball mode. should be set regardless of set/reset 3748 /* oddball mode. should be set regardless of set/reset
3649 * parameter. Return from VT52 mode with an ESC < from 3749 * parameter. Return from VT52 mode with an ESC < from
3650 * within VT52 mode 3750 * within VT52 mode
3651 */ 3751 */
3652 PrivMode (1, PrivMode_vt52); 3752 priv_modes |= PrivMode_vt52;
3653 break; 3753 break;
3654 case 3: /* 80/132 */ 3754 case 3: /* 80/132 */
3655 if (priv_modes & PrivMode_132OK) 3755 if (priv_modes & PrivMode_132OK)
3656 set_widthheight (((state ? 132 : 80) * fwidth), height); 3756 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3657 break; 3757 break;
3658 case 4: /* smooth scrolling */ 3758 case 4: /* smooth scrolling */
3659 set_option (Opt_jumpScroll, !state); 3759 set_option (Opt_jumpScroll, !state);
3660 break; 3760 break;
3661 case 5: /* reverse video */ 3761 case 5: /* reverse video */
… …
3672 if (state) /* orthogonal */ 3772 if (state) /* orthogonal */
3673 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3773 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3674 break; 3774 break;
3675#ifdef scrollBar_esc 3775#ifdef scrollBar_esc
3676 case scrollBar_esc: 3776 case scrollBar_esc:
3677 if (scrollbar_mapping (state)) 3777 scrollBar.map (state);
3678 {
3679 resize_all_windows (0, 0, 0); 3778 resize_all_windows (0, 0, 0);
3680 scr_touch (true); 3779 scr_touch (true);
3681 }
3682 break; 3780 break;
3683#endif 3781#endif
3684 case 25: /* visible/invisible cursor */ 3782 case 25: /* visible/invisible cursor */
3685 scr_cursor_visible (state); 3783 scr_cursor_visible (state);
3686 break; 3784 break;
… …
3699 case 1003: 3797 case 1003:
3700 if (state) 3798 if (state)
3701 { 3799 {
3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3800 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3703 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3801 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3802 mouse_row = mouse_col = 0;
3704 vt_emask_mouse = PointerMotionMask; 3803 vt_emask_mouse = PointerMotionMask;
3705 } 3804 }
3706 else 3805 else
3707 vt_emask_mouse = NoEventMask; 3806 vt_emask_mouse = NoEventMask;
3807
3708 vt_select_input (); 3808 vt_select_input ();
3709 break; 3809 break;
3710 case 1010: /* scroll to bottom on TTY output inhibit */ 3810 case 1010: /* scroll to bottom on TTY output inhibit */
3711 set_option (Opt_scrollTtyOutput, !state); 3811 set_option (Opt_scrollTtyOutput, !state);
3712 break; 3812 break;
3713 case 1011: /* scroll to bottom on key press */ 3813 case 1011: /* scroll to bottom on key press */
3714 set_option (Opt_scrollTtyKeypress, state); 3814 set_option (Opt_scrollTtyKeypress, state);
3715 break; 3815 break;
3716 case 1047: /* secondary screen w/ clearing last */ 3816 case 1047: /* secondary screen w/ clearing last */
3717 if (option (Opt_secondaryScreen)) 3817 if (option (Opt_secondaryScreen))
3718 if (current_screen != PRIMARY) 3818 if (!state)
3719 scr_erase_screen (2); 3819 scr_erase_screen (2);
3820
3720 scr_change_screen (state); 3821 scr_change_screen (state);
3721 break; 3822 break;
3722 case 1049: /* secondary screen w/ clearing first */ 3823 case 1049: /* secondary screen w/ clearing first */
3824 if (option (Opt_secondaryScreen))
3825 if (state)
3826 scr_cursor (SAVE);
3827
3723 scr_change_screen (state); 3828 scr_change_screen (state);
3829
3724 if (option (Opt_secondaryScreen)) 3830 if (option (Opt_secondaryScreen))
3725 if (current_screen != PRIMARY) 3831 if (state)
3726 scr_erase_screen (2); 3832 scr_erase_screen (2);
3833 else
3834 scr_cursor (RESTORE);
3727 break; 3835 break;
3728 default: 3836 default:
3729 break; 3837 break;
3730 } 3838 }
3731 } 3839 }
3732} 3840}
3733/*}}} */ 3841/*}}} */
3734 3842
3735/*{{{ process sgr sequences */ 3843/*{{{ process sgr sequences */
3736void 3844void ecb_hot
3737rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3845rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3738{ 3846{
3739 unsigned int i; 3847 unsigned int i;
3740 short rendset; 3848 short rendset;
3741 int rendstyle; 3849 int rendstyle;
… …
3884 } 3992 }
3885 } 3993 }
3886} 3994}
3887/*}}} */ 3995/*}}} */
3888 3996
3889/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3890void
3891rxvt_term::process_graphics ()
3892{
3893 unicode_t ch, cmd = cmd_getc ();
3894
3895 if (cmd == 'Q')
3896 {
3897 /* query graphics */
3898 tt_printf ("\033G0\012"); /* no graphics */
3899 return;
3900 }
3901 /* swallow other graphics sequences until terminating ':' */
3902 do
3903 ch = cmd_getc ();
3904 while (ch != ':');
3905}
3906/*}}} */
3907
3908/* ------------------------------------------------------------------------- */ 3997/* ------------------------------------------------------------------------- */
3909 3998
3910/* 3999/*
3911 * Send printf () formatted output to the command. 4000 * Send printf () formatted output to the command.
3912 * Only use for small amounts of data. 4001 * Only use for small amounts of data.
… …
3925 4014
3926/* ---------------------------------------------------------------------- */ 4015/* ---------------------------------------------------------------------- */
3927/* Write data to the pty as typed by the user, pasted with the mouse, 4016/* Write data to the pty as typed by the user, pasted with the mouse,
3928 * or generated by us in response to a query ESC sequence. 4017 * or generated by us in response to a query ESC sequence.
3929 */ 4018 */
3930const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4019static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3931 4020
3932void 4021void
3933rxvt_term::tt_write (const char *data, unsigned int len) 4022rxvt_term::tt_write (const char *data, unsigned int len)
3934{ 4023{
3935 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4024 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3940 4029
3941 if (v_buflen == 0) 4030 if (v_buflen == 0)
3942 { 4031 {
3943 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4032 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3944 4033
4034 max_it (written, 0);
4035
3945 if ((unsigned int)written == len) 4036 if (written == len)
3946 return; 4037 return;
3947 4038
3948 data += written; 4039 data += written;
3949 len -= written; 4040 len -= written;
3950 } 4041 }
3951 4042
3952 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4043 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3953 4044
3954 memcpy (v_buffer + v_buflen, data, len); 4045 memcpy (v_buffer + v_buflen, data, len);
3955 v_buflen += len; 4046 v_buflen += len;
3956 4047
3957 pty_ev.set (ev::READ | ev::WRITE); 4048 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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