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

Diff Legend

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