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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.271 by root, Wed Jan 18 17:49:46 2006 UTC

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

Diff Legend

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