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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC

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

Diff Legend

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