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

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

Diff Legend

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