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.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.356 by root, Mon Sep 17 08:31:54 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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
… …
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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57/*{{{ Convert the keypress event into a string */ 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68#if ENABLE_FRILLS || ISO_14755
69
70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_Caps_Lock, 0x21ec,
101 XK_Num_Lock, 0x21ed,
102 XK_ISO_Level3_Shift, 0x21ee,
103 XK_ISO_Level3_Lock, 0x21ef,
104 XK_ISO_Group_Lock, 0x21f0,
105 XK_Home, 0x21f1,
106 XK_End, 0x21f2,
107
108 XK_Execute, 0x2318,
109 XK_Begin, 0x2320,
110 XK_Delete, 0x2326,
111 XK_Clear, 0x2327,
112 XK_BackSpace, 0x232b,
113 XK_Insert, 0x2380,
114 XK_Control_L, 0x2388,
115 XK_Control_R, 0x2388,
116 XK_Pause, 0x2389,
117 XK_Break, 0x238a,
118 XK_Escape, 0x238b,
119 XK_Undo, 0x238c,
120 XK_Print, 0x2399,
121
122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
130 XK_KP_Space, 0x2422,
131#endif
132 0,
133};
134
58void 135void
136rxvt_term::iso14755_54 (int x, int y)
137{
138 x = Pixel2Col (x);
139 y = Pixel2Row (y);
140
141 if (!IN_RANGE_EXC (x, 0, ncol)
142 || !IN_RANGE_EXC (y, 0, nrow))
143 return;
144
145 for (;;)
146 {
147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
150
151 if (t != NOCHAR || !x)
152 {
153 iso14755_51 (l.t[x], l.r[x], x, y);
154 iso14755buf = ISO_14755_54;
155 break;
156 }
157
158 x--;
159 }
160}
161
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
165 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname;
168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171
172# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch))
174 {
175 len = rxvt_composite.expand (ch, 0);
176 alloc = chr = new wchar_t[len];
177 rxvt_composite.expand (ch, chr);
178 }
179 else
180# endif
181 {
182 ch2 = ch;
183
184 alloc = 0;
185 chr = &ch2;
186 len = 1;
187 }
188
189 char attr[80]; // plenty
190
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
201 int width = wcswidth (fname, wcslen (fname));
202
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
213
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215
216 for (int y = 0; y < len; y++)
217 {
218 char buf[9];
219
220 ch = *chr++;
221
222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '=');
225# if !UNICODE3
226 if (ch >= 0x10000)
227 ch = 0xfffd;
228# endif
229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
241 scr_overlay_set (0, len + 1, fname);
242
243 free (fname);
244
245# if ENABLE_COMBINING
246 if (alloc)
247 delete [] alloc;
248# endif
249}
250#endif
251
252void
253rxvt_term::commit_iso14755 ()
254{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259
260 if (iso14755buf & ISO_14755_51)
261 {
262 char mb[16];
263 int len;
264
265 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20)
267 len = wcstombs (mb, ch, 16);
268 else
269 {
270 mb[0] = ch[0];
271 len = 1;
272 }
273
274 if (len > 0)
275 tt_write (mb, len);
276 else
277 scr_bell ();
278 }
279
280 iso14755buf = 0;
281}
282
283int
59rxvt_term::lookup_key (XKeyEvent &ev) 284rxvt_term::hex_keyval (XKeyEvent &ev)
285{
286 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++)
289 {
290 KeySym k = XLookupKeysym (&ev, index);
291
292 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
293 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
294 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
295 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
296 }
297
298 return -1;
299}
300#endif
301
302void
303rxvt_term::key_press (XKeyEvent &ev)
60{ 304{
61 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
62 unsigned int newlen; 306 unsigned int newlen;
63 KeySym keysym; 307 KeySym keysym;
64#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */
66#endif
67 int valid_keysym; 308 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
69 315
70 /* 316 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
73 * 319 *
74 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
75 */ 321 */
76 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
77 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
78 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
79 325
80 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
81 { 327 {
82 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
88#ifdef USE_XIM 334#ifdef USE_XIM
89 if (Input_Context) 335 if (Input_Context)
90 { 336 {
91 Status status_return; 337 Status status_return;
92 338
339#if 0
93#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
96 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
97 else 344 else
345#endif
98#endif 346#endif
99 { 347 {
100 wchar_t wkbuf[KBUFSZ + 1]; 348 wchar_t wkbuf[KBUFSZ + 1];
101 349
102 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
106 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
109 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 360 SET_LOCALE (locale);
111 361
112 if (status_return == XLookupChars 362 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
… …
134 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
135 } 385 }
136 else 386 else
137#endif 387#endif
138 { 388 {
139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
140 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
141 } 391 }
142 392
143 if (valid_keysym) 393 if (valid_keysym)
144 { 394 {
395#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state))
397 return;
398#endif
399
145 if (TermWin.saveLines) 400 if (saveLines)
146 { 401 {
147#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
148 if (!ctrl && !meta) 403 if (!ctrl && !meta)
149 {
150#else 404#else
151 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
406#endif
152 { 407 {
153#endif
154 int lnsppg; 408 int lnsppg;
155 409
156#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
158#else 412#else
159 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
160#endif 414#endif
161 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
162 { 416 {
163 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
164 return; 418 return;
… …
192 scr_move_to (0, 1); 446 scr_move_to (0, 1);
193 return; 447 return;
194 } 448 }
195 else if (keysym == XK_End) 449 else if (keysym == XK_End)
196 { 450 {
197 scr_move_to (1, 0); 451 scr_move_to (1, 1);
198 return; 452 return;
199 } 453 }
200 } 454 }
201#endif 455#endif
202 } 456 }
… …
207 if (keysym >= XK_F1 && keysym <= XK_F10) 461 if (keysym >= XK_F1 && keysym <= XK_F10)
208 { 462 {
209 keysym += (XK_F11 - XK_F1); 463 keysym += (XK_F11 - XK_F1);
210 shft = 0; /* turn off Shift */ 464 shft = 0; /* turn off Shift */
211 } 465 }
212 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
213 { 467 {
214 switch (keysym) 468 switch (keysym)
215 { 469 {
216 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
217 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
218 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
219 return; 473 return;
474#if TODO
220 /* rxvt extras */ 475 /* rxvt extras */
221 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
222 change_font (FONT_UP); 477 change_font (FONT_UP);
223 return; 478 return;
224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
225 change_font (FONT_DN); 480 change_font (FONT_DN);
226 return; 481 return;
482#endif
227 } 483 }
228 } 484 }
229 } 485 }
230#ifdef PRINTPIPE 486
231 if (keysym == XK_Print) 487#if ENABLE_FRILLS || ISO_14755
232 { 488 // ISO 14755 support
233 scr_printscreen (ctrl | shft); 489 if (shft && ctrl)
234 return;
235 } 490 {
236#endif 491 int hv;
237 492
238 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 493 if (iso14755buf & ISO_14755_51
239 { 494 && (keysym == XK_space || keysym == XK_KP_Space
240#ifdef KEYSYM_RESOURCE 495 || keysym == XK_Return || keysym == XK_KP_Enter))
241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
242 { 496 {
243 unsigned int l; 497 commit_iso14755 ();
244 const unsigned char *kbuf0; 498 iso14755buf = ISO_14755_51;
245 499# if ISO_14755
246 kbuf0 = (Keysym_map[keysym & 0xFF]); 500 iso14755_51 (0);
247 l = (unsigned int)*kbuf0++;
248
249 /* escape prefix */
250 if (meta
251# ifdef META8_OPTION
252 && meta_char == C0_ESC
253# endif 501# endif
254 ) 502 return;
255 {
256 const unsigned char ch = C0_ESC;
257 tt_write (&ch, 1);
258 } 503 }
259 504 else if (keysym == XK_BackSpace)
260 tt_write (kbuf0, l); 505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
512 else if ((hv = hex_keyval (ev)) >= 0)
513 {
514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
515 | hv | ISO_14755_51;
516# if ISO_14755
517 iso14755_51 (iso14755buf & ISO_14755_MASK);
518# endif
261 return; 519 return;
262 } 520 }
263 else 521 else
264#endif
265 { 522 {
523# if ISO_14755
524 scr_overlay_off ();
525# endif
526 iso14755buf = 0;
527 }
528 }
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
531 if (!(iso14755buf & ISO_14755_STARTED))
532 {
533 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
536 scr_overlay_set (0, 0, "ISO 14755 mode");
537# endif
538 }
539#endif
540
541#ifdef PRINTPIPE
542 if (keysym == XK_Print)
543 {
544 scr_printscreen (ctrl | shft);
545 return;
546 }
547#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
266 newlen = 1; 553 newlen = 1;
267 switch (keysym) 554 switch (keysym)
268 { 555 {
269#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
270 case XK_BackSpace: 557 case XK_BackSpace:
271 if (PrivateModes & PrivMode_HaveBackSpace) 558 if (priv_modes & PrivMode_HaveBackSpace)
272 { 559 {
273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
274 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
275 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
276 } 563 }
277 else 564 else
278 STRCPY (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
279 break; 566 break;
280#endif 567#endif
281#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
282 case XK_Delete: 579 case XK_Delete:
283 STRCPY (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
284 break; 581 break;
285#endif 582#endif
286 case XK_Tab: 583 case XK_Tab:
287 if (shft) 584 if (shft)
288 STRCPY (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
289 else 586 else
290 { 587 {
291#ifdef CTRL_TAB_MAKES_META 588#ifdef CTRL_TAB_MAKES_META
292 if (ctrl) 589 if (ctrl)
293 meta = 1; 590 meta = 1;
… …
299 newlen = 0; 596 newlen = 0;
300 } 597 }
301 break; 598 break;
302 599
303#ifdef XK_KP_Left 600#ifdef XK_KP_Left
304 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
305 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
306 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
307 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
309 { 606 {
310 STRCPY (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
311 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
312 break; 609 break;
313 } 610 }
314 else 611 else
315 /* translate to std. cursor key */ 612 /* translate to std. cursor key */
… …
318#endif 615#endif
319 case XK_Up: /* "\033[A" */ 616 case XK_Up: /* "\033[A" */
320 case XK_Down: /* "\033[B" */ 617 case XK_Down: /* "\033[B" */
321 case XK_Right: /* "\033[C" */ 618 case XK_Right: /* "\033[C" */
322 case XK_Left: /* "\033[D" */ 619 case XK_Left: /* "\033[D" */
323 STRCPY (kbuf, "\033[Z"); 620 strcpy (kbuf, "\033[Z");
324 kbuf[2] = "DACB"[keysym - XK_Left]; 621 kbuf[2] = "DACB"[keysym - XK_Left];
325 /* do Shift first */ 622 /* do Shift first */
326 if (shft) 623 if (shft)
327 kbuf[2] = "dacb"[keysym - XK_Left]; 624 kbuf[2] = "dacb"[keysym - XK_Left];
328 else if (ctrl) 625 else if (ctrl)
329 { 626 {
330 kbuf[1] = 'O'; 627 kbuf[1] = 'O';
331 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
332 } 629 }
333 else if (PrivateModes & PrivMode_aplCUR) 630 else if (priv_modes & PrivMode_aplCUR)
334 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
335 break; 632 break;
336 633
337#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
338# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
339 case XK_KP_Prior: 636 case XK_KP_Prior:
340 /* allow shift to override */ 637 /* allow shift to override */
341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
342 { 639 {
343 STRCPY (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
344 break; 641 break;
345 } 642 }
346 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
347# endif 644# endif
348 case XK_Prior: 645 case XK_Prior:
349 STRCPY (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
350 break; 647 break;
351# ifdef XK_KP_Next 648# ifdef XK_KP_Next
352 case XK_KP_Next: 649 case XK_KP_Next:
353 /* allow shift to override */ 650 /* allow shift to override */
354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
355 { 652 {
356 STRCPY (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
357 break; 654 break;
358 } 655 }
359 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
360# endif 657# endif
361 case XK_Next: 658 case XK_Next:
362 STRCPY (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
363 break; 660 break;
364#endif 661#endif
365 case XK_KP_Enter: 662 case XK_KP_Enter:
366 /* allow shift to override */ 663 /* allow shift to override */
367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
368 { 665 {
369 STRCPY (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
370 } 678 }
371 else 679 else
372 { 680 {
373 kbuf[0] = '\r'; 681 kbuf[0] = '\015';
374 kbuf[1] = '\0'; 682 kbuf[1] = '\0';
375 } 683 }
376 break; 684 break;
377 685
378#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
379 case XK_KP_Begin: 687 case XK_KP_Begin:
380 STRCPY (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
381 break; 689 break;
382 690
383 case XK_KP_Insert:
384 STRCPY (kbuf, "\033Op");
385 break;
386
387 case XK_KP_Delete:
388 STRCPY (kbuf, "\033On");
389 break;
390#endif 691#endif
391 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
392 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
393 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
394 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
395 STRCPY (kbuf, "\033OP"); 696 strcpy (kbuf, "\033OP");
396 kbuf[2] += (keysym - XK_KP_F1); 697 kbuf[2] += (keysym - XK_KP_F1);
397 break; 698 break;
398 699
399 case XK_KP_Multiply: /* "\033Oj" : "*" */ 700 case XK_KP_Multiply: /* "\033Oj" : "*" */
400 case XK_KP_Add: /* "\033Ok" : "+" */ 701 case XK_KP_Add: /* "\033Ok" : "+" */
… …
411 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
412 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
413 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
414 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
415 /* allow shift to override */ 716 /* allow shift to override */
416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
417 { 718 {
418 STRCPY (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
419 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
420 } 721 }
421 else 722 else
422 { 723 {
423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
424 kbuf[1] = '\0'; 725 kbuf[1] = '\0';
425 } 726 }
426 break; 727 break;
427 728
428 case XK_Find: 729 case XK_Find:
429 STRCPY (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
430 break; 731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
431 case XK_Insert: 743 case XK_Insert:
432 STRCPY (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
433 break; 745 break;
434#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
435 case DXK_Remove: 747 case DXK_Remove:
436 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
437#endif 749#endif
438 case XK_Execute: 750 case XK_Execute:
439 STRCPY (kbuf, "\033[3~"); 751 strcpy (kbuf, "\033[3~");
440 break; 752 break;
441 case XK_Select: 753 case XK_Select:
442 STRCPY (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
443 break; 755 break;
444#ifdef XK_KP_End 756#ifdef XK_KP_End
445 case XK_KP_End: 757 case XK_KP_End:
446 /* allow shift to override */ 758 /* allow shift to override */
447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
448 { 760 {
449 STRCPY (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
450 break; 762 break;
451 } 763 }
452 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
453#endif 765#endif
454 case XK_End: 766 case XK_End:
455 STRCPY (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
456 break; 768 break;
457#ifdef XK_KP_Home 769#ifdef XK_KP_Home
458 case XK_KP_Home: 770 case XK_KP_Home:
459 /* allow shift to override */ 771 /* allow shift to override */
460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
461 { 773 {
462 STRCPY (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
463 break; 775 break;
464 } 776 }
465 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
466#endif 778#endif
467 case XK_Home: 779 case XK_Home:
468 STRCPY (kbuf, KS_HOME); 780 strcpy (kbuf, KS_HOME);
469 break; 781 break;
470 782
471#define FKEY(n, fkey) \ 783#define FKEY(n, fkey) \
472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
473 785
… …
525#undef FKEY 837#undef FKEY
526 default: 838 default:
527 newlen = 0; 839 newlen = 0;
528 break; 840 break;
529 } 841 }
842
530 if (newlen) 843 if (newlen)
531 len = STRLEN (kbuf); 844 len = strlen (kbuf);
532 } 845 }
533 846
534 /* 847 /*
535 * Pass meta for all function keys, if 'meta' option set 848 * Pass meta for all function keys, if 'meta' option set
536 */ 849 */
… …
543 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
544 { 857 {
545 len = 1; 858 len = 1;
546 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
547 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
548 else 866 else
549 { 867 {
550#ifdef META8_OPTION 868#ifdef META8_OPTION
551 /* set 8-bit on */ 869 /* set 8-bit on */
552 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
553 { 871 {
554 unsigned char *ch; 872 char *ch;
555 873
556 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
557 *ch |= 0x80; 875 *ch |= 0x80;
558 876
559 meta = 0; 877 meta = 0;
… …
561#endif 879#endif
562 /* nil */ ; 880 /* nil */ ;
563 } 881 }
564 } 882 }
565 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
566 if (len <= 0) 887 if (len <= 0)
567 return; /* not mapped */ 888 return; /* not mapped */
568 889
569 if (Options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
570 if (TermWin.view_start) 891 if (view_start)
571 { 892 {
572 TermWin.view_start = 0; 893 view_start = 0;
573 want_refresh = 1; 894 want_refresh = 1;
574 } 895 }
575 896
576 /* 897 /*
577 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
592#ifdef META8_OPTION 913#ifdef META8_OPTION
593 && meta_char == C0_ESC 914 && meta_char == C0_ESC
594#endif 915#endif
595 ) 916 )
596 { 917 {
597 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
598 tt_write (&ch, 1); 919 tt_write (&ch, 1);
599 } 920 }
600 921
601#if defined(DEBUG_CMD)
602 /* Display keyboard buffer contents */
603 unsigned char *p;
604 int i;
605
606 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
607 for (i = 0, p = kbuf; i < len; i++, p++)
608 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
609 fprintf (stderr, "'\n");
610#endif /* DEBUG_CMD */
611 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
612} 923}
613/*}}} */
614 924
615#if (MENUBAR_MAX) 925void
616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
617/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
618unsigned int 1003unsigned int
619rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
620{ 1005{
621 unsigned int n, s; 1006 unsigned int n, s;
622 1007
623 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
625 1010
626 if (n > 0 && s < count) 1011 if (n > 0 && s < count)
627 { 1012 {
628 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1013 memmove (cmdbuf_base, cmdbuf_ptr,
629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
630 cmdbuf_ptr = cmdbuf_base; 1015 cmdbuf_ptr = cmdbuf_base;
631 cmdbuf_endp -= n; 1016 cmdbuf_endp -= n;
632 s += n; 1017 s += n;
633 } 1018 }
634 1019
635 if (count > s) 1020 if (count > s)
636 { 1021 {
637 rxvt_print_error ("data loss: cmd_write too large"); 1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
638 count = s; 1023 count = s;
639 } 1024 }
640 1025
641 for (; count--;) 1026 for (; count--;)
642 *cmdbuf_endp++ = *str++; 1027 *cmdbuf_endp++ = *str++;
643 1028
644 cmd_parse (); 1029 cmd_parse ();
645 1030
646 return 0; 1031 return 0;
647} 1032}
648#endif /* MENUBAR_MAX */ 1033#endif
649 1034
650void 1035void
651rxvt_term::flush () 1036rxvt_term::flush ()
652{ 1037{
653#ifdef TRANSPARENT 1038 flush_ev.stop ();
654 if (want_full_refresh)
655 {
656 want_full_refresh = 0;
657 scr_clear ();
658 scr_touch (false);
659 want_refresh = 1;
660 }
661#endif
662 1039
663 if (want_refresh) 1040 if (want_refresh)
664 { 1041 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 {
1044 int row = view_start;
1045 int end_row = row + nrow;
1046
1047 while (row > top_row && ROW (row - 1).is_longer ())
1048 --row;
1049
1050 do
1051 {
1052 int start_row = row;
1053 line_t *l;
1054
1055 do
1056 {
1057 l = &ROW (row++);
1058
1059 if (!(l->f & LINE_FILTERED))
1060 {
1061 // line not filtered, mark it as filtered
1062 l->f |= LINE_FILTERED;
1063 while (l->is_longer ())
1064 {
1065 l = &ROW (row++);
1066 l->f |= LINE_FILTERED;
1067 }
1068
1069 // and filter it
1070 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1071
1072 break;
1073 }
1074 }
1075 while (l->is_longer () && row < end_row);
1076 }
1077 while (row < end_row);
1078 }
1079
665 scr_refresh (refresh_type); 1080 scr_refresh ();
666 scrollbar_show (1); 1081 scrollbar_show (1);
667#ifdef USE_XIM 1082#ifdef USE_XIM
668 IMSendSpot (); 1083 IMSendSpot ();
669#endif 1084#endif
670
671 } 1085 }
672 1086
673 display->flush (); 1087 display->flush ();
674} 1088}
675 1089
676void 1090void
677rxvt_term::check_cb (check_watcher &w) 1091rxvt_term::check_cb (check_watcher &w)
678{ 1092{
679 SET_R (this); 1093 make_current ();
680 SET_LOCALE (locale);
681 1094
1095 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099}
1100
1101void
1102rxvt_term::flush_cb (time_watcher &w)
1103{
1104 make_current ();
1105
1106 refresh_count = 0;
682 flush (); 1107 flush ();
683} 1108}
684 1109
685#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
686void 1111void
687rxvt_term::cursor_blink_cb (time_watcher &w) 1112rxvt_term::cursor_blink_cb (time_watcher &w)
688{ 1113{
689 hidden_cursor = !hidden_cursor; 1114 hidden_cursor = !hidden_cursor;
690 want_refresh = 1; 1115 want_refresh = 1;
691 1116
692 w.start (w.at + BLINK_INTERVAL); 1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
693} 1118}
694#endif 1119#endif
695 1120
696#ifdef TEXT_BLINK 1121#ifdef TEXT_BLINK
697void 1122void
… …
704 w.start (w.at + TEXT_BLINK_INTERVAL); 1129 w.start (w.at + TEXT_BLINK_INTERVAL);
705 } 1130 }
706} 1131}
707#endif 1132#endif
708 1133
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void
1136rxvt_term::cont_scroll_cb (time_watcher &w)
1137{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1139 scr_page (scrollbar_isUp() ? UP : DN, 1))
1140 {
1141 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1143 }
1144}
1145#endif
1146
1147#ifdef SELECTION_SCROLLING
1148void
1149rxvt_term::sel_scroll_cb (time_watcher &w)
1150{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1156 }
1157}
1158#endif
1159
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void
1162rxvt_term::slip_wheel_cb (time_watcher &w)
1163{
1164 if (mouse_slip_wheel_speed == 0
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1173 }
1174}
1175#endif
1176
1177#if LINUX_YIELD_HACK
1178static struct event_handler
1179{
1180 check_watcher yield_ev;
1181
1182 void yield_cb (check_watcher &w)
1183 {
1184 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS.
1188
1189 struct timespec ts = { 0, 0 };
1190 nanosleep (&ts, 0);
1191
1192 w.stop ();
1193 }
1194
1195 event_handler ()
1196 : yield_ev (this, &event_handler::yield_cb)
1197 {
1198 }
1199} event_handler;
1200#endif
1201
709bool 1202bool
710rxvt_term::pty_fill () 1203rxvt_term::pty_fill ()
711{ 1204{
712 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1206
1207 if (CBUFSIZ == n)
1208 {
1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1210 n = 0;
1211 }
713 1212
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 1214 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 1215 cmdbuf_endp = cmdbuf_ptr + n;
717 1216
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
719 1218
720 if (n > 0) 1219 if (r > 0)
721 { 1220 {
722 cmdbuf_endp += n; 1221 cmdbuf_endp += r;
723 return true; 1222 return true;
724 } 1223 }
725 else if (n < 0 && errno != EAGAIN) 1224 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1225 {
1226#if LINUX_YIELD_HACK
1227 if (display->is_local)
1228 event_handler.yield_ev.start ();
1229#endif
1230 }
1231 else
1232 {
1233 pty_ev.stop ();
1234
1235 if (!option (Opt_hold))
726 destroy (); 1236 destroy ();
727 1237 }
1238
728 return false; 1239 return false;
729} 1240}
730 1241
731void 1242void
732rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
733{ 1244{
734 SET_R (this); 1245 make_current ();
735 SET_LOCALE (locale); 1246
1247 if (revents & EVENT_READ)
1248 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ())
1250 if (cmd_parse ())
1251 break;
736 1252
737 if (revents & EVENT_WRITE) 1253 if (revents & EVENT_WRITE)
738 tt_write (0, 0); 1254 pty_write ();
739 else if (revents & EVENT_READ)
740 {
741 bool flag = true;
742
743 // loop, but don't allow a single term to monopolize us
744 // the number of loops is fully arbitrary, and thus wrong
745 while (flag && pty_fill ())
746 {
747 if (!seen_input)
748 {
749 seen_input = 1;
750 /* once we know the shell is running, send the screen size. Again! */
751 tt_winch ();
752 }
753
754 if (cmd_parse ())
755 break;
756 }
757 }
758} 1255}
759 1256
760bool 1257void
761rxvt_term::cmd_parse () 1258rxvt_term::pointer_unblank ()
762{ 1259{
763 bool flag = false; 1260 XDefineCursor (dpy, vt, TermWin_cursor);
764 unicode_t ch = NOCHAR; 1261 recolour_cursor ();
765 1262
766 for (;;) 1263#ifdef POINTER_BLANK
767 { 1264 hidden_pointer = 0;
768 if (ch == NOCHAR)
769 ch = next_char ();
770 1265
771 if (ch == NOCHAR) // TODO: improve 1266 if (option (Opt_pointerBlank))
772 break; 1267 pointer_ev.start (NOW + pointerBlankDelay);
773 1268#endif
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 unicode_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 unicode_t *str = buf;
781
782 *str++ = ch;
783
784 for (;;)
785 {
786 ch = next_char ();
787
788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
789 break;
790 else
791 {
792 *str++ = ch;
793
794 if (ch == '\n')
795 {
796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
801 {
802 refreshnow = true;
803 flag = false;
804 ch = NOCHAR;
805 break;
806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
814 }
815 }
816
817 if (str >= buf + BUFSIZ)
818 {
819 ch = NOCHAR;
820 break;
821 }
822 }
823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
861 }
862
863 return flag;
864}
865
866// read the next character, currently handles UTF-8
867// will probably handle all sorts of other stuff in the future
868unicode_t
869rxvt_term::next_char ()
870{
871 while (cmdbuf_ptr < cmdbuf_endp)
872 {
873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
876 return *cmdbuf_ptr++;
877
878 wchar_t wc;
879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
880
881 if (len == (size_t)-2)
882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
887
888 if (len == (size_t)-1)
889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
890
891 // assume wchar == unicode
892 cmdbuf_ptr += len;
893 return wc;
894 }
895
896 return NOCHAR;
897}
898
899/* rxvt_cmd_getc () - Return next input character */
900/*
901 * Return the next input character after first passing any keyboard input
902 * to the command.
903 */
904unicode_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 unicode_t c = next_char ();
910 if (c != NOCHAR)
911 return c;
912
913 // incomplete sequences should occur rarely, still, a better solution
914 // would be preferred. either setjmp/longjmp or better design.
915 fcntl (cmd_fd, F_SETFL, 0);
916 pty_fill ();
917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
918 }
919} 1269}
920 1270
921#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
922void 1272void
923rxvt_term::pointer_unblank ()
924{
925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
926 recolour_cursor ();
927
928 hidden_pointer = 0;
929
930 if (Options & Opt_pointerBlank)
931 pointer_ev.start (NOW + pointerBlankDelay);
932}
933
934void
935rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
936{ 1274{
937 if (! (Options & Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
938 return; 1276 return;
939 1277
940 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
941 XFlush (display->display); 1279 XFlush (dpy);
942 1280
943 hidden_pointer = 1; 1281 hidden_pointer = 1;
944} 1282}
945 1283
946void 1284void
947rxvt_term::pointer_cb (time_watcher &w) 1285rxvt_term::pointer_cb (time_watcher &w)
948{ 1286{
949 SET_R (this); 1287 make_current ();
950 SET_LOCALE (locale);
951 1288
952 pointer_blank (); 1289 pointer_blank ();
953} 1290}
954#endif 1291#endif
955 1292
… …
962 x = ev.x; 1299 x = ev.x;
963 y = ev.y; 1300 y = ev.y;
964 pixel_position (&x, &y); 1301 pixel_position (&x, &y);
965 1302
966 if (MEvent.button == AnyButton) 1303 if (MEvent.button == AnyButton)
967 {
968 button_number = 3; 1304 button_number = 3;
969 }
970 else 1305 else
971 { 1306 {
972 button_number = MEvent.button - Button1; 1307 button_number = MEvent.button - Button1;
973 /* add 0x3D for wheel events, like xterm does */ 1308 /* add 0x3D for wheel events, like xterm does */
974 if (button_number >= 3) 1309 if (button_number >= 3)
975 button_number += (64 - 3); 1310 button_number += (64 - 3);
976 } 1311 }
977 1312
978 if (PrivateModes & PrivMode_MouseX10) 1313 if (priv_modes & PrivMode_MouseX10)
979 { 1314 {
980 /* 1315 /*
981 * do not report ButtonRelease 1316 * do not report ButtonRelease
982 * no state info allowed 1317 * no state info allowed
983 */ 1318 */
… …
998 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
999 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
1000#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
1001 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1002#endif 1337#endif
1003
1004 } 1338 }
1005 1339
1006#ifdef DEBUG_MOUSEREPORT 1340#if DEBUG_MOUSEREPORT
1007 fprintf (stderr, "Mouse ["); 1341 fprintf (stderr, "Mouse [");
1008 if (key_state & 16) 1342 if (key_state & 16)
1009 fputc ('C', stderr); 1343 fputc ('C', stderr);
1010 if (key_state & 4) 1344 if (key_state & 4)
1011 fputc ('S', stderr); 1345 fputc ('S', stderr);
… …
1015 fputc ('2', stderr); 1349 fputc ('2', stderr);
1016 fprintf (stderr, "]: <%d>, %d/%d\n", 1350 fprintf (stderr, "]: <%d>, %d/%d\n",
1017 button_number, 1351 button_number,
1018 x + 1, 1352 x + 1,
1019 y + 1); 1353 y + 1);
1020#else 1354#endif
1355
1021 tt_printf ("\033[M%c%c%c", 1356 tt_printf ("\033[M%c%c%c",
1022 (32 + button_number + key_state), 1357 (32 + button_number + key_state),
1023 (32 + x + 1), 1358 (32 + x + 1),
1024 (32 + y + 1)); 1359 (32 + y + 1));
1025#endif
1026} 1360}
1027
1028#ifdef USING_W11LIB
1029void
1030rxvt_W11_process_x_event (XEvent *ev)
1031{
1032 rxvt_t *r = rxvt_get_r ();
1033
1034 x_cb (*ev);
1035}
1036#endif
1037 1361
1038/*{{{ process an X event */ 1362/*{{{ process an X event */
1039void 1363void
1040rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
1041{ 1365{
1042 SET_R (this); 1366 make_current ();
1043 SET_LOCALE (locale);
1044 1367
1045#if defined(CURSOR_BLINK) 1368 dLocal (Display *, dpy);
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1047 {
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053 1369
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1370 if (ev.xany.window == vt
1055 } 1371 && SHOULD_INVOKE (HOOK_X_EVENT)
1056#endif 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1057
1058#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1060 {
1061 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease)
1064 if (hidden_pointer)
1065 pointer_unblank ();
1066
1067 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank ();
1069 }
1070#endif
1071
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return; 1373 return;
1075#endif
1076 1374
1375 // for XQueryPointer
1077 Window unused_root, unused_child; 1376 Window unused_root, unused_child;
1078 int unused_root_x, unused_root_y; 1377 int unused_root_x, unused_root_y;
1079 unsigned int unused_mask; 1378 unsigned int unused_mask;
1080
1081#ifdef DEBUG_X
1082 const char *const eventnames[] =
1083 { /* mason - this matches my system */
1084 "",
1085 "",
1086 "KeyPress",
1087 "KeyRelease",
1088 "ButtonPress",
1089 "ButtonRelease",
1090 "MotionNotify",
1091 "EnterNotify",
1092 "LeaveNotify",
1093 "FocusIn",
1094 "FocusOut",
1095 "KeymapNotify",
1096 "Expose",
1097 "GraphicsExpose",
1098 "NoExpose",
1099 "VisibilityNotify",
1100 "CreateNotify",
1101 "DestroyNotify",
1102 "UnmapNotify",
1103 "MapNotify",
1104 "MapRequest",
1105 "ReparentNotify",
1106 "ConfigureNotify",
1107 "ConfigureRequest",
1108 "GravityNotify",
1109 "ResizeRequest",
1110 "CirculateNotify",
1111 "CirculateRequest",
1112 "PropertyNotify",
1113 "SelectionClear",
1114 "SelectionRequest",
1115 "SelectionNotify",
1116 "ColormapNotify",
1117 "ClientMessage",
1118 "MappingNotify"
1119 };
1120#endif
1121
1122#ifdef DEBUG_X
1123 struct timeval tp;
1124 struct tm *ltt;
1125 (void)gettimeofday (&tp, NULL);
1126 ltt = localtime (& (tp.tv_sec));
1127 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1128#endif
1129 1379
1130 switch (ev.type) 1380 switch (ev.type)
1131 { 1381 {
1132 case KeyPress: 1382 case KeyPress:
1133 lookup_key (ev.xkey); 1383 key_press (ev.xkey);
1134 break; 1384 break;
1135 1385
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease: 1386 case KeyRelease:
1138 { 1387 key_release (ev.xkey);
1139 if (! (ev.xkey.state & ControlMask))
1140 mouse_slip_wheel_speed = 0;
1141 else
1142 {
1143 KeySym ks;
1144
1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1146 if (ks == XK_Control_L || ks == XK_Control_R)
1147 mouse_slip_wheel_speed = 0;
1148 }
1149 break; 1388 break;
1150 }
1151#endif
1152 1389
1153 case ButtonPress: 1390 case ButtonPress:
1154 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1155 break; 1392 break;
1156 1393
… …
1158 button_release (ev.xbutton); 1395 button_release (ev.xbutton);
1159 break; 1396 break;
1160 1397
1161 case ClientMessage: 1398 case ClientMessage:
1162 if (ev.xclient.format == 32 1399 if (ev.xclient.format == 32
1163 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1400 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1164 destroy ();
1165#ifdef OFFIX_DND
1166 /* OffiX Dnd (drag 'n' drop) protocol */
1167 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1168 && (ev.xclient.data.l[0] == DndFile
1169 || ev.xclient.data.l[0] == DndDir
1170 || ev.xclient.data.l[0] == DndLink))
1171 { 1401 {
1172 /* Get Dnd data */ 1402 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1173 Atom ActualType; 1403 {
1174 int ActualFormat; 1404 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1175 unsigned char *data; 1405 {
1176 unsigned long Size, RemainingBytes; 1406 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1177 1407 {
1178 XGetWindowProperty (display->display, display->root, 1408 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1179 xa[XA_DNDSELECTION], 1409 destroy ();
1180 0L, 1000000L, 1410 }
1181 False, AnyPropertyType, 1411#if ENABLE_EWMH
1182 &ActualType, &ActualFormat, 1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1183 &Size, &RemainingBytes, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1184 &data); 1415 &ev);
1185 XChangeProperty (display->display, display->root, 1416#endif
1186 XA_CUT_BUFFER0, XA_STRING, 1417 }
1187 8, PropModeReplace, 1418 }
1188 data, STRLEN (data)); 1419#if ENABLE_XEMBED
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1420 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1421 {
1422 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1423 focus_in ();
1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1425 focus_out ();
1426 }
1427#endif
1191 } 1428 }
1192#endif /* OFFIX_DND */
1193 break;
1194
1195 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping));
1197 break; 1429 break;
1198 1430
1199 /* 1431 /*
1200 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1220 break; 1452 break;
1221 } 1453 }
1222 break; 1454 break;
1223 1455
1224 case FocusIn: 1456 case FocusIn:
1225 if (!TermWin.focus) 1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1460 focus_in ();
1461 break;
1462
1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1467 focus_out ();
1468 break;
1469
1470 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0])
1226 { 1475 {
1227 TermWin.focus = 1; 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1228 want_refresh = 1;
1229#ifdef USE_XIM
1230 if (Input_Context != NULL)
1231 XSetICFocus (Input_Context);
1232#endif
1233#ifdef CURSOR_BLINK
1234 if (Options & Opt_cursorBlink)
1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1236#endif
1237
1238 } 1477 ;
1239 break;
1240 1478
1241 case FocusOut: 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1242 if (TermWin.focus)
1243 { 1480 {
1244 TermWin.focus = 0; 1481 seen_resize = 1;
1245 want_refresh = 1; 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1246#ifdef USE_XIM
1247 if (Input_Context != NULL)
1248 XUnsetICFocus (Input_Context);
1249#endif
1250#ifdef CURSOR_BLINK
1251 if (Options & Opt_cursorBlink)
1252 cursor_blink_ev.stop ();
1253 hidden_cursor = 0;
1254#endif
1255
1256 }
1257 break;
1258
1259 case ConfigureNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0])
1261 {
1262 int height, width;
1263
1264 do
1265 { /* Wrap lots of configures into one */
1266 width = ev.xconfigure.width;
1267 height = ev.xconfigure.height;
1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1269 } 1483 }
1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271
1272 if (szHint.width != width || szHint.height != height)
1273 {
1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1275 resize_all_windows (width, height, 1);
1276 }
1277#ifdef DEBUG_SIZE
1278 else 1484 else
1279 { 1485 {
1280 D_SIZE ((stderr, "Size: Not resizing")); 1486#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1489#endif
1281 } 1490 }
1282#endif 1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1284 if (Options & Opt_transparent)
1285 {
1286 check_our_parents ();
1287 if (am_transparent)
1288 want_full_refresh = 1;
1289 }
1290#endif
1291
1292 } 1492 }
1293 break; 1493 break;
1294 1494
1495 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500
1501 break;
1502
1295 case SelectionClear: 1503 case SelectionClear:
1296 display->set_selection_owner (0); 1504 selection_clear ();
1297 break; 1505 break;
1298 1506
1299 case SelectionNotify: 1507 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1508 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1510 break;
1304 1511
1305 case SelectionRequest: 1512 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1307 break; 1514 break;
1308 1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1309 case UnmapNotify: 1524 case UnmapNotify:
1310 TermWin.mapped = 0; 1525 mapped = 0;
1311#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1312 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1313#endif 1528#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1314 break; 1530 break;
1315
1316 case MapNotify:
1317 TermWin.mapped = 1;
1318#ifdef TEXT_BLINK
1319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1320#endif
1321 break;
1322
1323#ifdef TRANSPARENT
1324 case ReparentNotify:
1325 rootwin_cb (ev);
1326 break;
1327#endif /* TRANSPARENT */
1328 1531
1329 case GraphicsExpose: 1532 case GraphicsExpose:
1330 case Expose: 1533 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1534 if (ev.xany.window == vt)
1332 { 1535 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1536 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1337 // don't understand this, so commented it out 1540
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1546
1341 // ev.xexpose.width, TermWin.height, False);
1342#endif
1343 want_refresh = 1; 1547 want_refresh = 1;
1344 } 1548 }
1345 else 1549 else
1346 { 1550 {
1347 XEvent unused_event; 1551 XEvent unused_event;
1348 1552
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1350 Expose, 1554 ;
1351 &unused_event)) ; 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1556 ;
1353 GraphicsExpose, 1557
1354 &unused_event)) ;
1355 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1356 { 1559 {
1357 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1358 scrollbar_show (0); 1561 scrollbar_show (0);
1359 } 1562 }
1360#ifdef MENUBAR
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1362 menubar_expose ();
1363#endif
1364 } 1563 }
1365 break; 1564 break;
1366 1565
1367 case MotionNotify: 1566 case MotionNotify:
1368#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
1369 if (hidden_pointer) 1568 if (hidden_pointer)
1370 pointer_unblank (); 1569 pointer_unblank ();
1371#endif 1570#endif
1372#if MENUBAR 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1373 if (isMenuBarWindow (ev.xany.window)) 1572 break;
1573
1574 if (ev.xany.window == vt)
1374 { 1575 {
1375 menubar_control (ev.xbutton); 1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1376 break; 1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1377 } 1578 ; // nop
1378#endif
1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1380 break;
1381
1382 if (ev.xany.window == TermWin.vt)
1383 {
1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1580 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1387 ; 1582 ;
1388 1583
1389 XQueryPointer (display->display, TermWin.vt, 1584 XQueryPointer (dpy, vt,
1390 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1587 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1588 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1590 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1591 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1592 {
1398#endif 1593#endif
1594#if ISO_14755
1595 // 5.4
1596 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1597 {
1598 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1599 break;
1600 }
1601#endif
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1602 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1603 ev.xbutton.state & Button3Mask ? 2 : 0);
1604
1401#ifdef SELECTION_SCROLLING 1605#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1606 if (ev.xbutton.y < int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1607 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1404 { 1608 {
1405 int dist; 1609 int dist;
1406
1407 pending_scroll_selection=1;
1408 1610
1409 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
1411 */ 1613 */
1412 if (scroll_selection_delay<=0) 1614 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1616
1415 /* save the event params so we can highlight 1617 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1618 * the selection in the pending-scroll loop
1417 */ 1619 */
1418 selection_save_x=ev.xbutton.x; 1620 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1621 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1622 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1623
1423 /* calc number of lines to scroll */ 1624 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1625 if (ev.xbutton.y < int_bwidth)
1425 { 1626 {
1426 scroll_selection_dir = UP; 1627 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1628 dist = int_bwidth - ev.xbutton.y;
1428 } 1629 }
1429 else 1630 else
1430 { 1631 {
1431 scroll_selection_dir = DN; 1632 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y - 1633 dist = ev.xbutton.y - (int_bwidth + height);
1433 (TermWin.int_bwidth + TermWin.height);
1434 } 1634 }
1635
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1636 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1637 / SELECTION_SCROLL_LINE_SPEEDUP
1638 + 1;
1437 MIN_IT (scroll_selection_lines, 1639 min_it (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1640 SELECTION_SCROLL_MAX_LINES);
1439 } 1641 }
1440 else 1642 else
1441 { 1643 {
1442 /* we are within the text window, so we 1644 /* we are within the text window, so we
1443 * shouldn't be scrolling 1645 * shouldn't be scrolling
1444 */ 1646 */
1445 pending_scroll_selection = 0; 1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop();
1446 } 1649 }
1447#endif 1650#endif
1448#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1449
1450 } 1652 }
1451#endif 1653#endif
1452
1453 } 1654 }
1454 } 1655 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1657 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1458 MotionNotify, &ev)) ; 1659 MotionNotify, &ev))
1660 ;
1661
1459 XQueryPointer (display->display, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1460 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1665 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1666 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1668 scrollbar_size ());
1466 scr_refresh (refresh_type);
1467 refresh_limit = 0; 1669 want_refresh = 1;
1468 scrollbar_show (1); 1670 scrollbar_show (1);
1469 } 1671 }
1470 break; 1672 break;
1471 } 1673 }
1472}
1473 1674
1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1701}
1702
1703void
1704rxvt_term::focus_in ()
1705{
1706 if (!focus)
1707 {
1708 focus = 1;
1709 want_refresh = 1;
1710
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM
1714 if (Input_Context != NULL)
1715 {
1716 IMSetPosition ();
1717 XSetICFocus (Input_Context);
1718 }
1719#endif
1720#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1723#endif
1724#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade])
1726 {
1727 pix_colors = pix_colors_focused;
1728 scr_recolour ();
1729 }
1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1735 {
1736 h->flags &= ~XUrgencyHint;
1737 XSetWMHints (dpy, parent[0], h);
1738 }
1739 }
1740#endif
1741 }
1742}
1743
1744void
1745rxvt_term::focus_out ()
1746{
1747 if (focus)
1748 {
1749 focus = 0;
1750 want_refresh = 1;
1751
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1753
1754#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf)
1756 {
1757 iso14755buf = 0;
1758# if ISO_14755
1759 scr_overlay_off ();
1760# endif
1761 }
1762#endif
1763#if USE_XIM
1764 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context);
1766#endif
1767#if CURSOR_BLINK
1768 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop ();
1770 hidden_cursor = 0;
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_unfocused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL
1474void 1796void
1475rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1798{
1477 SET_R (this); 1799 make_current ();
1478 SET_LOCALE (locale);
1479 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if ENABLE_TRANSPARENCY
1480 switch (ev.type) 1806 switch (ev.type)
1481 { 1807 {
1482 case PropertyNotify: 1808 case PropertyNotify:
1809 /*
1810 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on.
1812 */
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1484 { 1815 {
1485 if (ev.xproperty.state == PropertyNewValue) 1816 bgPixmap.set_root_pixmap ();
1486 selection_property (ev.xproperty.window, ev.xproperty.atom); 1817 update_background ();
1487 break;
1488 } 1818 }
1489#ifdef TRANSPARENT
1490 else
1491 {
1492 /*
1493 * if user used some Esetroot compatible prog to set the root bg,
1494 * use the property to determine the pixmap. We use it later on.
1495 */
1496 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498
1499 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1500 return;
1501 }
1502
1503 /* FALLTHROUGH */
1504 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ())
1506 if (am_transparent)
1507 want_full_refresh = 1;
1508 break; 1819 break;
1820 }
1509#endif 1821# endif
1510 }
1511} 1822}
1823#endif
1512 1824
1513void 1825void
1514rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
1515{ 1827{
1516 int reportmode = 0, clickintime; 1828 int reportmode = 0, clickintime;
1517 1829
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1830 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1831
1519 if (!bypass_keystate) 1832 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1833 reportmode = !! (priv_modes & PrivMode_mouse_report);
1834
1521 /* 1835 /*
1522 * VT window processing of button press 1836 * VT window processing of button press
1523 */ 1837 */
1524 if (ev.window == TermWin.vt) 1838 if (ev.window == vt)
1525 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1843#if ISO_14755
1844 // 5.4
1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1846 {
1847 iso14755_54 (ev.x, ev.y);
1848 return;
1849 }
1850#endif
1851
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1852 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1853
1527 if (reportmode) 1854 if (reportmode)
1528 { 1855 {
1529 /* mouse report from vt window */ 1856 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1857 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1858 MEvent.state = ev.state;
1532#ifdef MOUSE_REPORT_DOUBLECLICK 1859#ifdef MOUSE_REPORT_DOUBLECLICK
1533 if (ev.button == MEvent.button && clickintime) 1860 if (ev.button == MEvent.button && clickintime)
1534 { 1861 {
1535 /* same button, within alloted time */ 1862 /* same button, within alloted time */
1536 MEvent.clicks++; 1863 MEvent.clicks++;
1864
1537 if (MEvent.clicks > 1) 1865 if (MEvent.clicks > 1)
1538 { 1866 {
1539 /* only report double clicks */ 1867 /* only report double clicks */
1540 MEvent.clicks = 2; 1868 MEvent.clicks = 2;
1541 mouse_report (ev); 1869 mouse_report (ev);
… …
1560 } 1888 }
1561 else 1889 else
1562 { 1890 {
1563 if (ev.button != MEvent.button) 1891 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1892 MEvent.clicks = 0;
1893
1565 switch (ev.button) 1894 switch (ev.button)
1566 { 1895 {
1567 case Button1: 1896 case Button1:
1897 /* allow meta + click to select rectangular areas */
1898 /* should be done in screen.C */
1899#if ENABLE_FRILLS
1900 selection.rect = !!(ev.state & ModMetaMask);
1901#else
1902 selection.rect = false;
1903#endif
1904
1568 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1570 { 1907 {
1571 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1573 else 1910 else
1574 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
… …
1589 case Button3: 1926 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1927 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1592 else 1929 else
1593 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1931
1594 MEvent.button = Button3; 1932 MEvent.button = Button3;
1595 break; 1933 break;
1596 } 1934 }
1597 } 1935 }
1936
1598 MEvent.time = ev.time; 1937 MEvent.time = ev.time;
1599 return; 1938 return;
1600 } 1939 }
1601 1940
1602 /* 1941 /*
… …
1668 upordown = 1; /* down */ 2007 upordown = 1; /* down */
1669 } 2008 }
1670 if (upordown) 2009 if (upordown)
1671 { 2010 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 2013#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 2014 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 2015 {
1677 if (upordown < 0) 2016 if (upordown < 0)
1678 scrollBar.setUp (); 2017 scrollBar.setUp ();
… …
1694 break; 2033 break;
1695 case R_SB_ALIGN_BOTTOM: 2034 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 2035 csrO = scrollBar.bot - scrollBar.top;
1697 break; 2036 break;
1698 } 2037 }
2038
1699 if (scrollBar.style == R_SB_XTERM 2039 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 2040 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 2041 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 2043
1704 scrollBar.setMotion (); 2044 scrollBar.setMotion ();
1705 break; 2045 break;
1706 2046
1707 case Button1: 2047 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2048 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1712 case Button3: 2052 case Button3:
1713 if (scrollBar.style != R_SB_XTERM) 2053 if (scrollBar.style != R_SB_XTERM)
1714 { 2054 {
1715 if (scrollbar_above_slider (ev.y)) 2055 if (scrollbar_above_slider (ev.y))
1716# ifdef RXVT_SCROLL_FULL 2056# ifdef RXVT_SCROLL_FULL
1717 scr_page (UP, TermWin.nrow - 1); 2057 scr_page (UP, nrow - 1);
1718# else 2058# else
1719 scr_page (UP, TermWin.nrow / 4); 2059 scr_page (UP, nrow / 4);
1720# endif 2060# endif
1721 else if (scrollbar_below_slider (ev.y)) 2061 else if (scrollbar_below_slider (ev.y))
1722# ifdef RXVT_SCROLL_FULL 2062# ifdef RXVT_SCROLL_FULL
1723 scr_page (DN, TermWin.nrow - 1); 2063 scr_page (DN, nrow - 1);
1724# else 2064# else
1725 scr_page (DN, TermWin.nrow / 4); 2065 scr_page (DN, nrow / 4);
1726# endif 2066# endif
1727 else 2067 else
1728 scrollBar.setMotion (); 2068 scrollBar.setMotion ();
1729 } 2069 }
1730 else 2070 else
1731 { 2071 {
1732 scr_page ((ev.button == Button1 ? DN : UP), 2072 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 2073 (nrow
1734 * scrollbar_position (ev.y) 2074 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 2075 / scrollbar_size ()));
1736 } 2076 }
2077
1737 break; 2078 break;
1738 } 2079 }
1739 } 2080 }
2081
1740 return; 2082 return;
1741 } 2083 }
1742#if MENUBAR
1743 /*
1744 * Menubar window processing of button press
1745 */
1746 if (isMenuBarWindow (ev.window))
1747 menubar_control (ev);
1748#endif
1749} 2084}
1750 2085
1751void 2086void
1752rxvt_term::button_release (XButtonEvent &ev) 2087rxvt_term::button_release (XButtonEvent &ev)
1753{ 2088{
1754 int reportmode = 0; 2089 int reportmode = 0;
1755 2090
1756 csrO = 0; /* reset csr Offset */ 2091 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 2092 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2093 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 2094
1760 if (scrollbar_isUpDn ()) 2095 if (scrollbar_isUpDn ())
1761 { 2096 {
1762 scrollBar.setIdle (); 2097 scrollBar.setIdle ();
1763 scrollbar_show (0); 2098 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH;
1766#endif
1767
1768 } 2099 }
2100
1769#ifdef SELECTION_SCROLLING 2101#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop();
1771#endif 2104#endif
2105
1772 if (ev.window == TermWin.vt) 2106 if (ev.window == vt)
1773 { 2107 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2109 return;
2110
2111#if ISO_14755
2112 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return;
2115#endif
2116
1774 if (reportmode) 2117 if (reportmode)
1775 { 2118 {
1776 /* mouse report from vt window */ 2119 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 2120 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 2121 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 2135 MEvent.button = AnyButton;
1793 mouse_report (ev); 2136 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 2137#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 2138 return;
1796 } 2139 }
2140
1797 /* 2141 /*
1798 * dumb hack to compensate for the failure of click-and-drag 2142 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 2143 * when overriding mouse reporting
1800 */ 2144 */
1801 if (PrivateModes & PrivMode_mouse_report 2145 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2146 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2147 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2148 selection_extend (ev.x, ev.y, 0);
1805 2149
1806 switch (ev.button) 2150 switch (ev.button)
1807 { 2151 {
1808 case Button1: 2152 case Button1:
1809 case Button3: 2153 case Button3:
1810 selection_make (ev.time); 2154 selection_make (ev.time);
1811 break; 2155 break;
2156
1812 case Button2: 2157 case Button2:
1813 selection_request (ev.time, ev.x, ev.y); 2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1814 break; 2160 break;
2161
1815#ifdef MOUSE_WHEEL 2162#ifdef MOUSE_WHEEL
1816 case Button4: 2163 case Button4:
1817 case Button5: 2164 case Button5:
1818 { 2165 {
1819 int i; 2166 int i;
1820 page_dirn v; 2167 page_dirn v;
1821 2168
1822 v = (ev.button == Button4) ? UP : DN; 2169 v = ev.button == Button4 ? UP : DN;
2170
1823 if (ev.state & ShiftMask) 2171 if (ev.state & ShiftMask)
1824 i = 1; 2172 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2173 else if (option (Opt_mouseWheelScrollPage))
1826 i = TermWin.nrow - 1; 2174 i = nrow - 1;
1827 else 2175 else
1828 i = 5; 2176 i = 5;
2177
1829# ifdef MOUSE_SLIP_WHEELING 2178# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2179 if (ev.state & ControlMask)
1831 { 2180 {
1832 mouse_slip_wheel_speed += (v ? -1 : 1); 2181 mouse_slip_wheel_speed += v ? -1 : 1;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184
2185 if (slip_wheel_ev.at < NOW)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2187
2188 slip_wheel_ev.start ();
2189 }
2190 else
2191 {
2192# endif
2193 scr_page (v, i);
2194 scrollbar_show (1);
2195# ifdef MOUSE_SLIP_WHEELING
1834 } 2196 }
1835# endif 2197# endif
1836# ifdef JUMP_MOUSE_WHEEL
1837 scr_page (v, i);
1838 scr_refresh (SMOOTH_REFRESH);
1839 scrollbar_show (1);
1840# else
1841 while (i--)
1842 {
1843 scr_page (v, 1);
1844 scr_refresh (SMOOTH_REFRESH);
1845 scrollbar_show (1);
1846 }
1847# endif
1848
1849 } 2198 }
1850 break; 2199 break;
1851#endif 2200#endif
1852
1853 }
1854 }
1855#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev);
1858#endif
1859}
1860
1861
1862#ifdef TRANSPARENT
1863/*
1864 * Check our parents are still who we think they are.
1865 * Do transparency updates if required
1866 */
1867int
1868rxvt_term::check_our_parents ()
1869{
1870 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after;
1872 Atom atype;
1873 unsigned char *prop = NULL;
1874 Window root, oldp, *list;
1875 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr;
1877
1878 pchanged = 0;
1879
1880 if (! (Options & Opt_transparent))
1881 return pchanged; /* Don't try any more */
1882
1883 XGetWindowAttributes (display->display, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth;
1885
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1887 if (rootdepth != wattr.depth)
1888 {
1889 if (am_transparent)
1890 { 2201 }
1891 pchanged = 1; 2202 }
1892 XSetWindowBackground (display->display, TermWin.vt, 2203}
1893 PixColors[Color_bg]); 2204
1894 am_transparent = am_pixmap_trans = 0; 2205/*}}} */
2206
2207bool
2208rxvt_term::cmd_parse ()
2209{
2210 bool flag = false;
2211 wchar_t ch = NOCHAR;
2212 char *seq_begin; // remember start of esc-sequence here
2213
2214 for (;;)
2215 {
2216 if (ch == NOCHAR)
1895 } 2217 {
1896 return pchanged; /* Don't try any more */ 2218 seq_begin = cmdbuf_ptr;
1897 } 2219 ch = next_char ();
1898 2220
1899 /* Get all X ops out of the queue so that our information is up-to-date. */ 2221 if (ch == NOCHAR)
1900 XSync (display->display, False); 2222 break;
1901
1902 /*
1903 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame
1905 * windows for each client, so we have to take care about that.
1906 */
1907 i = (xa[XA_XROOTPMAPID] != 0
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success));
1911 if (!i || prop == NULL)
1912 have_pixmap = 0;
1913 else
1914 {
1915 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop);
1917 XFree (prop);
1918 }
1919 if (have_pixmap)
1920 {
1921 /*
1922 * Copy display->root pixmap transparency
1923 */
1924 int sx, sy, nx, ny;
1925 unsigned int nw, nh;
1926 Window cr;
1927 XImage *image;
1928 GC gc;
1929 XGCValues gcvalue;
1930
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1932 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height;
1935 nx = ny = 0;
1936
1937 if (sx < 0)
1938 { 2223 }
1939 nw += sx; 2224
1940 nx = -sx; 2225 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
1941 sx = 0;
1942 } 2226 {
1943 2227 if (!seen_input)
1944 if (sy < 0)
1945 {
1946 nh += sy;
1947 ny = -sy;
1948 sy = 0;
1949 }
1950
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1953 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1955 ZPixmap);
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */
1958 allowedxerror = 0;
1959 if (image == NULL)
1960 {
1961 if (am_transparent && am_pixmap_trans)
1962 { 2228 {
1963 pchanged = 1; 2229 seen_input = 1;
1964 if (TermWin.pixmap != None) 2230 // many badly-written programs (e.g. jed) contain a race condition:
2231 // they first read the screensize and then install a SIGWINCH handler.
2232 // some window managers resize the window early, and these programs
2233 // then sometimes get the size wrong.
2234 // unfortunately other programs are even more buggy and dislike
2235 // being sent SIGWINCH, so only do it when we were in fact being
2236 // resized.
2237 if (seen_resize && cmd_pid)
2238 kill (-cmd_pid, SIGWINCH);
2239 }
2240
2241 /* Read a text string from the input buffer */
2242 wchar_t buf[UBUFSIZ];
2243 bool refreshnow = false;
2244 int nlines = 0;
2245 wchar_t *str = buf;
2246 wchar_t *eol = str + min (ncol, UBUFSIZ);
2247
2248 for (;;)
2249 {
2250 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2251 break;
2252
2253 *str++ = ch;
2254
2255 if (ch == C0_LF || str >= eol)
1965 { 2256 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2257 if (ch == C0_LF)
1967 TermWin.pixmap = None; 2258 nlines++;
2259
2260 refresh_count++;
2261
2262 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2263 {
2264 refresh_count = 0;
2265
2266 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2267 {
2268 refreshnow = true;
2269 ch = NOCHAR;
2270 break;
2271 }
2272 }
2273
2274 // scr_add_lines only works for nlines <= nrow - 1.
2275 if (nlines >= nrow - 1)
2276 {
2277 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2278 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2279 scr_add_lines (buf, str - buf, nlines);
2280
2281 nlines = 0;
2282 str = buf;
2283 eol = str + min (ncol, UBUFSIZ);
2284 }
2285
2286 if (str >= eol)
2287 {
2288 if (eol >= buf + UBUFSIZ)
2289 {
2290 ch = NOCHAR;
2291 break;
2292 }
2293 else
2294 eol = min (eol + ncol, buf + UBUFSIZ);
2295 }
2296
1968 } 2297 }
2298
2299 seq_begin = cmdbuf_ptr;
2300 ch = next_char ();
1969 } 2301 }
1970 am_pixmap_trans = 0; 2302
2303 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2304 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2305 scr_add_lines (buf, str - buf, nlines);
2306
2307 /*
2308 * If there have been a lot of new lines, then update the screen
2309 * What the heck we'll cheat and only refresh less than every page-full.
2310 * if skipScroll is enabled.
2311 */
2312 if (refreshnow)
2313 {
2314 flag = true;
2315 scr_refresh ();
2316 want_refresh = 1;
2317 }
2318
1971 } 2319 }
1972 else 2320 else
1973 { 2321 {
1974 if (TermWin.pixmap != None) 2322 try
1975 XFreePixmap (display->display, TermWin.pixmap);
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height,
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height);
1984 XFreeGC (display->display, gc);
1985 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1987 TermWin.pixmap);
1988 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1;
1990 am_transparent = am_pixmap_trans = 1;
1991 }
1992 }
1993
1994 if (!am_pixmap_trans)
1995 {
1996 unsigned int n;
1997 /*
1998 * InheritPixmap transparency
1999 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2002 i++)
2003 {
2004 oldp = TermWin.parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n);
2007 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2009 if (TermWin.parent[i] == display->root)
2010 { 2323 {
2011 if (oldp != None) 2324 process_nonprinting (ch);
2012 pchanged = 1; 2325 }
2326 catch (const class out_of_input &o)
2327 {
2328 // we ran out of input, retry later
2329 cmdbuf_ptr = seq_begin;
2013 break; 2330 break;
2014 } 2331 }
2015 if (oldp != TermWin.parent[i])
2016 pchanged = 1;
2017 }
2018 2332
2019 n = 0; 2333 ch = NOCHAR;
2020
2021 if (pchanged)
2022 { 2334 }
2023 for (; n < (unsigned int)i; n++) 2335 }
2024 { 2336
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2337 return flag;
2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2338}
2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2339
2028 { 2340// read the next character
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2341wchar_t
2030 break; 2342rxvt_term::next_char () NOTHROW
2031 } 2343{
2032 } 2344 while (cmdbuf_ptr < cmdbuf_endp)
2345 {
2346 // assume 7-bit to be ascii ALWAYS
2347 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2348 return *cmdbuf_ptr++;
2349
2350 wchar_t wc;
2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2352
2353 if (len == (size_t)-2)
2033 } 2354 {
2034 2355 // the mbstate stores incomplete sequences. didn't know this :/
2035 if (n > (int) (sizeof (TermWin.parent) 2356 cmdbuf_ptr = cmdbuf_endp;
2036 / sizeof (TermWin.parent[0]))) 2357 break;
2037 { 2358 }
2038 D_X ((stderr, "InheritPixmap Turning off"));
2039 XSetWindowBackground (display->display, TermWin.parent[0],
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt,
2042 PixColors[Color_bg]);
2043 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */
2045 }
2046 else
2047 {
2048 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */
2050# ifdef HAVE_NANOSLEEP
2051 struct timespec rqt;
2052 2359
2053 rqt.tv_sec = 1; 2360 if (len == (size_t)-1)
2054 rqt.tv_nsec = 0; 2361 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2055 nanosleep (&rqt, NULL);
2056# else
2057 sleep (1);
2058# endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++)
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2062 ParentRelative);
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2064 ParentRelative);
2065 am_transparent = 1;
2066 }
2067 2362
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2363 // assume wchar == unicode
2069 TermWin.parent[i] = None; 2364 cmdbuf_ptr += len;
2365 return wc & UNICODE_MASK;
2070 } 2366 }
2367
2368 return NOCHAR;
2369}
2370
2371// read the next octet
2372uint32_t
2373rxvt_term::next_octet () NOTHROW
2374{
2375 return cmdbuf_ptr < cmdbuf_endp
2376 ? (unsigned char)*cmdbuf_ptr++
2377 : NOCHAR;
2378}
2379
2380static class out_of_input out_of_input;
2381
2382/* rxvt_cmd_getc () - Return next input character */
2383/*
2384 * Return the next input character after first passing any keyboard input
2385 * to the command.
2386 */
2387wchar_t
2388rxvt_term::cmd_getc () THROW ((class out_of_input))
2389{
2390 wchar_t c = next_char ();
2391
2392 if (c == NOCHAR)
2393 throw out_of_input;
2394
2071 return pchanged; 2395 return c;
2072} 2396}
2073#endif
2074 2397
2075/*}}} */ 2398uint32_t
2399rxvt_term::cmd_get8 () THROW ((class out_of_input))
2400{
2401 uint32_t c = next_octet ();
2402
2403 if (c == NOCHAR)
2404 throw out_of_input;
2405
2406 return c;
2407}
2076 2408
2077/*{{{ print pipe */ 2409/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2410/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2411#ifdef PRINTPIPE
2080FILE * 2412FILE *
2081rxvt_term::popen_printer () 2413rxvt_term::popen_printer ()
2082{ 2414{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2415 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2416
2085 if (stream == NULL) 2417 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2418 rxvt_warn ("can't open printer pipe, not printing.\n");
2419
2087 return stream; 2420 return stream;
2088} 2421}
2089 2422
2090int 2423int
2091rxvt_term::pclose_printer (FILE *stream) 2424rxvt_term::pclose_printer (FILE *stream)
2092{ 2425{
2093 fflush (stream); 2426 fflush (stream);
2094 /* pclose () reported not to work on SunOS 4.1.3 */
2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2096 /* pclose works provided SIGCHLD handler uses waitpid */
2097 return pclose (stream); /* return fclose (stream); */
2098# else
2099 return pclose (stream); 2427 return pclose (stream);
2100# endif
2101} 2428}
2102 2429
2103/* 2430/*
2104 * simulate attached vt100 printer 2431 * simulate attached vt100 printer
2105 */ 2432 */
2106void 2433void
2107rxvt_term::process_print_pipe () 2434rxvt_term::process_print_pipe ()
2108{ 2435{
2109 int done; 2436 int done;
2110 FILE *fd; 2437 FILE *fd;
2111 2438
2112 if ((fd = popen_printer ()) == NULL) 2439 if ((fd = popen_printer ()) == NULL)
2113 return; 2440 return;
2114 2441
2115 /* 2442 /*
2116 * Send all input to the printer until either ESC[4i or ESC[?4i 2443 * Send all input to the printer until either ESC[4i or ESC[?4i
2117 * is received. 2444 * is received.
2118 */ 2445 */
2119 for (done = 0; !done;) 2446 for (done = 0; !done;)
2120 { 2447 {
2121 unsigned char buf[8]; 2448 unsigned char buf[8];
2122 unsigned char ch; 2449 unicode_t ch;
2123 unsigned int i, len; 2450 unsigned int i, len;
2124 2451
2125 if ((ch = cmd_getc ()) != C0_ESC) 2452 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2453 {
2127 if (putc (ch, fd) == EOF) 2454 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2455 break; /* done = 1 */
… …
2143 { 2470 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2471 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2472 break; /* done = 1 */
2146 } 2473 }
2147 } 2474 }
2475
2148 for (i = 0; i < len; i++) 2476 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2477 if (putc (buf[i], fd) == EOF)
2150 { 2478 {
2151 done = 1; 2479 done = 1;
2152 break; 2480 break;
2153 } 2481 }
2154 } 2482 }
2155 } 2483 }
2484
2156 pclose_printer (fd); 2485 pclose_printer (fd);
2157} 2486}
2158#endif /* PRINTPIPE */ 2487#endif /* PRINTPIPE */
2159/*}}} */ 2488/*}}} */
2160 2489
2161/* *INDENT-OFF* */ 2490/* *INDENT-OFF* */
2162enum { 2491enum {
2163 C1_40 = 0x40, 2492 C1_40 = 0x40,
2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2165 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2166 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2167 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2168}; 2497};
2169/* *INDENT-ON* */ 2498/* *INDENT-ON* */
2170 2499
2171/*{{{ process non-printing single characters */ 2500/*{{{ process non-printing single characters */
2172void 2501void
2173rxvt_term::process_nonprinting (unsigned char ch) 2502rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2503{
2175 switch (ch) 2504 switch (ch)
2176 { 2505 {
2506 case C0_ESC:
2507 process_escape_seq ();
2508 break;
2177 case C0_ENQ: /* terminal Status */ 2509 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2510 if (rs[Rs_answerbackstring])
2179 tt_write ( 2511 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2180 (const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2512 else
2183 tt_write ((unsigned char *)VT100_ANS, 2513 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2514 break;
2186 case C0_BEL: /* bell */ 2515 case C0_BEL: /* bell */
2187 scr_bell (); 2516 scr_bell ();
2188 break; 2517 break;
2189 case C0_BS: /* backspace */ 2518 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2533 scr_charset_choose (1);
2205 break; 2534 break;
2206 case C0_SI: /* shift in - acs */ 2535 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2536 scr_charset_choose (0);
2208 break; 2537 break;
2538
2539#ifdef EIGHT_BIT_CONTROLS
2540 // 8-bit controls
2541 case 0x90: /* DCS */
2542 process_dcs_seq ();
2543 break;
2544 case 0x9b: /* CSI */
2545 process_csi_seq ();
2546 break;
2547 case 0x9d: /* OSC */
2548 process_osc_seq ();
2549 break;
2550#endif
2209 } 2551 }
2210} 2552}
2211/*}}} */ 2553/*}}} */
2212 2554
2213 2555
2214/*{{{ process VT52 escape sequences */ 2556/*{{{ process VT52 escape sequences */
2215void 2557void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 2558rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 2559{
2218 int row, col; 2560 int row, col;
2219 2561
2220 switch (ch) 2562 switch (ch)
2221 { 2563 {
… …
2273 2615
2274/*{{{ process escape sequences */ 2616/*{{{ process escape sequences */
2275void 2617void
2276rxvt_term::process_escape_seq () 2618rxvt_term::process_escape_seq ()
2277{ 2619{
2278 unsigned char ch = cmd_getc (); 2620 unicode_t ch = cmd_getc ();
2279 2621
2280 if (PrivateModes & PrivMode_vt52) 2622 if (priv_modes & PrivMode_vt52)
2281 { 2623 {
2282 process_escape_vt52 (ch); 2624 process_escape_vt52 (ch);
2283 return; 2625 return;
2284 } 2626 }
2285 2627
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 2642 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 2643 break;
2302 case '+': 2644 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 2645 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 2646 break;
2305#ifndef NO_FRILLS 2647#if !ENABLE_MINIMAL
2306 case '6': 2648 case '6':
2307 scr_backindex (); 2649 scr_backindex ();
2308 break; 2650 break;
2309#endif 2651#endif
2310 case '7': 2652 case '7':
2311 scr_cursor (SAVE); 2653 scr_cursor (SAVE);
2312 break; 2654 break;
2313 case '8': 2655 case '8':
2314 scr_cursor (RESTORE); 2656 scr_cursor (RESTORE);
2315 break; 2657 break;
2316#ifndef NO_FRILLS 2658#if !ENABLE_MINIMAL
2317 case '9': 2659 case '9':
2318 scr_forwardindex (); 2660 scr_forwardindex ();
2319 break; 2661 break;
2320#endif 2662#endif
2321 case '=': 2663 case '=':
… …
2331 break; 2673 break;
2332 2674
2333 /* 8.3.87: NEXT LINE */ 2675 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 2676 case C1_NEL: /* ESC E */
2335 { 2677 {
2336 unicode_t nlcr[] = { L'\n', L'\r' }; 2678 wchar_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 2679 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2338 } 2680 }
2339 break; 2681 break;
2340 2682
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 2683 /* kidnapped escape sequence: Should be 8.3.48 */
2342 case C1_ESA: /* ESC G */ 2684 case C1_ESA: /* ESC G */
… …
2352 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2353 scr_index (DN); 2695 scr_index (DN);
2354 break; 2696 break;
2355 2697
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /*case C1_SS2: scr_single_shift (2); break; */
2358 2700
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /*case C1_SS3: scr_single_shift (3); break; */
2361 2703
2362 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 2706 process_dcs_seq ();
2365 break; 2707 break;
2366 2708
2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2368 case C1_SCI: /* ESC Z */ 2710 case C1_SCI: /* ESC Z */
2369 tt_write ((const unsigned char *)ESCZ_ANSWER, 2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2371 break; /* steal obsolete ESC [ c */ 2712 break; /* steal obsolete ESC [ c */
2372 2713
2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2374 case C1_CSI: /* ESC [ */ 2715 case C1_CSI: /* ESC [ */
2375 process_csi_seq (); 2716 process_csi_seq ();
… …
2380 process_osc_seq (); 2721 process_osc_seq ();
2381 break; 2722 break;
2382 2723
2383 /* 8.3.106: RESET TO INITIAL STATE */ 2724 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 2725 case 'c':
2726 mbstate.reset ();
2385 scr_poweron (); 2727 scr_poweron ();
2386 scrollbar_show (1); 2728 scrollbar_show (1);
2387 break; 2729 break;
2388 2730
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 2743
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 2745/* *INDENT-OFF* */
2404enum { 2746enum {
2405 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2407 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2408 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2409 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2751 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2410 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2752 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2411 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2753 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2426 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2768 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2427 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2769 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2428 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2770 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2429 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2430 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2431 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2432 }; 2774 };
2433/* *INDENT-ON* */ 2775/* *INDENT-ON* */
2434 2776
2435void 2777void
2436rxvt_term::process_csi_seq () 2778rxvt_term::process_csi_seq ()
2437{ 2779{
2438 unsigned char ch, priv, i; 2780 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 2781 unsigned int nargs, p;
2440 int n, ndef; 2782 int n, ndef;
2441 int arg[ESC_ARGS]; 2783 int arg[ESC_ARGS] = { };
2442 2784
2443 for (nargs = ESC_ARGS; nargs > 0;) 2785 nargs = 0;
2444 arg[--nargs] = 0;
2445 2786
2446 priv = 0; 2787 priv = 0;
2447 ch = cmd_getc (); 2788 ch = cmd_getc ();
2448 if (ch >= '<' && ch <= '?') 2789 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 2790 { /* '<' '=' '>' '?' */
2450 priv = ch; 2791 priv = ch;
2451 ch = cmd_getc (); 2792 ch = cmd_getc ();
2452 } 2793 }
2794
2453 /* read any numerical arguments */ 2795 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 2796 for (n = -1; ch < CSI_ICH; )
2455 { 2797 {
2456 if (isdigit (ch)) 2798 if (isdigit (ch))
2457 { 2799 {
… …
2464 { 2806 {
2465 if (nargs < ESC_ARGS) 2807 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 2808 arg[nargs++] = n;
2467 n = -1; 2809 n = -1;
2468 } 2810 }
2469 else if (ch == '\b') 2811 else if (IS_CONTROL (ch))
2470 {
2471 scr_backspace ();
2472 }
2473 else if (ch == C0_ESC)
2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch); 2812 process_nonprinting (ch);
2481 } 2813
2482 ch = cmd_getc (); 2814 ch = cmd_getc ();
2483 } 2815 }
2484 2816
2485 if (ch > CSI_7F) 2817 if (ch > CSI_7F)
2486 return; 2818 return;
… …
2492 ndef = get_byte_array_bit (csi_defaults, i); 2824 ndef = get_byte_array_bit (csi_defaults, i);
2493 for (p = 0; p < nargs; p++) 2825 for (p = 0; p < nargs; p++)
2494 if (arg[p] == -1) 2826 if (arg[p] == -1)
2495 arg[p] = ndef; 2827 arg[p] = ndef;
2496 2828
2497#ifdef DEBUG_CMD
2498 fprintf (stderr, "CSI ");
2499 for (p = 0; p < nargs; p++)
2500 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2501 fprintf (stderr, "%c\n", ch);
2502#endif
2503
2504 /* 2829 /*
2505 * private mode handling 2830 * private mode handling
2506 */ 2831 */
2507 if (priv) 2832 if (priv)
2508 { 2833 {
2509 switch (priv) 2834 switch (priv)
2510 { 2835 {
2511 case '>': 2836 case '>':
2512 if (ch == CSI_DA) /* secondary device attributes */ 2837 if (ch == CSI_DA) /* secondary device attributes */
2838 {
2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841 //
2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2844 // that we do not support xterm mouse reporting (should be 95 when we do).
2845 //
2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2846 tt_printf ("\033[>%d;94;0c", 'U');
2847 }
2514 break; 2848 break;
2515 case '?': 2849 case '?':
2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2517 process_terminal_mode (ch, priv, nargs, arg); 2851 process_terminal_mode (ch, priv, nargs, arg);
2518 break; 2852 break;
… …
2623 2957
2624 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2958 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2625 arg[0] = -arg[0]; 2959 arg[0] = -arg[0];
2626 /* FALLTHROUGH */ 2960 /* FALLTHROUGH */
2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2961 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2962 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2629 break; 2963 break;
2630 2964
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2965 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 2966 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 2967 break;
2635 2968
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2969 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 2970 process_sgr_mode (nargs, arg);
2638 break; 2971 break;
… …
2644 tt_printf ("\033[0n"); 2977 tt_printf ("\033[0n");
2645 break; 2978 break;
2646 case 6: /* CPR requested */ 2979 case 6: /* CPR requested */
2647 scr_report_position (); 2980 scr_report_position ();
2648 break; 2981 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 2982 case 7: /* unofficial extension */
2983 if (option (Opt_insecure))
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2984 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 2985 break;
2653#endif
2654 case 8: /* unofficial extension */ 2986 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2987 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 2988 break;
2657 } 2989 }
2658 break; 2990 break;
2659 2991
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2992 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3025 break;
2694 3026
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3027 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3028 if (arg[0] == 4)
2697 scr_insert_mode (0); 3029 scr_insert_mode (0);
3030 else if (arg[0] == 20)
3031 priv_modes &= ~PrivMode_LFNL;
2698 break; 3032 break;
2699 3033
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3034 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3035 if (arg[0] == 4)
2702 scr_insert_mode (1); 3036 scr_insert_mode (1);
3037 else if (arg[0] == 20)
3038 priv_modes |= PrivMode_LFNL;
2703 break; 3039 break;
2704 3040
2705 /* 3041 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3042 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3043 */
… …
2719 break; 3055 break;
2720 case CSI_75: 3056 case CSI_75:
2721 scr_cursor (RESTORE); 3057 scr_cursor (RESTORE);
2722 break; 3058 break;
2723 3059
2724#ifndef NO_FRILLS 3060#if !ENABLE_MINIMAL
2725 case CSI_74: 3061 case CSI_74:
2726 process_window_ops (arg, nargs); 3062 process_window_ops (arg, nargs);
2727 break; 3063 break;
2728#endif 3064#endif
2729 3065
2730 case CSI_78: /* DECREQTPARM */ 3066 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3067 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3068 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 3069 break;
2734 3070
2735 default: 3071 default:
2736 break; 3072 break;
2737 } 3073 }
2738} 3074}
2739/*}}} */ 3075/*}}} */
2740 3076
2741#ifndef NO_FRILLS 3077#if !ENABLE_MINIMAL
2742/* ARGSUSED */ 3078/* ARGSUSED */
2743void 3079void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3080rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3081{
2746 int x, y; 3082 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3083 XWindowAttributes wattr;
2751 Window wdummy; 3084 Window wdummy;
3085
3086 dLocal (Display *, dpy);
2752 3087
2753 if (nargs == 0) 3088 if (nargs == 0)
2754 return; 3089 return;
3090
2755 switch (args[0]) 3091 switch (args[0])
2756 { 3092 {
2757 /* 3093 /*
2758 * commands 3094 * commands
2759 */ 3095 */
2760 case 1: /* deiconify window */ 3096 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3097 XMapWindow (dpy, parent[0]);
2762 break; 3098 break;
2763 case 2: /* iconify window */ 3099 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3100 XIconifyWindow (dpy, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3101 break;
2767 case 3: /* set position (pixels) */ 3102 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3103 XMoveWindow (dpy, parent[0], args[1], args[2]);
2769 break; 3104 break;
2770 case 4: /* set size (pixels) */ 3105 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3106 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3107 break;
2773 case 5: /* raise window */ 3108 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3109 XRaiseWindow (dpy, parent[0]);
2775 break; 3110 break;
2776 case 6: /* lower window */ 3111 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3112 XLowerWindow (dpy, parent[0]);
2778 break; 3113 break;
2779 case 7: /* refresh window */ 3114 case 7: /* refresh window */
2780 scr_touch (true); 3115 scr_touch (true);
2781 break; 3116 break;
2782 case 8: /* set size (chars) */ 3117 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3118 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3119 (unsigned int) (args[1] * fheight));
2785 break; 3120 break;
3121
3122 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3123 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3124 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3125 set_widthheight ((unsigned int)width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3126 (unsigned int) (args[1] * fheight));
2790 break; 3127 break;
3128
2791 /* 3129 /*
2792 * reports - some output format copied from XTerm 3130 * reports - some output format copied from XTerm
2793 */ 3131 */
2794 case 11: /* report window state */ 3132 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3133 XGetWindowAttributes (dpy, parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3134 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3135 break;
2798 case 13: /* report window position */ 3136 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3137 XGetWindowAttributes (dpy, parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3138 XTranslateCoordinates (dpy, parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3139 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3140 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3141 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3142 break;
2805 case 14: /* report window size (pixels) */ 3143 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3145 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3146 break;
3147 case 18: /* report text area size (chars) */
3148 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3149 break;
2809 case 18: /* report window size (chars) */ 3150 case 19: /* report window size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3151 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2811 break; 3152 break;
2812#if 0 /* XXX: currently disabled due to security concerns */
2813 case 20: /* report icon label */ 3153 case 20: /* report icon label */
3154 {
3155 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3156 XGetIconName (dpy, parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3157 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3158 XFree (s);
3159 }
2816 break; 3160 break;
2817 case 21: /* report window title */ 3161 case 21: /* report window title */
3162 {
3163 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3164 XFetchName (dpy, parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3165 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3166 XFree (s);
3167 }
2820 break; 3168 break;
2821#endif
2822
2823 } 3169 }
2824} 3170}
2825#endif 3171#endif
2826 3172
2827/*----------------------------------------------------------------------*/ 3173/*----------------------------------------------------------------------*/
2828/* 3174/*
2829 * get input up until STRING TERMINATOR (or BEL) 3175 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3176 * ends_how is terminator used. returned input must be free()'d
2831 */ 3177 */
2832unsigned char * 3178char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3179rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3180{
2835 int seen_esc = 0; /* seen escape? */ 3181 unicode_t ch;
3182 bool seen_esc = false;
2836 unsigned int n = 0; 3183 unsigned int n = 0;
2837 unsigned char *s; 3184 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3185
2840 for (; (ch = cmd_getc ());) 3186 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3187 {
2842 if (ch == C0_BEL 3188 if (seen_esc)
2843 || ch == CHAR_ST 3189 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3190 if (ch == 0x5c) /* 7bit ST */
2845 break; 3191 break;
3192 else
3193 return NULL;
3194 }
2846 if (ch == C0_ESC) 3195 else if (ch == C0_ESC)
2847 { 3196 {
2848 seen_esc = 1; 3197 seen_esc = true;
2849 continue; 3198 continue;
2850 } 3199 }
3200 else if (ch == C0_BEL || ch == CHAR_ST)
3201 break;
2851 else if (ch == '\t') 3202 else if (ch == C0_SYN)
2852 ch = ' '; /* translate '\t' to space */ 3203 ch = cmd_get8 ();
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3204 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3205 return NULL; /* other control character - exit */
2855 if (n < sizeof (string) - 1) 3206
3207 seen_esc = false;
3208
3209 if (n >= STRING_MAX - 1)
3210 // stop at some sane length
3211 return NULL;
3212
2856 string[n++] = ch; 3213 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3214 }
3215
2859 string[n++] = '\0'; 3216 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3217
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3218 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3219
2864 return s; 3220 return rxvt_wcstombs (string);
2865} 3221}
2866 3222
2867/*----------------------------------------------------------------------*/ 3223/*----------------------------------------------------------------------*/
2868/* 3224/*
2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3225 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2870 */ 3226 */
2871void 3227void
2872rxvt_term::process_dcs_seq () 3228rxvt_term::process_dcs_seq ()
2873{ 3229{
2874 unsigned char eh, *s; 3230 char *s;
3231 unicode_t eh;
3232
2875 /* 3233 /*
2876 * Not handled yet 3234 * Not handled yet
2877 */ 3235 */
2878 s = get_to_st (&eh); 3236 s = get_to_st (eh);
2879 if (s) 3237 if (s)
2880 free (s); 3238 free (s);
3239
2881 return; 3240 return;
2882} 3241}
2883 3242
2884/*----------------------------------------------------------------------*/ 3243/*----------------------------------------------------------------------*/
2885/* 3244/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3245 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3246 */
2888void 3247void
2889rxvt_term::process_osc_seq () 3248rxvt_term::process_osc_seq ()
2890{ 3249{
2891 unsigned char ch, eh, *s; 3250 unicode_t ch, eh;
2892 int arg; 3251 int arg;
2893 3252
2894 ch = cmd_getc (); 3253 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3254 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3255 arg = arg * 10 + (ch - '0');
2897 3256
2898 if (ch == ';') 3257 if (ch == ';')
2899 { 3258 {
2900 s = get_to_st (&eh); 3259 char *s = get_to_st (eh);
3260
2901 if (s) 3261 if (s)
2902 { 3262 {
2903 /*
2904 * rxvt_menubar_dispatch () violates the constness of the string,
2905 * so do it here
2906 */
2907 if (arg == XTerm_Menu)
2908#if 0 /* XXX: currently disabled due to security concerns */
2909 menubar_dispatch ((char *)s);
2910#else
2911 (void)0;
2912#endif
2913 else
2914 xterm_seq (arg, (char *)s, eh); 3263 process_xterm_seq (arg, s, eh);
2915 free (s); 3264 free (s);
2916 } 3265 }
2917 } 3266 }
2918} 3267}
3268
3269void
3270rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3271{
3272 if (str[0] == '?' && !str[1])
3273 {
3274 rgba c;
3275 pix_colors_focused[color].get (c);
3276
3277#if XFT
3278 if (c.a != rgba::MAX_CC)
3279 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3280 else
3281#endif
3282 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3283 }
3284 else
3285 set_window_color (color, str);
3286}
3287
2919/* 3288/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3289 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title
2922 * 1 = change iconName
2923 * 2 = change title
2924 * 4 = change color
2925 * 12 = change text color
2926 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour
2928 * 18 = change bold character color
2929 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented)
2931 * 50 = change font
2932 *
2933 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap
2936 * 39 = change default fg color
2937 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale
2940 * 702 = find font
2941 */ 3290 */
2942void 3291void
2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3292rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2944{ 3293{
2945 int changed = 0; 3294 int color;
2946 int color;
2947 char *buf, *name; 3295 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1];
3297 int saveop = op;
3298
3299 dLocal (Display *, dpy);
2948 3300
2949 assert (str != NULL); 3301 assert (str != NULL);
3302
3303 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3304 return;
3305
2950 switch (op) 3306 switch (op)
2951 { 3307 {
2952 case XTerm_name: 3308 case XTerm_name:
2953 set_title (str); 3309 set_title (str);
2954 /* FALLTHROUGH */ 3310 /* FALLTHROUGH */
2955 case XTerm_iconName: 3311 case XTerm_iconName:
2956 set_iconName (str); 3312 set_icon_name (str);
2957 break; 3313 break;
2958 case XTerm_title: 3314 case XTerm_title:
2959 set_title (str); 3315 set_title (str);
2960 break; 3316 break;
3317 case XTerm_property:
3318 if (str[0] == '?')
3319 {
3320 Atom prop = display->atom (str + 1);
3321 Atom actual_type;
3322 int actual_format;
3323 unsigned long nitems;
3324 unsigned long bytes_after;
3325 unsigned char *value = 0;
3326 const char *str = "";
3327
3328 if (prop
3329 && XGetWindowProperty (dpy, parent[0],
3330 prop, 0, 1<<16, 0, AnyPropertyType,
3331 &actual_type, &actual_format,
3332 &nitems, &bytes_after, &value) == Success
3333 && actual_type != None
3334 && actual_format == 8)
3335 str = (const char *)(value);
3336
3337 tt_printf ("\033]%d;%s%c", op, str, resp);
3338
3339 XFree (value);
3340 }
3341 else
3342 {
3343 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3344
3345 if (eq)
3346 {
3347 *eq = 0;
3348 set_utf8_property (display->atom (str), eq + 1);
3349 }
3350 else
3351 XDeleteProperty (dpy, parent[0],
3352 display->atom (str));
3353 }
3354 break;
3355
2961 case XTerm_Color: 3356 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3357 for (buf = (char *)str; buf && *buf;)
2963 { 3358 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3359 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3360 break;
3361
2966 *name++ = '\0'; 3362 *name++ = '\0';
2967 color = atoi (buf); 3363 color = atoi (buf) + minCOLOR;
2968 if (color < 0 || color >= TOTAL_COLORS) 3364
3365 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2969 break; 3366 break;
3367
2970 if ((buf = STRCHR (name, ';')) != NULL) 3368 if ((buf = strchr (name, ';')) != NULL)
2971 *buf++ = '\0'; 3369 *buf++ = '\0';
2972 set_window_color (color + minCOLOR, name); 3370
3371 process_color_seq (op, color, name, resp);
2973 } 3372 }
3373 break;
3374 case XTerm_Color00:
3375 process_color_seq (op, Color_fg, str, resp);
3376 break;
3377 case XTerm_Color01:
3378 process_color_seq (op, Color_bg, str, resp);
2974 break; 3379 break;
2975#ifndef NO_CURSORCOLOR 3380#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3381 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3382 process_color_seq (op, Color_cursor, str, resp);
2978 break; 3383 break;
2979#endif 3384#endif
2980 case XTerm_Color_pointer: 3385 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3386 process_color_seq (op, Color_pointer_fg, str, resp);
3387 break;
3388 case XTerm_Color_pointer_bg:
3389 process_color_seq (op, Color_pointer_bg, str, resp);
2982 break; 3390 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3391#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD:
2985 set_window_color (Color_BD, str);
2986 break;
2987 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str);
2989 break;
2990 case XTerm_Color_RV: 3392 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3393 process_color_seq (op, Color_RV, str, resp);
2992 break; 3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp);
3398 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp);
3402 break;
3403 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp);
3405 break;
2993#endif 3406#endif
2994 3407#if ENABLE_TRANSPARENCY
2995 case XTerm_Menu: 3408 case URxvt_Color_tint:
3409 process_color_seq (op, Color_tint, str, resp);
2996 /* 3410 {
2997 * rxvt_menubar_dispatch () violates the constness of the string, 3411 bool changed = false;
2998 * so DON'T do it here 3412 if (ISSET_PIXCOLOR (Color_tint))
3413 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3414 else
3415 changed = bgPixmap.unset_tint ();
3416 if (changed)
3417 update_background ();
2999 */ 3418 }
3419
3000 break; 3420 break;
3421#endif
3422
3423#if BG_IMAGE_FROM_FILE
3001 case XTerm_Pixmap: 3424 case Rxvt_Pixmap:
3002 if (*str != ';') 3425 if (!strcmp (str, "?"))
3003 { 3426 {
3004#if XPM_BACKGROUND 3427 char str[256];
3005 scale_pixmap (""); /* reset to default scaling */ 3428
3006 set_bgPixmap (str); /* change pixmap */ 3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3007#endif 3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3008 scr_touch (true); 3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST);
3009 } 3433 }
3010 while ((str = STRCHR (str, ';')) != NULL)
3011 {
3012 str++;
3013#if XPM_BACKGROUND
3014 changed += scale_pixmap (str);
3015#endif
3016
3017 }
3018 if (changed)
3019 {
3020#ifdef XPM_BACKGROUND
3021 resize_pixmap ();
3022#endif
3023 scr_touch (true);
3024 }
3025 break;
3026
3027 case XTerm_restoreFG:
3028 set_window_color (Color_fg, str);
3029 break;
3030 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str);
3032 break;
3033 case XTerm_logfile:
3034 break;
3035 case XTerm_font:
3036 change_font (str);
3037 break;
3038#ifndef NO_FRILLS
3039 case XTerm_locale:
3040 if (str[0] == '?' && !str[1])
3041 tt_printf ("%-.250s\n", locale);
3042 else 3434 else
3043 { 3435 {
3436 int changed = 0;
3437
3438 if (*str != ';')
3439 {
3440 /* reset to default scaling :*/
3441 bgPixmap.unset_geometry ();
3442 if (bgPixmap.set_file (str)) /* change pixmap */
3443 changed++;
3444 str = strchr (str, ';');
3445 if (str == NULL)
3446 bgPixmap.set_defaultGeometry ();
3447 }
3044 set_locale (str); 3448 while (str)
3045# ifdef USE_XIM 3449 {
3046 im_cb (); 3450 str++;
3047# endif 3451 if (bgPixmap.set_geometry (str))
3452 changed++;
3453 str = strchr (str, ';');
3454 }
3455 if (changed)
3456 update_background ();
3048 } 3457 }
3049 break; 3458 break;
3459#endif
3460
3461 case Rxvt_restoreFG:
3462 set_window_color (Color_fg, str);
3463 break;
3464 case Rxvt_restoreBG:
3465 set_window_color (Color_bg, str);
3466 break;
3467
3050 case XTerm_findfont: 3468 case XTerm_logfile:
3051 { 3469 // TODO, when secure mode?
3052 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break; 3470 break;
3056#endif 3471
3057#if 0 3472#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3473 case Rxvt_dumpscreen: /* no error notices */
3059 { 3474 {
3060 int fd; 3475 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3476 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3477 {
3063 scr_dump (fd); 3478 scr_dump (fd);
3064 close (fd); 3479 close (fd);
3065 } 3480 }
3066 } 3481 }
3067 break; 3482 break;
3068#endif 3483#endif
3484 case XTerm_font:
3485 op = URxvt_font;
3486 case URxvt_font:
3487#if ENABLE_STYLES
3488 case URxvt_boldFont:
3489 case URxvt_italicFont:
3490 case URxvt_boldItalicFont:
3491#endif
3492 if (query)
3493 tt_printf ("\33]%d;%-.250s%c", saveop,
3494 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3495 ? fontset[op - URxvt_font]->fontdesc : "",
3496 resp);
3497 else
3498 {
3499 const char *&res = rs[Rs_font + (op - URxvt_font)];
3069 3500
3501 res = strdup (str);
3502 allocated.push_back ((void *)res);
3503 set_fonts ();
3504 }
3505 break;
3506
3507 case URxvt_version:
3508 if (query)
3509 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3510 op,
3511 rs[Rs_name], VERSION[0], VERSION[2],
3512 resp);
3513 break;
3514
3515#if !ENABLE_MINIMAL
3516 case URxvt_locale:
3517 if (query)
3518 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3519 else
3520 {
3521 set_locale (str);
3522 pty->set_utf8_mode (enc_utf8);
3523 init_xlocale ();
3524 }
3525 break;
3526
3527 case URxvt_view_up:
3528 case URxvt_view_down:
3529 {
3530 int lines = atoi (str);
3531
3532 if (lines)
3533 scr_page (op == URxvt_view_up ? UP : DN, lines);
3534 else
3535 scr_erase_savelines ();
3536 }
3537
3538 break;
3539#endif
3540
3541#if ENABLE_PERL
3542 case URxvt_perl:
3543 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3544 ; // no responses yet
3545 break;
3546#endif
3070 } 3547 }
3071} 3548}
3072/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
3073 3550
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3551/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3559 * so no need for fancy checking
3083 */ 3560 */
3084int 3561int
3085rxvt_term::privcases (int mode, unsigned long bit) 3562rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3563{
3087 int state; 3564 int state;
3088 3565
3089 if (mode == 's') 3566 if (mode == 's')
3090 { 3567 {
3091 SavedModes |= (PrivateModes & bit); 3568 SavedModes |= (priv_modes & bit);
3092 return -1; 3569 return -1;
3093 } 3570 }
3094 else 3571 else
3095 { 3572 {
3096 if (mode == 'r') 3573 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 3575 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 3577 PrivMode (state, bit);
3101 } 3578 }
3579
3102 return state; 3580 return state;
3103} 3581}
3104 3582
3105/* we're not using priv _yet_ */ 3583/* we're not using priv _yet_ */
3106void 3584void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3585rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3108{ 3586{
3109 unsigned int i, j; 3587 unsigned int i, j;
3110 int state; 3588 int state;
3589
3111 static const struct 3590 static const struct
3112 { 3591 {
3113 const int argval; 3592 const int argval;
3114 const unsigned long bit; 3593 const unsigned long bit;
3115 }
3116 argtopriv[] = { 3594 } argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap },
3602 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 3604 // 18, 19 printing-related
3126 { menuBar_esc, PrivMode_menuBar }, 3605 { 25, PrivMode_VisibleCursor },
3127#endif
3128#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 3608#endif
3131 // 18, 19 printing-related
3132 { 25, PrivMode_VisibleCursor },
3133 // 30 show scrollbar rxvt. extension
3134 { 35, PrivMode_ShiftKeys }, // rxvt extension 3609 { 35, PrivMode_ShiftKeys }, // rxvt extension
3135 { 40, PrivMode_132OK }, 3610 { 40, PrivMode_132OK },
3136 // 41 xterm more fixes NYI 3611 // 41 xterm more fixes NYI
3137 // 45 margin bell NYI 3612 // 45 margin bell NYI
3138 // 46 start logging 3613 // 46 start logging
… …
3150 // 1035 enable modifiers for alt, numlock NYI 3625 // 1035 enable modifiers for alt, numlock NYI
3151 // 1036 send ESC for meta keys NYI 3626 // 1036 send ESC for meta keys NYI
3152 // 1037 send DEL for keypad delete NYI 3627 // 1037 send DEL for keypad delete NYI
3153 { 1047, PrivMode_Screen }, 3628 { 1047, PrivMode_Screen },
3154 // 1048 save and restore cursor 3629 // 1048 save and restore cursor
3155 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3156 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3157 }; 3632 };
3158 3633
3159 if (nargs == 0) 3634 if (nargs == 0)
3160 return; 3635 return;
… …
3178 } 3653 }
3179 3654
3180 /* extra handling for values with state unkept */ 3655 /* extra handling for values with state unkept */
3181 switch (arg[i]) 3656 switch (arg[i])
3182 { 3657 {
3658#if ENABLE_STYLES
3659 case 1021:
3660 set_option (Opt_intensityStyles, mode);
3661
3662 scr_touch (true);
3663 break;
3664#endif
3183 case 1048: /* alternative cursor save */ 3665 case 1048: /* alternative cursor save */
3184 case 1049: 3666 case 1049:
3667 if (option (Opt_secondaryScreen))
3185 if (mode == 0) 3668 if (mode == 0)
3186 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3187 else if (mode == 1) 3670 else if (mode == 1)
3188 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
3189 /* FALLTHROUGH */ 3672 break;
3190 } 3673 }
3191 3674
3192 if (state >= 0) 3675 if (state >= 0)
3193 /* extra handling for values with valid 0 or 1 state */ 3676 /* extra handling for values with valid 0 or 1 state */
3194 switch (arg[i]) 3677 switch (arg[i])
… …
3200 * within VT52 mode 3683 * within VT52 mode
3201 */ 3684 */
3202 PrivMode (1, PrivMode_vt52); 3685 PrivMode (1, PrivMode_vt52);
3203 break; 3686 break;
3204 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
3205 if (PrivateModes & PrivMode_132OK) 3688 if (priv_modes & PrivMode_132OK)
3206 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3689 set_widthheight (((state ? 132 : 80) * fwidth), height);
3207 break; 3690 break;
3208 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
3209 if (state) 3692 set_option (Opt_jumpScroll, !state);
3210 Options &= ~Opt_jumpScroll;
3211 else
3212 Options |= Opt_jumpScroll;
3213 break; 3693 break;
3214 case 5: /* reverse video */ 3694 case 5: /* reverse video */
3215 scr_rvideo_mode (state); 3695 scr_rvideo_mode (state);
3216 break; 3696 break;
3217 case 6: /* relative/absolute origins */ 3697 case 6: /* relative/absolute origins */
3218 scr_relative_origin (state); 3698 scr_relative_origin (state);
3219 break; 3699 break;
3220 case 7: /* autowrap */ 3700 case 7: /* autowrap */
3221 scr_autowrap (state); 3701 scr_autowrap (state);
3222 break; 3702 break;
3223 /* case 8: - auto repeat, can't do on a per window basis */ 3703 /* case 8: - auto repeat, can't do on a per window basis */
3224 case 9: /* X10 mouse reporting */ 3704 case 9: /* X10 mouse reporting */
3225 if (state) /* orthogonal */ 3705 if (state) /* orthogonal */
3226 PrivateModes &= ~ (PrivMode_MouseX11); 3706 priv_modes &= ~PrivMode_MouseX11;
3227 break; 3707 break;
3228#ifdef menuBar_esc
3229 case menuBar_esc:
3230#ifdef MENUBAR
3231 map_menuBar (state);
3232#endif
3233 break;
3234#endif
3235#ifdef scrollBar_esc 3708#ifdef scrollBar_esc
3236 case scrollBar_esc: 3709 case scrollBar_esc:
3237 if (scrollbar_mapping (state)) 3710 if (scrollbar_mapping (state))
3238 { 3711 {
3239 resize_all_windows (0, 0, 0); 3712 resize_all_windows (0, 0, 0);
… …
3242 break; 3715 break;
3243#endif 3716#endif
3244 case 25: /* visible/invisible cursor */ 3717 case 25: /* visible/invisible cursor */
3245 scr_cursor_visible (state); 3718 scr_cursor_visible (state);
3246 break; 3719 break;
3247 /* case 35: - shift keys */ 3720 /* case 35: - shift keys */
3248 /* case 40: - 80 <--> 132 mode */ 3721 /* case 40: - 80 <--> 132 mode */
3249 case 47: /* secondary screen */ 3722 case 47: /* secondary screen */
3250 scr_change_screen (state); 3723 scr_change_screen (state);
3251 break; 3724 break;
3252 /* case 66: - application key pad */ 3725 /* case 66: - application key pad */
3253 /* case 67: - backspace key */ 3726 /* case 67: - backspace key */
3254 case 1000: /* X11 mouse reporting */ 3727 case 1000: /* X11 mouse reporting */
3255 if (state) /* orthogonal */ 3728 if (state) /* orthogonal */
3256 PrivateModes &= ~ (PrivMode_MouseX10); 3729 priv_modes &= ~PrivMode_MouseX10;
3257 break; 3730 break;
3258#if 0 3731#if 0
3259 case 1001: 3732 case 1001:
3260 break; /* X11 mouse highlighting */ 3733 break; /* X11 mouse highlighting */
3261#endif 3734#endif
3262 case 1010: /* scroll to bottom on TTY output inhibit */ 3735 case 1010: /* scroll to bottom on TTY output inhibit */
3263 if (state)
3264 Options &= ~Opt_scrollTtyOutput;
3265 else
3266 Options |= Opt_scrollTtyOutput; 3736 set_option (Opt_scrollTtyOutput, !state);
3267 break; 3737 break;
3268 case 1011: /* scroll to bottom on key press */ 3738 case 1011: /* scroll to bottom on key press */
3269 if (state)
3270 Options |= Opt_scrollTtyKeypress; 3739 set_option (Opt_scrollTtyKeypress, state);
3271 else
3272 Options &= ~Opt_scrollTtyKeypress;
3273 break; 3740 break;
3274 case 1047: /* secondary screen w/ clearing */ 3741 case 1047: /* secondary screen w/ clearing last */
3275 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3742 if (option (Opt_secondaryScreen))
3276 if (current_screen != PRIMARY) 3743 if (current_screen != PRIMARY)
3277 scr_erase_screen (2); 3744 scr_erase_screen (2);
3278 scr_change_screen (state); 3745 scr_change_screen (state);
3279 /* FALLTHROUGH */ 3746 break;
3747 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state);
3749 if (option (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY)
3751 scr_erase_screen (2);
3752 break;
3280 default: 3753 default:
3281 break; 3754 break;
3282 } 3755 }
3283 } 3756 }
3284} 3757}
… …
3286 3759
3287/*{{{ process sgr sequences */ 3760/*{{{ process sgr sequences */
3288void 3761void
3289rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3762rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3290{ 3763{
3291 unsigned int i; 3764 unsigned int i;
3292 short rendset; 3765 short rendset;
3293 int rendstyle; 3766 int rendstyle;
3294 3767
3295 if (nargs == 0) 3768 if (nargs == 0)
3296 { 3769 {
3297 scr_rendition (0, ~RS_None); 3770 scr_rendition (0, ~RS_None);
3298 return; 3771 return;
3299 } 3772 }
3773
3300 for (i = 0; i < nargs; i++) 3774 for (i = 0; i < nargs; i++)
3301 { 3775 {
3302 rendset = -1; 3776 rendset = -1;
3303 switch (arg[i]) 3777 switch (arg[i])
3304 { 3778 {
… …
3306 rendset = 0, rendstyle = ~RS_None; 3780 rendset = 0, rendstyle = ~RS_None;
3307 break; 3781 break;
3308 case 1: 3782 case 1:
3309 rendset = 1, rendstyle = RS_Bold; 3783 rendset = 1, rendstyle = RS_Bold;
3310 break; 3784 break;
3785 //case 2: // low intensity
3786 case 3:
3787 rendset = 1, rendstyle = RS_Italic;
3788 break;
3311 case 4: 3789 case 4:
3312 rendset = 1, rendstyle = RS_Uline; 3790 rendset = 1, rendstyle = RS_Uline;
3313 break; 3791 break;
3314 case 5: 3792 case 5: // slowly blinking
3793 case 6: // rapidly blinking
3315 rendset = 1, rendstyle = RS_Blink; 3794 rendset = 1, rendstyle = RS_Blink;
3316 break; 3795 break;
3796 //case 6: // scoansi light background
3317 case 7: 3797 case 7:
3318 rendset = 1, rendstyle = RS_RVid; 3798 rendset = 1, rendstyle = RS_RVid;
3319 break; 3799 break;
3320 case 8: 3800 case 8:
3321 // invisible. NYI 3801 // invisible. NYI
3322 break; 3802 break;
3323 case 22: 3803 //case 9: // crossed out
3804 //case 10: // scoansi acs off, primary font
3805 //case 11: // scoansi acs on, first alt font
3806 //case 12: // scoansi acs on, |0x80, second alt font
3807 //...
3808 //case 19: // ninth alt font
3809 //case 20: // gothic
3810 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3324 rendset = 0, rendstyle = RS_Bold; 3811 rendset = 0, rendstyle = RS_Bold;
3812 break;
3813 case 22: // normal intensity
3814 rendset = 0, rendstyle = RS_Bold;
3815 break;
3816 case 23: // disable italic
3817 rendset = 0, rendstyle = RS_Italic;
3325 break; 3818 break;
3326 case 24: 3819 case 24:
3327 rendset = 0, rendstyle = RS_Uline; 3820 rendset = 0, rendstyle = RS_Uline;
3328 break; 3821 break;
3329 case 25: 3822 case 25:
3330 rendset = 0, rendstyle = RS_Blink; 3823 rendset = 0, rendstyle = RS_Blink;
3331 break; 3824 break;
3825 case 26: // variable spacing (iso 8613)
3826 rendset = 0, rendstyle = RS_Blink;
3827 break;
3332 case 27: 3828 case 27:
3333 rendset = 0, rendstyle = RS_RVid; 3829 rendset = 0, rendstyle = RS_RVid;
3334 break; 3830 break;
3335 case 28:
3336 // visible. NYI 3831 //case 28: // visible. NYI
3337 break; 3832 //case 29: // not crossed-out
3338 } 3833 }
3339 3834
3340 if (rendset != -1) 3835 if (rendset != -1)
3341 { 3836 {
3342 scr_rendition (rendset, rendstyle); 3837 scr_rendition (rendset, rendstyle);
… …
3353 case 35: 3848 case 35:
3354 case 36: 3849 case 36:
3355 case 37: 3850 case 37:
3356 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3851 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3357 break; 3852 break;
3358#ifdef TTY_256COLOR 3853 case 38: // set fg color, ISO 8613-6
3359 case 38:
3360 if (nargs > i + 2 && arg[i + 1] == 5) 3854 if (nargs > i + 2 && arg[i + 1] == 5)
3361 { 3855 {
3362 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3856 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3363 i += 2; 3857 i += 2;
3364 } 3858 }
3365 break; 3859 break;
3366#endif
3367 case 39: /* default fg */ 3860 case 39: /* default fg */
3368 scr_color (Color_fg, Color_fg); 3861 scr_color (Color_fg, Color_fg);
3369 break; 3862 break;
3370 3863
3371 case 40: 3864 case 40:
… …
3376 case 45: 3869 case 45:
3377 case 46: 3870 case 46:
3378 case 47: 3871 case 47:
3379 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3872 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3380 break; 3873 break;
3381#ifdef TTY_256COLOR 3874 case 48: // set bg color, ISO 8613-6
3382 case 48:
3383 if (nargs > i + 2 && arg[i + 1] == 5) 3875 if (nargs > i + 2 && arg[i + 1] == 5)
3384 { 3876 {
3385 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3877 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3386 i += 2; 3878 i += 2;
3387 } 3879 }
3388 break; 3880 break;
3389#endif
3390 case 49: /* default bg */ 3881 case 49: /* default bg */
3391 scr_color (Color_bg, Color_bg); 3882 scr_color (Color_bg, Color_bg);
3392 break; 3883 break;
3393 3884
3394#ifndef NO_BRIGHTCOLOR 3885 //case 50: // not variable spacing
3886
3887#if !ENABLE_MINIMAL
3395 case 90: 3888 case 90:
3396 case 91: /* set bright fg color */ 3889 case 91: /* set bright fg color */
3397 case 92: 3890 case 92:
3398 case 93: 3891 case 93:
3399 case 94: 3892 case 94:
3400 case 95: 3893 case 95:
3401 case 96: 3894 case 96:
3402 case 97: 3895 case 97:
3403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3896 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3404 Color_fg);
3405 break; 3897 break;
3406 case 100: 3898 case 100:
3407 case 101: /* set bright bg color */ 3899 case 101: /* set bright bg color */
3408 case 102: 3900 case 102:
3409 case 103: 3901 case 103:
3410 case 104: 3902 case 104:
3411 case 105: 3903 case 105:
3412 case 106: 3904 case 106:
3413 case 107: 3905 case 107:
3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3415 Color_bg);
3416 break; 3907 break;
3417#endif 3908#endif
3418
3419 } 3909 }
3420 } 3910 }
3421} 3911}
3422/*}}} */ 3912/*}}} */
3423 3913
3424/*{{{ process Rob Nation's own graphics mode sequences */ 3914/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3425void 3915void
3426rxvt_term::process_graphics () 3916rxvt_term::process_graphics ()
3427{ 3917{
3428 unsigned char ch, cmd = cmd_getc (); 3918 unicode_t ch, cmd = cmd_getc ();
3429 3919
3430 if (cmd == 'Q') 3920 if (cmd == 'Q')
3431 { /* query graphics */ 3921 { /* query graphics */
3432 tt_printf ("\033G0\n"); /* no graphics */ 3922 tt_printf ("\033G0\012"); /* no graphics */
3433 return; 3923 return;
3434 } 3924 }
3435 /* swallow other graphics sequences until terminating ':' */ 3925 /* swallow other graphics sequences until terminating ':' */
3436 do 3926 do
3437 ch = cmd_getc (); 3927 ch = cmd_getc ();
… …
3447 */ 3937 */
3448void 3938void
3449rxvt_term::tt_printf (const char *fmt,...) 3939rxvt_term::tt_printf (const char *fmt,...)
3450{ 3940{
3451 va_list arg_ptr; 3941 va_list arg_ptr;
3452 unsigned char buf[256]; 3942 char buf[256];
3453 3943
3454 va_start (arg_ptr, fmt); 3944 va_start (arg_ptr, fmt);
3455 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3945 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3456 va_end (arg_ptr); 3946 va_end (arg_ptr);
3457 tt_write (buf, STRLEN (buf)); 3947 tt_write (buf, strlen (buf));
3458} 3948}
3459 3949
3460/* ---------------------------------------------------------------------- */ 3950/* ---------------------------------------------------------------------- */
3461/* Write data to the pty as typed by the user, pasted with the mouse, 3951/* Write data to the pty as typed by the user, pasted with the mouse,
3462 * or generated by us in response to a query ESC sequence. 3952 * or generated by us in response to a query ESC sequence.
3463 */ 3953 */
3954const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3955
3464void 3956void
3465rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3957rxvt_term::tt_write (const char *data, unsigned int len)
3466{ 3958{
3467 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3960 return;
3468 3961
3469 if (len) 3962 if (pty->pty < 0)
3963 return;
3964
3965 if (v_buflen == 0)
3966 {
3967 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3968
3969 if ((unsigned int)written == len)
3970 return;
3971
3972 data += written;
3973 len -= written;
3470 { 3974 }
3975
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3977
3978 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len;
3980
3981 pty_ev.set (EVENT_READ | EVENT_WRITE);
3982}
3983
3984void rxvt_term::pty_write ()
3985{
3986 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3987
3988 if (written > 0)
3989 {
3990 v_buflen -= written;
3991
3471 if (v_buflen == 0) 3992 if (v_buflen == 0)
3472 { 3993 {
3473 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3474
3475 if ((unsigned int)written == len)
3476 return;
3477
3478 data += written;
3479 len -= written;
3480 }
3481
3482
3483 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3484
3485 memcpy (v_buffer + v_buflen, data, len);
3486 v_buflen += len;
3487 }
3488
3489 for (;;)
3490 {
3491 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3492
3493 if (written > 0)
3494 {
3495 v_buflen -= written;
3496
3497 if (v_buflen == 0)
3498 {
3499 free (v_buffer); 3994 free (v_buffer);
3500 v_buffer = 0; 3995 v_buffer = 0;
3501 v_buflen = 0;
3502 3996
3503 pty_ev.set (EVENT_READ); 3997 pty_ev.set (EVENT_READ);
3504 return;
3505 }
3506
3507 memmove (v_buffer, v_buffer + written, v_buflen);
3508 }
3509 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3510 // original code just ignores this...
3511 destroy ();
3512 else
3513 {
3514 pty_ev.set (EVENT_READ | EVENT_WRITE);
3515 return; 3998 return;
3516 } 3999 }
4000
4001 memmove (v_buffer, v_buffer + written, v_buflen);
3517 } 4002 }
4003 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4004 pty_ev.set (EVENT_READ);
3518} 4005}
3519 4006
3520/*----------------------- end-of-file (C source) -----------------------*/ 4007/*----------------------- end-of-file (C source) -----------------------*/
3521 4008

Diff Legend

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