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.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.259 by root, Fri Jan 13 04:59:04 2006 UTC

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

Diff Legend

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