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.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 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
1095#if LINUX_YIELD_HACK
1096static struct event_handler
1097{
1098 check_watcher yield_ev;
1099
1100 void yield_cb (check_watcher &w)
1101 {
1102 usleep (0);
1103 w.stop ();
1104 }
1105
1106 event_handler ()
1107 : yield_ev (this, &event_handler::yield_cb)
1108 {
1109 }
1110} event_handler;
1111#endif
1112
709bool 1113bool
710rxvt_term::pty_fill () 1114rxvt_term::pty_fill ()
711{ 1115{
712 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1116 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1117
1118 if (CBUFSIZ == n)
1119 {
1120 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1121 n = 0;
1122 }
713 1123
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 1124 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 1125 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 1126 cmdbuf_endp = cmdbuf_ptr + n;
717 1127
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1128 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
719 1129
720 if (n > 0) 1130 if (r > 0)
721 { 1131 {
722 cmdbuf_endp += n; 1132 cmdbuf_endp += r;
723 return true; 1133 return true;
724 } 1134 }
725 else if (n < 0 && errno != EAGAIN) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1136 {
1137#if LINUX_YIELD_HACK
1138 if (display->is_local)
1139 event_handler.yield_ev.start ();
1140#endif
1141 }
1142 else
1143 {
1144 pty_ev.stop ();
1145
1146 if (!OPTION (Opt_hold))
726 destroy (); 1147 destroy ();
1148 }
727 1149
728 return false; 1150 return false;
729} 1151}
730 1152
731void 1153void
732rxvt_term::pty_cb (io_watcher &w, short revents) 1154rxvt_term::pty_cb (io_watcher &w, short revents)
733{ 1155{
734 SET_R (this); 1156 make_current ();
735 SET_LOCALE (locale); 1157
1158 if (revents & EVENT_READ)
1159 // loop, but don't allow a single term to monopolize us
1160 while (pty_fill ())
1161 if (cmd_parse ())
1162 break;
736 1163
737 if (revents & EVENT_WRITE) 1164 if (revents & EVENT_WRITE)
738 tt_write (0, 0); 1165 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} 1166}
759 1167
760bool 1168void
761rxvt_term::cmd_parse () 1169rxvt_term::pointer_unblank ()
762{ 1170{
763 bool flag = false; 1171 XDefineCursor (xdisp, vt, TermWin_cursor);
764 uint32_t ch = NOCHAR; 1172 recolour_cursor ();
765 1173
766 for (;;) 1174#ifdef POINTER_BLANK
767 { 1175 hidden_pointer = 0;
768 if (ch == NOCHAR)
769 ch = next_char ();
770 1176
771 if (ch == NOCHAR) // TODO: improve 1177 if (OPTION (Opt_pointerBlank))
772 break; 1178 pointer_ev.start (NOW + pointerBlankDelay);
773 1179#endif
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 uint32_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 uint32_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
868uint32_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 */
904uint32_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 uint32_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} 1180}
920 1181
921#ifdef POINTER_BLANK 1182#ifdef POINTER_BLANK
922void 1183void
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 () 1184rxvt_term::pointer_blank ()
936{ 1185{
937 if (! (Options & Opt_pointerBlank)) 1186 if (!OPTION (Opt_pointerBlank))
938 return; 1187 return;
939 1188
940 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1189 XDefineCursor (xdisp, vt, display->blank_cursor);
941 XFlush (display->display); 1190 XFlush (xdisp);
942 1191
943 hidden_pointer = 1; 1192 hidden_pointer = 1;
944} 1193}
945 1194
946void 1195void
947rxvt_term::pointer_cb (time_watcher &w) 1196rxvt_term::pointer_cb (time_watcher &w)
948{ 1197{
949 SET_R (this); 1198 make_current ();
950 SET_LOCALE (locale);
951 1199
952 pointer_blank (); 1200 pointer_blank ();
953} 1201}
954#endif 1202#endif
955 1203
… …
962 x = ev.x; 1210 x = ev.x;
963 y = ev.y; 1211 y = ev.y;
964 pixel_position (&x, &y); 1212 pixel_position (&x, &y);
965 1213
966 if (MEvent.button == AnyButton) 1214 if (MEvent.button == AnyButton)
967 {
968 button_number = 3; 1215 button_number = 3;
969 }
970 else 1216 else
971 { 1217 {
972 button_number = MEvent.button - Button1; 1218 button_number = MEvent.button - Button1;
973 /* add 0x3D for wheel events, like xterm does */ 1219 /* add 0x3D for wheel events, like xterm does */
974 if (button_number >= 3) 1220 if (button_number >= 3)
975 button_number += (64 - 3); 1221 button_number += (64 - 3);
976 } 1222 }
977 1223
978 if (PrivateModes & PrivMode_MouseX10) 1224 if (priv_modes & PrivMode_MouseX10)
979 { 1225 {
980 /* 1226 /*
981 * do not report ButtonRelease 1227 * do not report ButtonRelease
982 * no state info allowed 1228 * no state info allowed
983 */ 1229 */
… …
998 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1244 + ((MEvent.state & ModMetaMask) ? 8 : 0)
999 + ((MEvent.state & ControlMask) ? 16 : 0); 1245 + ((MEvent.state & ControlMask) ? 16 : 0);
1000#ifdef MOUSE_REPORT_DOUBLECLICK 1246#ifdef MOUSE_REPORT_DOUBLECLICK
1001 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1247 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1002#endif 1248#endif
1003
1004 } 1249 }
1005 1250
1006#ifdef DEBUG_MOUSEREPORT 1251#if DEBUG_MOUSEREPORT
1007 fprintf (stderr, "Mouse ["); 1252 fprintf (stderr, "Mouse [");
1008 if (key_state & 16) 1253 if (key_state & 16)
1009 fputc ('C', stderr); 1254 fputc ('C', stderr);
1010 if (key_state & 4) 1255 if (key_state & 4)
1011 fputc ('S', stderr); 1256 fputc ('S', stderr);
… …
1015 fputc ('2', stderr); 1260 fputc ('2', stderr);
1016 fprintf (stderr, "]: <%d>, %d/%d\n", 1261 fprintf (stderr, "]: <%d>, %d/%d\n",
1017 button_number, 1262 button_number,
1018 x + 1, 1263 x + 1,
1019 y + 1); 1264 y + 1);
1020#else 1265#endif
1266
1021 tt_printf ("\033[M%c%c%c", 1267 tt_printf ("\033[M%c%c%c",
1022 (32 + button_number + key_state), 1268 (32 + button_number + key_state),
1023 (32 + x + 1), 1269 (32 + x + 1),
1024 (32 + y + 1)); 1270 (32 + y + 1));
1025#endif
1026} 1271}
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 1272
1038/*{{{ process an X event */ 1273/*{{{ process an X event */
1039void 1274void
1040rxvt_term::x_cb (XEvent &ev) 1275rxvt_term::x_cb (XEvent &ev)
1041{ 1276{
1042 SET_R (this); 1277 make_current ();
1043 SET_LOCALE (locale);
1044 1278
1045#if defined(CURSOR_BLINK) 1279 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 1280
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1281 if (ev.xany.window == vt
1055 } 1282 && SHOULD_INVOKE (HOOK_X_EVENT)
1056#endif 1283 && 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; 1284 return;
1075#endif
1076 1285
1286 // for XQueryPointer
1077 Window unused_root, unused_child; 1287 Window unused_root, unused_child;
1078 int unused_root_x, unused_root_y; 1288 int unused_root_x, unused_root_y;
1079 unsigned int unused_mask; 1289 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 1290
1130 switch (ev.type) 1291 switch (ev.type)
1131 { 1292 {
1132 case KeyPress: 1293 case KeyPress:
1294#if ISO_14755
1295 if (!(iso14755buf & ISO_14755_52))
1296#endif
1133 lookup_key (ev.xkey); 1297 lookup_key (ev.xkey);
1298
1299 break;
1300
1301 case KeyRelease:
1302 {
1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1304 KeySym keysym;
1305
1306 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1307#endif
1308
1309#if ENABLE_FRILLS || ISO_14755
1310 // ISO 14755 support
1311 if (iso14755buf)
1312 if (iso14755buf & ISO_14755_52)
1313 {
1314# if ENABLE_OVERLAY
1315 scr_overlay_off ();
1316# endif
1317# if ISO_14755
1318 // iso14755 part 5.2 handling: release time
1319 // first: controls
1320 if ((ev.xkey.state & ControlMask)
1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1323 {
1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1325 commit_iso14755 ();
1326 goto skip_switch;
1327 }
1328
1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1330 if (i[0] == keysym)
1331 {
1332 iso14755buf = ISO_14755_51 | i[1];
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 scr_bell ();
1338# endif
1339 iso14755buf = 0;
1340 break;
1341 }
1342 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347 if (iso14755buf & ISO_14755_51)
1348 commit_iso14755 ();
1349#if ISO_14755
1350 else if (iso14755buf & ISO_14755_STARTED)
1351 {
1352 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1353
1354 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1355 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1356 }
1357# endif
1358 else
1359 iso14755buf = 0;
1360 }
1361#endif
1362
1363 if (ev.xany.window == vt
1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1134 break; 1365 break;
1135 1366
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease:
1138 {
1139 if (! (ev.xkey.state & ControlMask)) 1368 if (!(ev.xkey.state & ControlMask))
1369 slip_wheel_ev.stop ();
1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1140 mouse_slip_wheel_speed = 0; 1371 mouse_slip_wheel_speed = 0;
1141 else 1372#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; 1373 break;
1150 } 1374 }
1151#endif
1152 1375
1153 case ButtonPress: 1376 case ButtonPress:
1154 button_press (ev.xbutton); 1377 button_press (ev.xbutton);
1155 break; 1378 break;
1156 1379
… …
1158 button_release (ev.xbutton); 1381 button_release (ev.xbutton);
1159 break; 1382 break;
1160 1383
1161 case ClientMessage: 1384 case ClientMessage:
1162 if (ev.xclient.format == 32 1385 if (ev.xclient.format == 32
1163 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1386 && !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 { 1387 {
1172 /* Get Dnd data */ 1388 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1173 Atom ActualType; 1389 {
1174 int ActualFormat; 1390 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1175 unsigned char *data; 1391 {
1176 unsigned long Size, RemainingBytes; 1392 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1177 1393 {
1178 XGetWindowProperty (display->display, display->root, 1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1179 xa[XA_DNDSELECTION], 1395 destroy ();
1180 0L, 1000000L, 1396 }
1181 False, AnyPropertyType, 1397#if ENABLE_EWMH
1182 &ActualType, &ActualFormat, 1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1183 &Size, &RemainingBytes, 1399 XSendEvent (xdisp, ev.xclient.window = display->root,
1400 False, SubstructureRedirectMask | SubstructureNotifyMask,
1184 &data); 1401 &ev);
1185 XChangeProperty (display->display, display->root, 1402#endif
1186 XA_CUT_BUFFER0, XA_STRING, 1403 }
1187 8, PropModeReplace, 1404 }
1188 data, STRLEN (data)); 1405#if ENABLE_XEMBED
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1406 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1407 {
1408 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1409 focus_in ();
1410 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1411 focus_out ();
1412 }
1413#endif
1191 } 1414 }
1192#endif /* OFFIX_DND */
1193 break; 1415 break;
1194 1416
1195 case MappingNotify: 1417 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping)); 1418 XRefreshKeyboardMapping (&ev.xmapping);
1197 break; 1419 break;
1198 1420
1199 /* 1421 /*
1200 * XXX: this is not the _current_ arrangement 1422 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1423 * Here's my conclusion:
… …
1220 break; 1442 break;
1221 } 1443 }
1222 break; 1444 break;
1223 1445
1224 case FocusIn: 1446 case FocusIn:
1225 if (!TermWin.focus) 1447 focus_in ();
1448 break;
1449
1450 case FocusOut:
1451 focus_out ();
1452 break;
1453
1454 case ConfigureNotify:
1455 if (ev.xconfigure.window == parent[0])
1226 { 1456 {
1227 TermWin.focus = 1; 1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1228 want_refresh = 1; 1458 ;
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 1459
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1461 {
1462 seen_resize = 1;
1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1464 }
1465
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1469 if (OPTION (Opt_transparent))
1470 check_our_parents ();
1471#endif
1238 } 1472 }
1239 break; 1473 break;
1240 1474
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: 1475 case PropertyNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0]) 1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1261 { 1477 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1262 int height, width; 1478 && ev.xproperty.state == PropertyNewValue)
1479 selection_property (ev.xproperty.window, ev.xproperty.atom);
1263 1480
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; 1481 break;
1294 1482
1295 case SelectionClear: 1483 case SelectionClear:
1296 display->set_selection_owner (0); 1484 selection_clear ();
1297 break; 1485 break;
1298 1486
1299 case SelectionNotify: 1487 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1488 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1489 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1490 break;
1304 1491
1305 case SelectionRequest: 1492 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1493 selection_send (ev.xselectionrequest);
1307 break; 1494 break;
1308 1495
1496 case MapNotify:
1497 mapped = 1;
1498#ifdef TEXT_BLINK
1499 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1500#endif
1501 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1502 break;
1503
1309 case UnmapNotify: 1504 case UnmapNotify:
1310 TermWin.mapped = 0; 1505 mapped = 0;
1311#ifdef TEXT_BLINK 1506#ifdef TEXT_BLINK
1312 text_blink_ev.stop (); 1507 text_blink_ev.stop ();
1313#endif 1508#endif
1314 break; 1509 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; 1510 break;
1322 1511
1323#ifdef TRANSPARENT 1512#ifdef TRANSPARENT
1324 case ReparentNotify: 1513 case ReparentNotify:
1325 rootwin_cb (ev); 1514 rootwin_cb (ev);
1326 break; 1515 break;
1327#endif /* TRANSPARENT */ 1516#endif /* TRANSPARENT */
1328 1517
1329 case GraphicsExpose: 1518 case GraphicsExpose:
1330 case Expose: 1519 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == vt)
1332 { 1521 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1522 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1337 // don't understand this, so commented it out 1526
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528
1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1532
1341 // ev.xexpose.width, TermWin.height, False);
1342#endif
1343 want_refresh = 1; 1533 want_refresh = 1;
1344 } 1534 }
1345 else 1535 else
1346 { 1536 {
1347 XEvent unused_event; 1537 XEvent unused_event;
1348 1538
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1350 Expose, 1540 ;
1351 &unused_event)) ; 1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1542 ;
1353 GraphicsExpose, 1543
1354 &unused_event)) ;
1355 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1356 { 1545 {
1357 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1358 scrollbar_show (0); 1547 scrollbar_show (0);
1359 } 1548 }
1360#ifdef MENUBAR 1549
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1550#ifdef TRANSPARENT
1362 menubar_expose (); 1551 if (am_transparent && ev.xany.window == parent[0])
1552 XClearWindow (xdisp, ev.xany.window);
1363#endif 1553#endif
1364 } 1554 }
1365 break; 1555 break;
1366 1556
1367 case MotionNotify: 1557 case MotionNotify:
1368#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1369 if (hidden_pointer) 1559 if (hidden_pointer)
1370 pointer_unblank (); 1560 pointer_unblank ();
1371#endif 1561#endif
1372#if MENUBAR 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1373 if (isMenuBarWindow (ev.xany.window)) 1563 break;
1564
1565 if (ev.xany.window == vt)
1374 { 1566 {
1375 menubar_control (ev.xbutton); 1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1376 break; 1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1377 } 1569 ; // 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))) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1571 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1387 ; 1573 ;
1388 1574
1389 XQueryPointer (display->display, TermWin.vt, 1575 XQueryPointer (xdisp, vt,
1390 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1578 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1579 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1581 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1582 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1583 {
1398#endif 1584#endif
1585#if ISO_14755
1586 // 5.4
1587 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1588 {
1589 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1590 break;
1591 }
1592#endif
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1593 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1594 ev.xbutton.state & Button3Mask ? 2 : 0);
1595
1401#ifdef SELECTION_SCROLLING 1596#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1597 if (ev.xbutton.y < int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1598 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1404 { 1599 {
1405 int dist; 1600 int dist;
1406
1407 pending_scroll_selection=1;
1408 1601
1409 /* don't clobber the current delay if we are 1602 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1603 * already in the middle of scrolling.
1411 */ 1604 */
1412 if (scroll_selection_delay<=0) 1605 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1606 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1607
1415 /* save the event params so we can highlight 1608 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1609 * the selection in the pending-scroll loop
1417 */ 1610 */
1418 selection_save_x=ev.xbutton.x; 1611 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1612 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1613 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1614
1423 /* calc number of lines to scroll */ 1615 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1616 if (ev.xbutton.y < int_bwidth)
1425 { 1617 {
1426 scroll_selection_dir = UP; 1618 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1619 dist = int_bwidth - ev.xbutton.y;
1428 } 1620 }
1429 else 1621 else
1430 { 1622 {
1431 scroll_selection_dir = DN; 1623 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y - 1624 dist = ev.xbutton.y - (int_bwidth + height);
1433 (TermWin.int_bwidth + TermWin.height);
1434 } 1625 }
1626
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1627 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1628 / SELECTION_SCROLL_LINE_SPEEDUP
1629 + 1;
1437 MIN_IT (scroll_selection_lines, 1630 min_it (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1631 SELECTION_SCROLL_MAX_LINES);
1439 } 1632 }
1440 else 1633 else
1441 { 1634 {
1442 /* we are within the text window, so we 1635 /* we are within the text window, so we
1443 * shouldn't be scrolling 1636 * shouldn't be scrolling
1444 */ 1637 */
1445 pending_scroll_selection = 0; 1638 if (sel_scroll_ev.active)
1639 sel_scroll_ev.stop();
1446 } 1640 }
1447#endif 1641#endif
1448#ifdef MOUSE_THRESHOLD 1642#ifdef MOUSE_THRESHOLD
1449
1450 } 1643 }
1451#endif 1644#endif
1452
1453 } 1645 }
1454 } 1646 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1648 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1458 MotionNotify, &ev)) ; 1650 MotionNotify, &ev))
1651 ;
1652
1459 XQueryPointer (display->display, scrollBar.win, 1653 XQueryPointer (xdisp, scrollBar.win,
1460 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1656 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1657 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1659 scrollbar_size ());
1466 scr_refresh (refresh_type); 1660 want_refresh = 1;
1467 refresh_limit = 0; 1661 refresh_limit = 0;
1468 scrollbar_show (1); 1662 scrollbar_show (1);
1469 } 1663 }
1470 break; 1664 break;
1471 } 1665 }
1472}
1473 1666
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1671 {
1672 if (hidden_cursor)
1673 {
1674 hidden_cursor = 0;
1675 want_refresh = 1;
1676 }
1677
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1679 }
1680#endif
1681
1682#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 {
1685 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease)
1688 if (hidden_pointer)
1689 pointer_unblank ();
1690
1691 if (ev.type == KeyPress && hidden_pointer == 0)
1692 pointer_blank ();
1693 }
1694#endif
1695}
1696
1697void
1698rxvt_term::focus_in ()
1699{
1700 if (!focus)
1701 {
1702 focus = 1;
1703 want_refresh = 1;
1704
1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1707#if USE_XIM
1708 if (Input_Context != NULL)
1709 {
1710 IMSetStatusPosition ();
1711 XSetICFocus (Input_Context);
1712 }
1713#endif
1714#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717#endif
1718#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade])
1720 {
1721 pix_colors = pix_colors_focused;
1722 scr_recolour ();
1723 }
1724#endif
1725 }
1726}
1727
1728void
1729rxvt_term::focus_out ()
1730{
1731 if (focus)
1732 {
1733 focus = 0;
1734 want_refresh = 1;
1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1741 iso14755buf = 0;
1742# if ENABLE_OVERLAY
1743 scr_overlay_off ();
1744# endif
1745 }
1746#endif
1747#if USE_XIM
1748 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context);
1750#endif
1751#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink))
1753 cursor_blink_ev.stop ();
1754 hidden_cursor = 0;
1755#endif
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 pix_colors = pix_colors_unfocused;
1760 scr_recolour ();
1761 }
1762#endif
1763 }
1764}
1765
1766#if TRANSPARENT
1474void 1767void
1475rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1769{
1477 SET_R (this); 1770 make_current ();
1478 SET_LOCALE (locale);
1479 1771
1480 switch (ev.type) 1772 switch (ev.type)
1481 { 1773 {
1482 case PropertyNotify: 1774 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 /* 1775 /*
1493 * if user used some Esetroot compatible prog to set the root bg, 1776 * 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. 1777 * use the property to determine the pixmap. We use it later on.
1495 */ 1778 */
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]) 1779 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1780 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1500 return; 1781 return;
1501 }
1502 1782
1503 /* FALLTHROUGH */ 1783 /* FALLTHROUGH */
1504 case ReparentNotify: 1784 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1785 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1786 want_refresh = want_full_refresh = 1;
1508 break; 1787 break;
1509#endif
1510 } 1788 }
1511} 1789}
1790#endif
1512 1791
1513void 1792void
1514rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
1515{ 1794{
1516 int reportmode = 0, clickintime; 1795 int reportmode = 0, clickintime;
1517 1796
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1797 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1798
1519 if (!bypass_keystate) 1799 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801
1521 /* 1802 /*
1522 * VT window processing of button press 1803 * VT window processing of button press
1523 */ 1804 */
1524 if (ev.window == TermWin.vt) 1805 if (ev.window == vt)
1525 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1810#if ISO_14755
1811 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 {
1814 iso14755_54 (ev.x, ev.y);
1815 return;
1816 }
1817#endif
1818
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1819 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1820
1527 if (reportmode) 1821 if (reportmode)
1528 { 1822 {
1529 /* mouse report from vt window */ 1823 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1824 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1825 MEvent.state = ev.state;
1532#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1533 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1534 { 1828 {
1535 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1536 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1537 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1538 { 1833 {
1539 /* only report double clicks */ 1834 /* only report double clicks */
1540 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1541 mouse_report (ev); 1836 mouse_report (ev);
… …
1560 } 1855 }
1561 else 1856 else
1562 { 1857 {
1563 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1859 MEvent.clicks = 0;
1860
1565 switch (ev.button) 1861 switch (ev.button)
1566 { 1862 {
1567 case Button1: 1863 case Button1:
1864 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */
1866#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask);
1868#else
1869 selection.rect = false;
1870#endif
1871
1568 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1570 { 1874 {
1571 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1573 else 1877 else
1574 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
… …
1589 case Button3: 1893 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1592 else 1896 else
1593 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1898
1594 MEvent.button = Button3; 1899 MEvent.button = Button3;
1595 break; 1900 break;
1596 } 1901 }
1597 } 1902 }
1903
1598 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1599 return; 1905 return;
1600 } 1906 }
1601 1907
1602 /* 1908 /*
… …
1668 upordown = 1; /* down */ 1974 upordown = 1; /* down */
1669 } 1975 }
1670 if (upordown) 1976 if (upordown)
1671 { 1977 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1979 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 1980#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 1981 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 1982 {
1677 if (upordown < 0) 1983 if (upordown < 0)
1678 scrollBar.setUp (); 1984 scrollBar.setUp ();
… …
1694 break; 2000 break;
1695 case R_SB_ALIGN_BOTTOM: 2001 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 2002 csrO = scrollBar.bot - scrollBar.top;
1697 break; 2003 break;
1698 } 2004 }
2005
1699 if (scrollBar.style == R_SB_XTERM 2006 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 2007 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 2008 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 2009 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 2010
1704 scrollBar.setMotion (); 2011 scrollBar.setMotion ();
1705 break; 2012 break;
1706 2013
1707 case Button1: 2014 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2015 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1712 case Button3: 2019 case Button3:
1713 if (scrollBar.style != R_SB_XTERM) 2020 if (scrollBar.style != R_SB_XTERM)
1714 { 2021 {
1715 if (scrollbar_above_slider (ev.y)) 2022 if (scrollbar_above_slider (ev.y))
1716# ifdef RXVT_SCROLL_FULL 2023# ifdef RXVT_SCROLL_FULL
1717 scr_page (UP, TermWin.nrow - 1); 2024 scr_page (UP, nrow - 1);
1718# else 2025# else
1719 scr_page (UP, TermWin.nrow / 4); 2026 scr_page (UP, nrow / 4);
1720# endif 2027# endif
1721 else if (scrollbar_below_slider (ev.y)) 2028 else if (scrollbar_below_slider (ev.y))
1722# ifdef RXVT_SCROLL_FULL 2029# ifdef RXVT_SCROLL_FULL
1723 scr_page (DN, TermWin.nrow - 1); 2030 scr_page (DN, nrow - 1);
1724# else 2031# else
1725 scr_page (DN, TermWin.nrow / 4); 2032 scr_page (DN, nrow / 4);
1726# endif 2033# endif
1727 else 2034 else
1728 scrollBar.setMotion (); 2035 scrollBar.setMotion ();
1729 } 2036 }
1730 else 2037 else
1731 { 2038 {
1732 scr_page ((ev.button == Button1 ? DN : UP), 2039 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 2040 (nrow
1734 * scrollbar_position (ev.y) 2041 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 2042 / scrollbar_size ()));
1736 } 2043 }
2044
1737 break; 2045 break;
1738 } 2046 }
1739 } 2047 }
2048
1740 return; 2049 return;
1741 } 2050 }
1742#if MENUBAR
1743 /*
1744 * Menubar window processing of button press
1745 */
1746 if (isMenuBarWindow (ev.window))
1747 menubar_control (ev);
1748#endif
1749} 2051}
1750 2052
1751void 2053void
1752rxvt_term::button_release (XButtonEvent &ev) 2054rxvt_term::button_release (XButtonEvent &ev)
1753{ 2055{
1754 int reportmode = 0; 2056 int reportmode = 0;
1755 2057
1756 csrO = 0; /* reset csr Offset */ 2058 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 2059 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2060 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 2061
1760 if (scrollbar_isUpDn ()) 2062 if (scrollbar_isUpDn ())
1761 { 2063 {
1762 scrollBar.setIdle (); 2064 scrollBar.setIdle ();
1763 scrollbar_show (0); 2065 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH;
1766#endif
1767
1768 } 2066 }
2067
1769#ifdef SELECTION_SCROLLING 2068#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 2069 if (sel_scroll_ev.active)
2070 sel_scroll_ev.stop();
1771#endif 2071#endif
2072
1772 if (ev.window == TermWin.vt) 2073 if (ev.window == vt)
1773 { 2074 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2076 return;
2077
2078#if ISO_14755
2079 // 5.4
2080 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2081 return;
2082#endif
2083
1774 if (reportmode) 2084 if (reportmode)
1775 { 2085 {
1776 /* mouse report from vt window */ 2086 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 2087 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 2088 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 2102 MEvent.button = AnyButton;
1793 mouse_report (ev); 2103 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 2104#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 2105 return;
1796 } 2106 }
2107
1797 /* 2108 /*
1798 * dumb hack to compensate for the failure of click-and-drag 2109 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 2110 * when overriding mouse reporting
1800 */ 2111 */
1801 if (PrivateModes & PrivMode_mouse_report 2112 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2113 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2114 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2115 selection_extend (ev.x, ev.y, 0);
1805 2116
1806 switch (ev.button) 2117 switch (ev.button)
1807 { 2118 {
1808 case Button1: 2119 case Button1:
1809 case Button3: 2120 case Button3:
1810 selection_make (ev.time); 2121 selection_make (ev.time);
1811 break; 2122 break;
2123
1812 case Button2: 2124 case Button2:
1813 selection_request (ev.time, ev.x, ev.y); 2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1814 break; 2127 break;
2128
1815#ifdef MOUSE_WHEEL 2129#ifdef MOUSE_WHEEL
1816 case Button4: 2130 case Button4:
1817 case Button5: 2131 case Button5:
1818 { 2132 {
1819 int i; 2133 int i;
1820 page_dirn v; 2134 page_dirn v;
1821 2135
1822 v = (ev.button == Button4) ? UP : DN; 2136 v = ev.button == Button4 ? UP : DN;
2137
1823 if (ev.state & ShiftMask) 2138 if (ev.state & ShiftMask)
1824 i = 1; 2139 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2140 else if (OPTION (Opt_mouseWheelScrollPage))
1826 i = TermWin.nrow - 1; 2141 i = nrow - 1;
1827 else 2142 else
1828 i = 5; 2143 i = 5;
2144
1829# ifdef MOUSE_SLIP_WHEELING 2145# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2146 if (ev.state & ControlMask)
1831 { 2147 {
1832 mouse_slip_wheel_speed += (v ? -1 : 1); 2148 mouse_slip_wheel_speed += v ? -1 : 1;
2149 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2150 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2151
2152 if (slip_wheel_ev.at < NOW)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2153 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2154
2155 slip_wheel_ev.start ();
2156 }
2157 else
2158 {
2159# endif
2160 scr_page (v, i);
2161 scrollbar_show (1);
2162# ifdef MOUSE_SLIP_WHEELING
1834 } 2163 }
1835# endif 2164# 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 } 2165 }
1850 break; 2166 break;
1851#endif 2167#endif
1852
1853 } 2168 }
1854 } 2169 }
1855#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev);
1858#endif
1859} 2170}
1860
1861 2171
1862#ifdef TRANSPARENT 2172#ifdef TRANSPARENT
2173#if TINTING
2174/* taken from aterm-0.4.2 */
2175
2176typedef uint32_t RUINT32T;
2177
2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2179{
2180 int sh_r, sh_g, sh_b;
2181 RUINT32T mask_r, mask_g, mask_b;
2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2185 int i;
2186
2187 Visual *visual = term->visual;
2188
2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2190
2191 /* for convenience */
2192 mask_r = visual->red_mask;
2193 mask_g = visual->green_mask;
2194 mask_b = visual->blue_mask;
2195
2196 /* boring lookup table pre-initialization */
2197 switch (srcImage->bits_per_pixel) {
2198 case 15:
2199 if ((mask_r != 0x7c00) ||
2200 (mask_g != 0x03e0) ||
2201 (mask_b != 0x001f))
2202 return;
2203 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2204 lookup_r = lookup;
2205 lookup_g = lookup+32;
2206 lookup_b = lookup+32+32;
2207 sh_r = 10;
2208 sh_g = 5;
2209 sh_b = 0;
2210 break;
2211 case 16:
2212 if ((mask_r != 0xf800) ||
2213 (mask_g != 0x07e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+64;
2220 sh_r = 11;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 24:
2225 if ((mask_r != 0xff0000) ||
2226 (mask_g != 0x00ff00) ||
2227 (mask_b != 0x0000ff))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2230 lookup_r = lookup;
2231 lookup_g = lookup+256;
2232 lookup_b = lookup+256+256;
2233 sh_r = 16;
2234 sh_g = 8;
2235 sh_b = 0;
2236 break;
2237 case 32:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 default:
2251 return; /* we do not support this color depth */
2252 }
2253
2254 /* prepare limits for color transformation (each channel is handled separately) */
2255 if (shade < 0) {
2256 shade = -shade;
2257 if (shade < 0) shade = 0;
2258 if (shade > 100) shade = 100;
2259
2260 lower_lim_r = 65535-rm;
2261 lower_lim_g = 65535-gm;
2262 lower_lim_b = 65535-bm;
2263
2264 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2265 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2266 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2267
2268 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2269 } else {
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2274
2275 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2276 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2277 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2278 }
2279
2280 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2281 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2282 {
2283 unsigned int tmp;
2284
2285 tmp = lower_lim_r;
2286 lower_lim_r = lower_lim_b;
2287 lower_lim_b = tmp;
2288
2289 tmp = upper_lim_r;
2290 upper_lim_r = upper_lim_b;
2291 upper_lim_b = tmp;
2292 }
2293
2294 /* fill our lookup tables */
2295 for (i = 0; i <= mask_r>>sh_r; i++)
2296 {
2297 RUINT32T tmp;
2298 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2299 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2300 lookup_r[i] = (tmp/65535)<<sh_r;
2301 }
2302 for (i = 0; i <= mask_g>>sh_g; i++)
2303 {
2304 RUINT32T tmp;
2305 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2306 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2307 lookup_g[i] = (tmp/65535)<<sh_g;
2308 }
2309 for (i = 0; i <= mask_b>>sh_b; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2313 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2314 lookup_b[i] = (tmp/65535)<<sh_b;
2315 }
2316
2317 /* apply table to input image (replacing colors by newly calculated ones) */
2318 switch (srcImage->bits_per_pixel)
2319 {
2320 case 15:
2321 {
2322 unsigned short *p1, *pf, *p, *pl;
2323 p1 = (unsigned short *) srcImage->data;
2324 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2325 while (p1 < pf)
2326 {
2327 p = p1;
2328 pl = p1 + srcImage->width;
2329 for (; p < pl; p++)
2330 {
2331 *p = lookup_r[(*p & 0x7c00)>>10] |
2332 lookup_g[(*p & 0x03e0)>> 5] |
2333 lookup_b[(*p & 0x001f)];
2334 }
2335 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2336 }
2337 break;
2338 }
2339 case 16:
2340 {
2341 unsigned short *p1, *pf, *p, *pl;
2342 p1 = (unsigned short *) srcImage->data;
2343 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2344 while (p1 < pf)
2345 {
2346 p = p1;
2347 pl = p1 + srcImage->width;
2348 for (; p < pl; p++)
2349 {
2350 *p = lookup_r[(*p & 0xf800)>>11] |
2351 lookup_g[(*p & 0x07e0)>> 5] |
2352 lookup_b[(*p & 0x001f)];
2353 }
2354 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2355 }
2356 break;
2357 }
2358 case 24:
2359 {
2360 unsigned char *p1, *pf, *p, *pl;
2361 p1 = (unsigned char *) srcImage->data;
2362 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2363 while (p1 < pf)
2364 {
2365 p = p1;
2366 pl = p1 + srcImage->width * 3;
2367 for (; p < pl; p += 3)
2368 {
2369 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2370 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2371 p[2] = lookup_r[(p[2] & 0x0000ff)];
2372 }
2373 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2374 }
2375 break;
2376 }
2377 case 32:
2378 {
2379 RUINT32T *p1, *pf, *p, *pl;
2380 p1 = (RUINT32T *) srcImage->data;
2381 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2382
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xff0000)>>16] |
2390 lookup_g[(*p & 0x00ff00)>> 8] |
2391 lookup_b[(*p & 0x0000ff)] |
2392 (*p & ~0xffffff);
2393 }
2394 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2395 }
2396 break;
2397 }
2398 }
2399
2400 free (lookup);
2401}
2402#endif
2403
1863/* 2404/*
1864 * Check our parents are still who we think they are. 2405 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2406 * Do transparency updates if required
1866 */ 2407 */
1867int 2408int
1868rxvt_term::check_our_parents () 2409rxvt_term::check_our_parents ()
1869{ 2410{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2411 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2412 unsigned long nitems, bytes_after;
1872 Atom atype; 2413 Atom atype;
1873 unsigned char *prop = NULL; 2414 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2415 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
1877 2418
1878 pchanged = 0; 2419 pchanged = 0;
1879 2420
1880 if (! (Options & Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
1882 2423
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
1885 2426
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2428
1887 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
1888 { 2430 {
1889 if (am_transparent) 2431 if (am_transparent)
1890 { 2432 {
1891 pchanged = 1; 2433 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
1895 } 2436 }
2437
1896 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
1897 } 2439 }
1898 2440
1899 /* Get all X ops out of the queue so that our information is up-to-date. */ 2441 /* Get all X ops out of the queue so that our information is up-to-date. */
1900 XSync (display->display, False); 2442 XSync (xdisp, False);
1901 2443
1902 /* 2444 /*
1903 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
1905 * windows for each client, so we have to take care about that. 2447 * windows for each client, so we have to take care about that.
1906 */ 2448 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2449 i = (xa[XA_XROOTPMAP_ID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2452 &nitems, &bytes_after, &prop) == Success);
2453
1911 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2455 i = (xa[XA_ESETROOT_PMAP_ID]
2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2458 &nitems, &bytes_after, &prop) == Success);
2459
2460 if (!i || prop == NULL
2461#if TINTING
2462 || !ISSET_PIXCOLOR (Color_tint)
2463#endif
2464 )
1912 have_pixmap = 0; 2465 have_pixmap = 0;
1913 else 2466 else
1914 { 2467 {
1915 have_pixmap = 1; 2468 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2469 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2470 XFree (prop);
1918 } 2471 }
2472
1919 if (have_pixmap) 2473 if (have_pixmap)
1920 { 2474 {
1921 /* 2475 /*
1922 * Copy display->root pixmap transparency 2476 * Copy display->root pixmap transparency
1923 */ 2477 */
… …
1926 Window cr; 2480 Window cr;
1927 XImage *image; 2481 XImage *image;
1928 GC gc; 2482 GC gc;
1929 XGCValues gcvalue; 2483 XGCValues gcvalue;
1930 2484
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2489 nx = ny = 0;
1936 2490
1937 if (sx < 0) 2491 if (sx < 0)
… …
1946 nh += sy; 2500 nh += sy;
1947 ny = -sy; 2501 ny = -sy;
1948 sy = 0; 2502 sy = 0;
1949 } 2503 }
1950 2504
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2507
2508 XSync (xdisp, False);
1953 allowedxerror = -1; 2509 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2511
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2514 allowedxerror = 0;
2515
1959 if (image == NULL) 2516 if (image == NULL)
1960 { 2517 {
1961 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
1962 { 2519 {
1963 pchanged = 1; 2520 pchanged = 1;
1964 if (TermWin.pixmap != None) 2521 if (pixmap != None)
1965 { 2522 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2523 XFreePixmap (xdisp, pixmap);
1967 TermWin.pixmap = None; 2524 pixmap = None;
1968 } 2525 }
1969 } 2526 }
2527
1970 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
1971 } 2529 }
1972 else 2530 else
1973 { 2531 {
1974 if (TermWin.pixmap != None) 2532 if (pixmap != None)
1975 XFreePixmap (display->display, TermWin.pixmap); 2533 XFreePixmap (xdisp, pixmap);
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2534
1977 (unsigned int)szHint.width, 2535#if TINTING
1978 (unsigned int)szHint.height, 2536 if (ISSET_PIXCOLOR (Color_tint))
1979 (unsigned int)image->depth); 2537 {
2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2539
2540 rgba c;
2541 pix_colors_focused [Color_tint].get (c);
2542
2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2544 }
2545#endif
2546
2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2550 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2551 XFreeGC (xdisp, gc);
1985 XDestroyImage (image); 2552 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
1987 TermWin.pixmap); 2554 XClearWindow (xdisp, parent[0]);
2555
1988 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2557 pchanged = 1;
2558
1990 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
1991 } 2560 }
1992 } 2561 }
1993 2562
1994 if (!am_pixmap_trans) 2563 if (am_pixmap_trans)
2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2565 else
1995 { 2566 {
1996 unsigned int n; 2567 unsigned int n;
1997 /* 2568 /*
1998 * InheritPixmap transparency 2569 * InheritPixmap transparency
1999 */ 2570 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2572 {
2004 oldp = TermWin.parent[i]; 2573 oldp = parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2006 &TermWin.parent[i], &list, &n);
2007 XFree (list); 2575 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2576
2009 if (TermWin.parent[i] == display->root) 2577 if (parent[i] == display->root)
2010 { 2578 {
2011 if (oldp != None) 2579 if (oldp != None)
2012 pchanged = 1; 2580 pchanged = 1;
2581
2013 break; 2582 break;
2014 } 2583 }
2584
2015 if (oldp != TermWin.parent[i]) 2585 if (oldp != parent[i])
2016 pchanged = 1; 2586 pchanged = 1;
2017 } 2587 }
2018 2588
2019 n = 0; 2589 n = 0;
2020 2590
2021 if (pchanged) 2591 if (pchanged)
2022 {
2023 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2597 {
2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2599 break;
2600 }
2601 }
2602
2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2024 { 2613 {
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2615 XClearWindow (xdisp, parent[n]);
2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643
2644/*}}} */
2645
2646bool
2647rxvt_term::cmd_parse ()
2648{
2649 bool flag = false;
2650 wchar_t ch = NOCHAR;
2651 char *seq_begin; // remember start of esc-sequence here
2652
2653 for (;;)
2654 {
2655 if (ch == NOCHAR)
2656 {
2657 seq_begin = cmdbuf_ptr;
2658 ch = next_char ();
2659
2660 if (ch == NOCHAR)
2661 break;
2662 }
2663
2664 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2665 {
2666 if (!seen_input)
2667 {
2668 seen_input = 1;
2669 // many badly-written programs (e.g. jed) contain a race condition:
2670 // they first read the screensize and then install a SIGWINCH handler.
2671 // some window managers resize the window early, and these programs
2672 // then sometimes get the size wrong.
2673 // unfortunately other programs are even more buggy and dislike
2674 // being sent SIGWINCH, so only do it when we were in fact being
2675 // resized.
2676 if (seen_resize && cmd_pid)
2677 kill (-cmd_pid, SIGWINCH);
2678 }
2679
2680 /* Read a text string from the input buffer */
2681 wchar_t buf[UBUFSIZ];
2682 bool refreshnow = false;
2683 int nlines = 0;
2684 wchar_t *str = buf;
2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2686
2687 for (;;)
2688 {
2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2690 break;
2691
2692 *str++ = ch;
2693
2694 if (ch == C0_LF || str >= eol)
2028 { 2695 {
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2696 if (ch == C0_LF)
2697 nlines++;
2698
2699 refresh_count++;
2700
2701 if (!OPTION (Opt_jumpScroll)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 {
2704 refreshnow = true;
2705 refresh_count = 0;
2706 ch = NOCHAR;
2030 break; 2707 break;
2708 }
2709
2710 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1)
2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2715 scr_add_lines (buf, str - buf, nlines);
2716
2717 nlines = 0;
2718 str = buf;
2719 eol = str + min (ncol, UBUFSIZ);
2720 }
2721
2722 if (str >= eol)
2723 {
2724 if (eol >= buf + UBUFSIZ)
2725 {
2726 ch = NOCHAR;
2727 break;
2728 }
2729 else
2730 eol = min (eol + ncol, buf + UBUFSIZ);
2731 }
2732
2733 }
2734
2735 seq_begin = cmdbuf_ptr;
2736 ch = next_char ();
2737 }
2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines);
2742
2743 /*
2744 * If there have been a lot of new lines, then update the screen
2745 * What the heck I'll cheat and only refresh less than every page-full.
2746 * the number of pages between refreshes is refresh_limit, which
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */
2749 if (refreshnow)
2750 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true;
2756 scr_refresh ();
2757 want_refresh = 1;
2031 } 2758 }
2032 } 2759 }
2033 }
2034 2760
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 } 2761 }
2046 else 2762 else
2047 { 2763 {
2048 /* wait (an arbitrary period) for the WM to do its thing 2764 try
2049 * needed for fvwm2.2.2 (and before?) */ 2765 {
2050# ifdef HAVE_NANOSLEEP 2766 process_nonprinting (ch);
2051 struct timespec rqt; 2767 }
2768 catch (const class out_of_input &o)
2769 {
2770 // we ran out of input, retry later
2771 cmdbuf_ptr = seq_begin;
2772 break;
2773 }
2052 2774
2053 rqt.tv_sec = 1; 2775 ch = NOCHAR;
2054 rqt.tv_nsec = 0; 2776 }
2055 nanosleep (&rqt, NULL); 2777 }
2056# else 2778
2057 sleep (1); 2779 return flag;
2058# endif 2780}
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2781
2060 for (n = 0; n < (unsigned int)i; n++) 2782// read the next character
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2783wchar_t
2062 ParentRelative); 2784rxvt_term::next_char () NOTHROW
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2785{
2064 ParentRelative); 2786 while (cmdbuf_ptr < cmdbuf_endp)
2065 am_transparent = 1; 2787 {
2788 // assume 7-bit to be ascii ALWAYS
2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2790 return *cmdbuf_ptr++;
2791
2792 wchar_t wc;
2793 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2794
2795 if (len == (size_t)-2)
2066 } 2796 {
2797 // the mbstate stores incomplete sequences. didn't know this :/
2798 cmdbuf_ptr = cmdbuf_endp;
2799 break;
2800 }
2067 2801
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2802 if (len == (size_t)-1)
2069 TermWin.parent[i] = None; 2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2804
2805 // assume wchar == unicode
2806 cmdbuf_ptr += len;
2807 return wc & UNICODE_MASK;
2070 } 2808 }
2809
2810 return NOCHAR;
2811}
2812
2813// read the next octet
2814uint32_t
2815rxvt_term::next_octet () NOTHROW
2816{
2817 return cmdbuf_ptr < cmdbuf_endp
2818 ? (unsigned char)*cmdbuf_ptr++
2819 : NOCHAR;
2820}
2821
2822static class out_of_input out_of_input;
2823
2824/* rxvt_cmd_getc () - Return next input character */
2825/*
2826 * Return the next input character after first passing any keyboard input
2827 * to the command.
2828 */
2829wchar_t
2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2831{
2832 wchar_t c = next_char ();
2833
2834 if (c == NOCHAR)
2835 throw out_of_input;
2836
2071 return pchanged; 2837 return c;
2072} 2838}
2073#endif
2074 2839
2075/*}}} */ 2840uint32_t
2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2842{
2843 uint32_t c = next_octet ();
2844
2845 if (c == NOCHAR)
2846 throw out_of_input;
2847
2848 return c;
2849}
2076 2850
2077/*{{{ print pipe */ 2851/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2852/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2853#ifdef PRINTPIPE
2080FILE * 2854FILE *
2081rxvt_term::popen_printer () 2855rxvt_term::popen_printer ()
2082{ 2856{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2857 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2858
2085 if (stream == NULL) 2859 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2860 rxvt_warn ("can't open printer pipe, not printing.\n");
2861
2087 return stream; 2862 return stream;
2088} 2863}
2089 2864
2090int 2865int
2091rxvt_term::pclose_printer (FILE *stream) 2866rxvt_term::pclose_printer (FILE *stream)
2092{ 2867{
2093 fflush (stream); 2868 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); 2869 return pclose (stream);
2100# endif
2101} 2870}
2102 2871
2103/* 2872/*
2104 * simulate attached vt100 printer 2873 * simulate attached vt100 printer
2105 */ 2874 */
2106void 2875void
2107rxvt_term::process_print_pipe () 2876rxvt_term::process_print_pipe ()
2108{ 2877{
2109 int done; 2878 int done;
2110 FILE *fd; 2879 FILE *fd;
2111 2880
2112 if ((fd = popen_printer ()) == NULL) 2881 if ((fd = popen_printer ()) == NULL)
2113 return; 2882 return;
2114 2883
2115 /* 2884 /*
2116 * Send all input to the printer until either ESC[4i or ESC[?4i 2885 * Send all input to the printer until either ESC[4i or ESC[?4i
2117 * is received. 2886 * is received.
2118 */ 2887 */
2119 for (done = 0; !done;) 2888 for (done = 0; !done;)
2120 { 2889 {
2121 unsigned char buf[8]; 2890 unsigned char buf[8];
2122 unsigned char ch; 2891 unicode_t ch;
2123 unsigned int i, len; 2892 unsigned int i, len;
2124 2893
2125 if ((ch = cmd_getc ()) != C0_ESC) 2894 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2895 {
2127 if (putc (ch, fd) == EOF) 2896 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2897 break; /* done = 1 */
… …
2143 { 2912 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2913 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2914 break; /* done = 1 */
2146 } 2915 }
2147 } 2916 }
2917
2148 for (i = 0; i < len; i++) 2918 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2919 if (putc (buf[i], fd) == EOF)
2150 { 2920 {
2151 done = 1; 2921 done = 1;
2152 break; 2922 break;
2153 } 2923 }
2154 } 2924 }
2155 } 2925 }
2926
2156 pclose_printer (fd); 2927 pclose_printer (fd);
2157} 2928}
2158#endif /* PRINTPIPE */ 2929#endif /* PRINTPIPE */
2159/*}}} */ 2930/*}}} */
2160 2931
2161/* *INDENT-OFF* */ 2932/* *INDENT-OFF* */
2162enum { 2933enum {
2163 C1_40 = 0x40, 2934 C1_40 = 0x40,
2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2935 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, 2936 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, 2937 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 2938 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2168}; 2939};
2169/* *INDENT-ON* */ 2940/* *INDENT-ON* */
2170 2941
2171/*{{{ process non-printing single characters */ 2942/*{{{ process non-printing single characters */
2172void 2943void
2173rxvt_term::process_nonprinting (unsigned char ch) 2944rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2945{
2175 switch (ch) 2946 switch (ch)
2176 { 2947 {
2948 case C0_ESC:
2949 process_escape_seq ();
2950 break;
2177 case C0_ENQ: /* terminal Status */ 2951 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2952 if (rs[Rs_answerbackstring])
2179 tt_write ( 2953 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 2954 else
2183 tt_write ((unsigned char *)VT100_ANS, 2955 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2956 break;
2186 case C0_BEL: /* bell */ 2957 case C0_BEL: /* bell */
2187 scr_bell (); 2958 scr_bell ();
2188 break; 2959 break;
2189 case C0_BS: /* backspace */ 2960 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2975 scr_charset_choose (1);
2205 break; 2976 break;
2206 case C0_SI: /* shift in - acs */ 2977 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2978 scr_charset_choose (0);
2208 break; 2979 break;
2980
2981#ifdef EIGHT_BIT_CONTROLS
2982 // 8-bit controls
2983 case 0x90: /* DCS */
2984 process_dcs_seq ();
2985 break;
2986 case 0x9b: /* CSI */
2987 process_csi_seq ();
2988 break;
2989 case 0x9d: /* CSI */
2990 process_osc_seq ();
2991 break;
2992#endif
2209 } 2993 }
2210} 2994}
2211/*}}} */ 2995/*}}} */
2212 2996
2213 2997
2214/*{{{ process VT52 escape sequences */ 2998/*{{{ process VT52 escape sequences */
2215void 2999void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 3000rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 3001{
2218 int row, col; 3002 int row, col;
2219 3003
2220 switch (ch) 3004 switch (ch)
2221 { 3005 {
… …
2273 3057
2274/*{{{ process escape sequences */ 3058/*{{{ process escape sequences */
2275void 3059void
2276rxvt_term::process_escape_seq () 3060rxvt_term::process_escape_seq ()
2277{ 3061{
2278 unsigned char ch = cmd_getc (); 3062 unicode_t ch = cmd_getc ();
2279 3063
2280 if (PrivateModes & PrivMode_vt52) 3064 if (priv_modes & PrivMode_vt52)
2281 { 3065 {
2282 process_escape_vt52 (ch); 3066 process_escape_vt52 (ch);
2283 return; 3067 return;
2284 } 3068 }
2285 3069
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 3085 break;
2302 case '+': 3086 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 3088 break;
2305#ifndef NO_FRILLS 3089#if !ENABLE_MINIMAL
2306 case '6': 3090 case '6':
2307 scr_backindex (); 3091 scr_backindex ();
2308 break; 3092 break;
2309#endif 3093#endif
2310 case '7': 3094 case '7':
2311 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
2312 break; 3096 break;
2313 case '8': 3097 case '8':
2314 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
2315 break; 3099 break;
2316#ifndef NO_FRILLS 3100#if !ENABLE_MINIMAL
2317 case '9': 3101 case '9':
2318 scr_forwardindex (); 3102 scr_forwardindex ();
2319 break; 3103 break;
2320#endif 3104#endif
2321 case '=': 3105 case '=':
… …
2331 break; 3115 break;
2332 3116
2333 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
2335 { 3119 {
2336 uint32_t nlcr[] = { '\n', '\r' }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2338 } 3122 }
2339 break; 3123 break;
2340 3124
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
2342 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
2352 case C1_RI: /* ESC M */ 3136 case C1_RI: /* ESC M */
2353 scr_index (DN); 3137 scr_index (DN);
2354 break; 3138 break;
2355 3139
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 3140 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 3141 /*case C1_SS2: scr_single_shift (2); break; */
2358 3142
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 3143 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 3144 /*case C1_SS3: scr_single_shift (3); break; */
2361 3145
2362 /* 8.3.27: DEVICE CONTROL STRING */ 3146 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 3147 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 3148 process_dcs_seq ();
2365 break; 3149 break;
2366 3150
2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2368 case C1_SCI: /* ESC Z */ 3152 case C1_SCI: /* ESC Z */
2369 tt_write ((const unsigned char *)ESCZ_ANSWER, 3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2371 break; /* steal obsolete ESC [ c */ 3154 break; /* steal obsolete ESC [ c */
2372 3155
2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2374 case C1_CSI: /* ESC [ */ 3157 case C1_CSI: /* ESC [ */
2375 process_csi_seq (); 3158 process_csi_seq ();
… …
2380 process_osc_seq (); 3163 process_osc_seq ();
2381 break; 3164 break;
2382 3165
2383 /* 8.3.106: RESET TO INITIAL STATE */ 3166 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 3167 case 'c':
3168 mbstate.reset ();
2385 scr_poweron (); 3169 scr_poweron ();
2386 scrollbar_show (1); 3170 scrollbar_show (1);
2387 break; 3171 break;
2388 3172
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3173 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 3185
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3186/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 3187/* *INDENT-OFF* */
2404enum { 3188enum {
2405 CSI_ICH = 0x40, 3189 CSI_ICH = 0x40,
2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3190 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 , 3191 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, 3192 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, 3193 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, 3194 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, 3195 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, */ 3210 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, [, \, ], ^, _, */ 3211 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, */ 3212 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, */ 3213 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, */ 3214 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, {, |, }, ~, */ 3215 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2432 }; 3216 };
2433/* *INDENT-ON* */ 3217/* *INDENT-ON* */
2434 3218
2435void 3219void
2436rxvt_term::process_csi_seq () 3220rxvt_term::process_csi_seq ()
2437{ 3221{
2438 unsigned char ch, priv, i; 3222 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 3223 unsigned int nargs, p;
2440 int n, ndef; 3224 int n, ndef;
2441 int arg[ESC_ARGS]; 3225 int arg[ESC_ARGS];
2442 3226
2443 for (nargs = ESC_ARGS; nargs > 0;) 3227 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 3228 arg[--nargs] = 0;
2445 3229
2446 priv = 0; 3230 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 3232 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 3233 { /* '<' '=' '>' '?' */
2450 priv = ch; 3234 priv = ch;
2451 ch = cmd_getc (); 3235 ch = cmd_getc ();
2452 } 3236 }
3237
2453 /* read any numerical arguments */ 3238 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 3239 for (n = -1; ch < CSI_ICH; )
2455 { 3240 {
2456 if (isdigit (ch)) 3241 if (isdigit (ch))
2457 { 3242 {
… …
2464 { 3249 {
2465 if (nargs < ESC_ARGS) 3250 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 3251 arg[nargs++] = n;
2467 n = -1; 3252 n = -1;
2468 } 3253 }
2469 else if (ch == '\b') 3254 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); 3255 process_nonprinting (ch);
2481 } 3256
2482 ch = cmd_getc (); 3257 ch = cmd_getc ();
2483 } 3258 }
2484 3259
2485 if (ch > CSI_7F) 3260 if (ch > CSI_7F)
2486 return; 3261 return;
… …
2492 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
2493 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
2494 if (arg[p] == -1) 3269 if (arg[p] == -1)
2495 arg[p] = ndef; 3270 arg[p] = ndef;
2496 3271
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 /* 3272 /*
2505 * private mode handling 3273 * private mode handling
2506 */ 3274 */
2507 if (priv) 3275 if (priv)
2508 { 3276 {
2509 switch (priv) 3277 switch (priv)
2510 { 3278 {
2511 case '>': 3279 case '>':
2512 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 //
2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3289 tt_printf ("\033[>%d;94;0c", 'U');
3290 }
2514 break; 3291 break;
2515 case '?': 3292 case '?':
2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2517 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
2518 break; 3295 break;
… …
2623 3400
2624 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3401 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2625 arg[0] = -arg[0]; 3402 arg[0] = -arg[0];
2626 /* FALLTHROUGH */ 3403 /* FALLTHROUGH */
2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3404 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3405 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2629 break; 3406 break;
2630 3407
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3408 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 3409 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 3410 break;
2635 3411
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3412 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 3413 process_sgr_mode (nargs, arg);
2638 break; 3414 break;
… …
2644 tt_printf ("\033[0n"); 3420 tt_printf ("\033[0n");
2645 break; 3421 break;
2646 case 6: /* CPR requested */ 3422 case 6: /* CPR requested */
2647 scr_report_position (); 3423 scr_report_position ();
2648 break; 3424 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3425 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure))
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3427 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 3428 break;
2653#endif
2654 case 8: /* unofficial extension */ 3429 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3431 break;
2657 } 3432 }
2658 break; 3433 break;
2659 3434
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3435 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3468 break;
2694 3469
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3470 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3471 if (arg[0] == 4)
2697 scr_insert_mode (0); 3472 scr_insert_mode (0);
3473 else if (arg[0] == 20)
3474 priv_modes &= ~PrivMode_LFNL;
2698 break; 3475 break;
2699 3476
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3477 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3478 if (arg[0] == 4)
2702 scr_insert_mode (1); 3479 scr_insert_mode (1);
3480 else if (arg[0] == 20)
3481 priv_modes |= PrivMode_LFNL;
2703 break; 3482 break;
2704 3483
2705 /* 3484 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3485 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3486 */
… …
2719 break; 3498 break;
2720 case CSI_75: 3499 case CSI_75:
2721 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
2722 break; 3501 break;
2723 3502
2724#ifndef NO_FRILLS 3503#if !ENABLE_MINIMAL
2725 case CSI_74: 3504 case CSI_74:
2726 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
2727 break; 3506 break;
2728#endif 3507#endif
2729 3508
2730 case CSI_78: /* DECREQTPARM */ 3509 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3510 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3511 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 3512 break;
2734 3513
2735 default: 3514 default:
2736 break; 3515 break;
2737 } 3516 }
2738} 3517}
2739/*}}} */ 3518/*}}} */
2740 3519
2741#ifndef NO_FRILLS 3520#if !ENABLE_MINIMAL
2742/* ARGSUSED */ 3521/* ARGSUSED */
2743void 3522void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3524{
2746 int x, y; 3525 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
2751 Window wdummy; 3527 Window wdummy;
3528
3529 dLocal (Display *, xdisp);
2752 3530
2753 if (nargs == 0) 3531 if (nargs == 0)
2754 return; 3532 return;
3533
2755 switch (args[0]) 3534 switch (args[0])
2756 { 3535 {
2757 /* 3536 /*
2758 * commands 3537 * commands
2759 */ 3538 */
2760 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3540 XMapWindow (xdisp, parent[0]);
2762 break; 3541 break;
2763 case 2: /* iconify window */ 3542 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3543 XIconifyWindow (xdisp, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3544 break;
2767 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
2769 break; 3547 break;
2770 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3550 break;
2773 case 5: /* raise window */ 3551 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
2775 break; 3553 break;
2776 case 6: /* lower window */ 3554 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
2778 break; 3556 break;
2779 case 7: /* refresh window */ 3557 case 7: /* refresh window */
2780 scr_touch (true); 3558 scr_touch (true);
2781 break; 3559 break;
2782 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3561 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3562 (unsigned int) (args[1] * fheight));
2785 break; 3563 break;
3564
3565 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3566 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3568 set_widthheight ((unsigned int)width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3569 (unsigned int) (args[1] * fheight));
2790 break; 3570 break;
3571
2791 /* 3572 /*
2792 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
2793 */ 3574 */
2794 case 11: /* report window state */ 3575 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3578 break;
2798 case 13: /* report window position */ 3579 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3585 break;
2805 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3589 break;
3590 case 18: /* report text area size (chars) */
3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3592 break;
2809 case 18: /* report window size (chars) */ 3593 case 19: /* report window size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2811 break; 3595 break;
2812#if 0 /* XXX: currently disabled due to security concerns */
2813 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3597 {
3598 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3601 XFree (s);
3602 }
2816 break; 3603 break;
2817 case 21: /* report window title */ 3604 case 21: /* report window title */
3605 {
3606 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3607 XFetchName (xdisp, parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609 XFree (s);
3610 }
2820 break; 3611 break;
2821#endif
2822
2823 } 3612 }
2824} 3613}
2825#endif 3614#endif
2826 3615
2827/*----------------------------------------------------------------------*/ 3616/*----------------------------------------------------------------------*/
2828/* 3617/*
2829 * get input up until STRING TERMINATOR (or BEL) 3618 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3619 * ends_how is terminator used. returned input must be free()'d
2831 */ 3620 */
2832unsigned char * 3621char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3622rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3623{
2835 int seen_esc = 0; /* seen escape? */ 3624 unicode_t ch;
3625 bool seen_esc = false;
2836 unsigned int n = 0; 3626 unsigned int n = 0;
2837 unsigned char *s; 3627 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3628
2840 for (; (ch = cmd_getc ());) 3629 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3630 {
2842 if (ch == C0_BEL 3631 if (seen_esc)
2843 || ch == CHAR_ST 3632 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3633 if (ch == 0x5c) /* 7bit ST */
2845 break; 3634 break;
3635 else
3636 return NULL;
3637 }
2846 if (ch == C0_ESC) 3638 else if (ch == C0_ESC)
2847 { 3639 {
2848 seen_esc = 1; 3640 seen_esc = true;
2849 continue; 3641 continue;
2850 } 3642 }
2851 else if (ch == '\t') 3643 else if (ch == C0_BEL || ch == CHAR_ST)
2852 ch = ' '; /* translate '\t' to space */ 3644 break;
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3645 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3646 return NULL; /* other control character - exit */
2855 if (n < sizeof (string) - 1) 3647
3648 seen_esc = false;
3649
3650 if (n >= STRING_MAX - 1)
3651 // stop at some sane length
3652 return NULL;
3653
3654 if (ch == C0_SYN)
3655 string[n++] = cmd_get8 ();
3656 else
2856 string[n++] = ch; 3657 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3658 }
3659
2859 string[n++] = '\0'; 3660 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3661
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3662 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3663
2864 return s; 3664 return rxvt_wcstombs (string);
2865} 3665}
2866 3666
2867/*----------------------------------------------------------------------*/ 3667/*----------------------------------------------------------------------*/
2868/* 3668/*
2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3669 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2870 */ 3670 */
2871void 3671void
2872rxvt_term::process_dcs_seq () 3672rxvt_term::process_dcs_seq ()
2873{ 3673{
2874 unsigned char eh, *s; 3674 char *s;
3675 unicode_t eh;
3676
2875 /* 3677 /*
2876 * Not handled yet 3678 * Not handled yet
2877 */ 3679 */
2878 s = get_to_st (&eh); 3680 s = get_to_st (eh);
2879 if (s) 3681 if (s)
2880 free (s); 3682 free (s);
3683
2881 return; 3684 return;
2882} 3685}
2883 3686
2884/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
2885/* 3688/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3689 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3690 */
2888void 3691void
2889rxvt_term::process_osc_seq () 3692rxvt_term::process_osc_seq ()
2890{ 3693{
2891 unsigned char ch, eh, *s; 3694 unicode_t ch, eh;
2892 int arg; 3695 int arg;
2893 3696
2894 ch = cmd_getc (); 3697 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3698 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3699 arg = arg * 10 + (ch - '0');
2897 3700
2898 if (ch == ';') 3701 if (ch == ';')
2899 { 3702 {
2900 s = get_to_st (&eh); 3703 char *s = get_to_st (eh);
3704
2901 if (s) 3705 if (s)
2902 { 3706 {
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); 3707 process_xterm_seq (arg, s, eh);
2915 free (s); 3708 free (s);
2916 } 3709 }
2917 } 3710 }
2918} 3711}
3712
3713void
3714rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3715{
3716 if (str[0] == '?' && !str[1])
3717 {
3718 rgba c;
3719 pix_colors_focused[color].get (c);
3720
3721#if XFT
3722 if (c.a != rgba::MAX_CC)
3723 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3724 else
3725#endif
3726 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3727 }
3728 else
3729 set_window_color (color, str);
3730}
3731
2919/* 3732/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3733 * 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 */ 3734 */
2942void 3735void
2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3736rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2944{ 3737{
2945 int changed = 0; 3738 int color;
2946 int color;
2947 char *buf, *name; 3739 char *buf, *name;
3740 bool query = str[0] == '?' && !str[1];
3741 int saveop = op;
3742
3743 dLocal (Display *, xdisp);
2948 3744
2949 assert (str != NULL); 3745 assert (str != NULL);
2950 switch (op) 3746 switch (op)
2951 { 3747 {
2952 case XTerm_name: 3748 case XTerm_name:
2953 set_title (str); 3749 set_title (str);
2954 /* FALLTHROUGH */ 3750 /* FALLTHROUGH */
2955 case XTerm_iconName: 3751 case XTerm_iconName:
2956 set_iconName (str); 3752 set_icon_name (str);
2957 break; 3753 break;
2958 case XTerm_title: 3754 case XTerm_title:
2959 set_title (str); 3755 set_title (str);
2960 break; 3756 break;
3757 case XTerm_property:
3758 if (str[0] == '?')
3759 {
3760 Atom prop = display->atom (str + 1);
3761 Atom actual_type;
3762 int actual_format;
3763 unsigned long nitems;
3764 unsigned long bytes_after;
3765 unsigned char *value = 0;
3766 const char *str = "";
3767
3768 if (prop
3769 && XGetWindowProperty (xdisp, parent[0],
3770 prop, 0, 1<<16, 0, AnyPropertyType,
3771 &actual_type, &actual_format,
3772 &nitems, &bytes_after, &value) == Success
3773 && actual_type != None
3774 && actual_format == 8)
3775 str = (const char *)(value);
3776
3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3778
3779 XFree (value);
3780 }
3781 else
3782 {
3783 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3784
3785 if (eq)
3786 {
3787 *eq = 0;
3788 set_utf8_property (display->atom (str), eq + 1);
3789 }
3790 else
3791 XDeleteProperty (xdisp, parent[0],
3792 display->atom (str));
3793 }
3794 break;
3795
2961 case XTerm_Color: 3796 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3797 for (buf = (char *)str; buf && *buf;)
2963 { 3798 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3799 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3800 break;
3801
2966 *name++ = '\0'; 3802 *name++ = '\0';
2967 color = atoi (buf); 3803 color = atoi (buf) + minCOLOR;
2968 if (color < 0 || color >= TOTAL_COLORS) 3804
3805 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2969 break; 3806 break;
3807
2970 if ((buf = STRCHR (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
2971 *buf++ = '\0'; 3809 *buf++ = '\0';
2972 set_window_color (color + minCOLOR, name); 3810
3811 process_color_seq (op, color, name, resp);
2973 } 3812 }
3813 break;
3814 case XTerm_Color00:
3815 process_color_seq (op, Color_fg, str, resp);
3816 break;
3817 case XTerm_Color01:
3818 process_color_seq (op, Color_bg, str, resp);
2974 break; 3819 break;
2975#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3822 process_color_seq (op, Color_cursor, str, resp);
2978 break; 3823 break;
2979#endif 3824#endif
2980 case XTerm_Color_pointer: 3825 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3827 break;
3828 case XTerm_Color_pointer_bg:
3829 process_color_seq (op, Color_pointer_bg, str, resp);
2982 break; 3830 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#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: 3832 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3833 process_color_seq (op, Color_RV, str, resp);
2992 break; 3834 break;
3835 case Rxvt_Color_BD:
3836 case URxvt_Color_BD:
3837 process_color_seq (op, Color_BD, str, resp);
3838 break;
3839 case Rxvt_Color_UL:
3840 case URxvt_Color_UL:
3841 process_color_seq (op, Color_UL, str, resp);
3842 break;
3843 case URxvt_Color_IT:
3844 process_color_seq (op, Color_IT, str, resp);
3845 break;
2993#endif 3846#endif
3847#if TRANSPARENT && TINTING
3848 case URxvt_Color_tint:
3849 process_color_seq (op, Color_tint, str, resp);
2994 3850
2995 case XTerm_Menu: 3851 check_our_parents ();
3852
3853 if (am_transparent)
3854 want_full_refresh = want_refresh = 1;
3855
3856 break;
3857#endif
3858
3859 case Rxvt_Pixmap:
2996 /* 3860 {
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 != ';') 3861 if (*str != ';')
3003 { 3862 {
3004#if XPM_BACKGROUND 3863#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3864 scale_pixmap (""); /* reset to default scaling */
3006 set_bgPixmap (str); /* change pixmap */ 3865 set_bgPixmap (str); /* change pixmap */
3007#endif
3008 scr_touch (true); 3866 scr_touch (true);
3867#endif
3009 } 3868 }
3869
3870 int changed = 0;
3871
3010 while ((str = STRCHR (str, ';')) != NULL) 3872 while ((str = strchr (str, ';')) != NULL)
3011 { 3873 {
3012 str++; 3874 str++;
3013#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3014 changed += scale_pixmap (str); 3876 changed += scale_pixmap (str);
3015#endif 3877#endif
3016
3017 } 3878 }
3879
3018 if (changed) 3880 if (changed)
3019 { 3881 {
3020#ifdef XPM_BACKGROUND 3882#ifdef XPM_BACKGROUND
3021 resize_pixmap (); 3883 resize_pixmap ();
3022#endif
3023 scr_touch (true); 3884 scr_touch (true);
3885#endif
3024 } 3886 }
3887 }
3025 break; 3888 break;
3026 3889
3027 case XTerm_restoreFG: 3890 case Rxvt_restoreFG:
3028 set_window_color (Color_fg, str); 3891 set_window_color (Color_fg, str);
3029 break; 3892 break;
3030 case XTerm_restoreBG: 3893 case Rxvt_restoreBG:
3031 set_window_color (Color_bg, str); 3894 set_window_color (Color_bg, str);
3032 break; 3895 break;
3896
3033 case XTerm_logfile: 3897 case XTerm_logfile:
3898 // TODO, when secure mode?
3034 break; 3899 break;
3035 case XTerm_font: 3900
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 3901#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3902 case Rxvt_dumpscreen: /* no error notices */
3059 { 3903 {
3060 int fd; 3904 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3905 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3906 {
3063 scr_dump (fd); 3907 scr_dump (fd);
3064 close (fd); 3908 close (fd);
3065 } 3909 }
3066 } 3910 }
3067 break; 3911 break;
3068#endif 3912#endif
3913 case XTerm_font:
3914 op = URxvt_font;
3915 case URxvt_font:
3916#if ENABLE_STYLES
3917 case URxvt_boldFont:
3918 case URxvt_italicFont:
3919 case URxvt_boldItalicFont:
3920#endif
3921 if (query)
3922 tt_printf ("\33]%d;%-.250s%c", saveop,
3923 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3924 ? fontset[op - URxvt_font]->fontdesc : "",
3925 resp);
3926 else
3927 {
3928 const char *&res = rs[Rs_font + (op - URxvt_font)];
3069 3929
3930 res = strdup (str);
3931 allocated.push_back ((void *)res);
3932 set_fonts ();
3933 }
3934 break;
3935
3936 case URxvt_version:
3937 if (query)
3938 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3939 op,
3940 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp);
3942 break;
3943
3944#if !ENABLE_MINIMAL
3945 case URxvt_locale:
3946 if (query)
3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3948 else
3949 {
3950 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale ();
3953 }
3954 break;
3955
3956 case URxvt_view_up:
3957 case URxvt_view_down:
3958 {
3959 int lines = atoi (str);
3960
3961 if (lines)
3962 scr_page (op == URxvt_view_up ? UP : DN, lines);
3963 else
3964 scr_erase_savelines ();
3965 }
3966
3967 break;
3968#endif
3969
3970#if ENABLE_PERL
3971 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3973 ; // no responses yet
3974 break;
3975#endif
3070 } 3976 }
3071} 3977}
3072/*----------------------------------------------------------------------*/ 3978/*----------------------------------------------------------------------*/
3073 3979
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3980/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3988 * so no need for fancy checking
3083 */ 3989 */
3084int 3990int
3085rxvt_term::privcases (int mode, unsigned long bit) 3991rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3992{
3087 int state; 3993 int state;
3088 3994
3089 if (mode == 's') 3995 if (mode == 's')
3090 { 3996 {
3091 SavedModes |= (PrivateModes & bit); 3997 SavedModes |= (priv_modes & bit);
3092 return -1; 3998 return -1;
3093 } 3999 }
3094 else 4000 else
3095 { 4001 {
3096 if (mode == 'r') 4002 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4003 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 4004 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4005 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 4006 PrivMode (state, bit);
3101 } 4007 }
4008
3102 return state; 4009 return state;
3103} 4010}
3104 4011
3105/* we're not using priv _yet_ */ 4012/* we're not using priv _yet_ */
3106void 4013void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4014rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3108{ 4015{
3109 unsigned int i, j; 4016 unsigned int i, j;
3110 int state; 4017 int state;
4018
3111 static const struct 4019 static const struct
3112 { 4020 {
3113 const int argval; 4021 const int argval;
3114 const unsigned long bit; 4022 const unsigned long bit;
3115 } 4023 }
4024
3116 argtopriv[] = { 4025 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 4026 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 4027 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 4028 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 4029 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 4030 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 4031 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 4032 { 7, PrivMode_Autowrap },
4033 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 4034 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 4035 // 18, 19 printing-related
3126 { menuBar_esc, PrivMode_menuBar }, 4036 { 25, PrivMode_VisibleCursor },
3127#endif
3128#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 4038 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 4039#endif
3131 { 25, PrivMode_VisibleCursor },
3132 { 35, PrivMode_ShiftKeys }, 4040 { 35, PrivMode_ShiftKeys }, // rxvt extension
3133 { 40, PrivMode_132OK }, 4041 { 40, PrivMode_132OK },
4042 // 41 xterm more fixes NYI
4043 // 45 margin bell NYI
4044 // 46 start logging
3134 { 47, PrivMode_Screen }, 4045 { 47, PrivMode_Screen },
3135 { 66, PrivMode_aplKP }, 4046 { 66, PrivMode_aplKP },
3136#ifndef NO_BACKSPACE_KEY 4047#ifndef NO_BACKSPACE_KEY
3137 { 67, PrivMode_BackSpace }, 4048 { 67, PrivMode_BackSpace },
3138#endif 4049#endif
3139 { 1000, PrivMode_MouseX11 }, 4050 { 1000, PrivMode_MouseX11 },
4051 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4052 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4053 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3140 { 1010, PrivMode_TtyOutputInh }, 4054 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3141 { 1011, PrivMode_Keypress }, 4055 { 1011, PrivMode_Keypress }, // rxvt extension
4056 // 1035 enable modifiers for alt, numlock NYI
4057 // 1036 send ESC for meta keys NYI
4058 // 1037 send DEL for keypad delete NYI
3142 { 1047, PrivMode_Screen }, 4059 { 1047, PrivMode_Screen },
4060 // 1048 save and restore cursor
3143 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4061 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4062 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3144 }; 4063 };
3145 4064
3146 if (nargs == 0) 4065 if (nargs == 0)
3147 return; 4066 return;
3148 4067
… …
3163 state = privcases (mode, argtopriv[j].bit); 4082 state = privcases (mode, argtopriv[j].bit);
3164 break; 4083 break;
3165 } 4084 }
3166 4085
3167 /* extra handling for values with state unkept */ 4086 /* extra handling for values with state unkept */
3168 if (state == -1)
3169 switch (arg[i]) 4087 switch (arg[i])
3170 { 4088 {
4089#if ENABLE_STYLES
4090 case 1021:
4091 set_option (Opt_intensityStyles, mode);
4092
4093 scr_touch (true);
4094 break;
4095#endif
3171 case 1048: /* alternative cursor save */ 4096 case 1048: /* alternative cursor save */
4097 case 1049:
4098 if (OPTION (Opt_secondaryScreen))
3172 if (mode == 0) 4099 if (mode == 0)
3173 scr_cursor (RESTORE); 4100 scr_cursor (RESTORE);
3174 else if (mode == 1) 4101 else if (mode == 1)
3175 scr_cursor (SAVE); 4102 scr_cursor (SAVE);
3176 /* FALLTHROUGH */
3177 default:
3178 continue; /* for (;i;) */
3179 }
3180
3181 /* extra handling for values with valid 0 or 1 state */
3182 switch (arg[i])
3183 {
3184 /* case 1: - application cursor keys */
3185 case 2: /* VT52 mode */
3186 /* oddball mode. should be set regardless of set/reset
3187 * parameter. Return from VT52 mode with an ESC < from
3188 * within VT52 mode
3189 */
3190 PrivMode (1, PrivMode_vt52);
3191 break; 4103 break;
4104 }
4105
4106 if (state >= 0)
4107 /* extra handling for values with valid 0 or 1 state */
4108 switch (arg[i])
4109 {
4110 /* case 1: - application cursor keys */
4111 case 2: /* VT52 mode */
4112 /* oddball mode. should be set regardless of set/reset
4113 * parameter. Return from VT52 mode with an ESC < from
4114 * within VT52 mode
4115 */
4116 PrivMode (1, PrivMode_vt52);
4117 break;
3192 case 3: /* 80/132 */ 4118 case 3: /* 80/132 */
3193 if (PrivateModes & PrivMode_132OK) 4119 if (priv_modes & PrivMode_132OK)
3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4120 set_widthheight (((state ? 132 : 80) * fwidth), height);
3195 break; 4121 break;
3196 case 4: /* smooth scrolling */ 4122 case 4: /* smooth scrolling */
3197 if (state)
3198 Options &= ~Opt_jumpScroll;
3199 else
3200 Options |= Opt_jumpScroll; 4123 set_option (Opt_jumpScroll, !state);
3201 break; 4124 break;
3202 case 5: /* reverse video */ 4125 case 5: /* reverse video */
3203 scr_rvideo_mode (state); 4126 scr_rvideo_mode (state);
3204 break; 4127 break;
3205 case 6: /* relative/absolute origins */ 4128 case 6: /* relative/absolute origins */
3206 scr_relative_origin (state); 4129 scr_relative_origin (state);
3207 break; 4130 break;
3208 case 7: /* autowrap */ 4131 case 7: /* autowrap */
3209 scr_autowrap (state); 4132 scr_autowrap (state);
3210 break; 4133 break;
3211 /* case 8: - auto repeat, can't do on a per window basis */ 4134 /* case 8: - auto repeat, can't do on a per window basis */
3212 case 9: /* X10 mouse reporting */ 4135 case 9: /* X10 mouse reporting */
3213 if (state) /* orthogonal */ 4136 if (state) /* orthogonal */
3214 PrivateModes &= ~ (PrivMode_MouseX11); 4137 priv_modes &= ~PrivMode_MouseX11;
3215 break; 4138 break;
3216#ifdef menuBar_esc
3217 case menuBar_esc:
3218#ifdef MENUBAR
3219 map_menuBar (state);
3220#endif
3221 break;
3222#endif
3223#ifdef scrollBar_esc 4139#ifdef scrollBar_esc
3224 case scrollBar_esc: 4140 case scrollBar_esc:
3225 if (scrollbar_mapping (state)) 4141 if (scrollbar_mapping (state))
3226 { 4142 {
3227 resize_all_windows (0, 0, 0); 4143 resize_all_windows (0, 0, 0);
3228 scr_touch (true); 4144 scr_touch (true);
3229 } 4145 }
3230 break; 4146 break;
3231#endif 4147#endif
3232 case 25: /* visible/invisible cursor */ 4148 case 25: /* visible/invisible cursor */
3233 scr_cursor_visible (state); 4149 scr_cursor_visible (state);
3234 break; 4150 break;
3235 /* case 35: - shift keys */ 4151 /* case 35: - shift keys */
3236 /* case 40: - 80 <--> 132 mode */ 4152 /* case 40: - 80 <--> 132 mode */
3237 case 47: /* secondary screen */ 4153 case 47: /* secondary screen */
3238 scr_change_screen (state); 4154 scr_change_screen (state);
3239 break; 4155 break;
3240 /* case 66: - application key pad */ 4156 /* case 66: - application key pad */
3241 /* case 67: - backspace key */ 4157 /* case 67: - backspace key */
3242 case 1000: /* X11 mouse reporting */ 4158 case 1000: /* X11 mouse reporting */
3243 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
3244 PrivateModes &= ~ (PrivMode_MouseX10); 4160 priv_modes &= ~PrivMode_MouseX10;
3245 break; 4161 break;
3246#if 0 4162#if 0
3247 case 1001: 4163 case 1001:
3248 break; /* X11 mouse highlighting */ 4164 break; /* X11 mouse highlighting */
3249#endif 4165#endif
3250 case 1010: /* scroll to bottom on TTY output inhibit */ 4166 case 1010: /* scroll to bottom on TTY output inhibit */
3251 if (state)
3252 Options &= ~Opt_scrollTtyOutput;
3253 else
3254 Options |= Opt_scrollTtyOutput; 4167 set_option (Opt_scrollTtyOutput, !state);
3255 break; 4168 break;
3256 case 1011: /* scroll to bottom on key press */ 4169 case 1011: /* scroll to bottom on key press */
3257 if (state)
3258 Options |= Opt_scrollTtyKeypress; 4170 set_option (Opt_scrollTtyKeypress, state);
3259 else
3260 Options &= ~Opt_scrollTtyKeypress;
3261 break; 4171 break;
3262 case 1047: /* secondary screen w/ clearing */ 4172 case 1047: /* secondary screen w/ clearing last */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4173 if (OPTION (Opt_secondaryScreen))
3264 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
3265 scr_erase_screen (2); 4175 scr_erase_screen (2);
3266 scr_change_screen (state); 4176 scr_change_screen (state);
3267 /* FALLTHROUGH */
3268 default:
3269 break; 4177 break;
4178 case 1049: /* secondary screen w/ clearing first */
4179 scr_change_screen (state);
4180 if (OPTION (Opt_secondaryScreen))
4181 if (current_screen != PRIMARY)
4182 scr_erase_screen (2);
4183 break;
4184 default:
4185 break;
3270 } 4186 }
3271 } 4187 }
3272} 4188}
3273/*}}} */ 4189/*}}} */
3274 4190
3275/*{{{ process sgr sequences */ 4191/*{{{ process sgr sequences */
3276void 4192void
3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4193rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3278{ 4194{
3279 unsigned int i; 4195 unsigned int i;
3280 short rendset; 4196 short rendset;
3281 int rendstyle; 4197 int rendstyle;
3282 4198
3283 if (nargs == 0) 4199 if (nargs == 0)
3284 { 4200 {
3285 scr_rendition (0, ~RS_None); 4201 scr_rendition (0, ~RS_None);
3286 return; 4202 return;
3287 } 4203 }
4204
3288 for (i = 0; i < nargs; i++) 4205 for (i = 0; i < nargs; i++)
3289 { 4206 {
3290 rendset = -1; 4207 rendset = -1;
3291 switch (arg[i]) 4208 switch (arg[i])
3292 { 4209 {
… …
3294 rendset = 0, rendstyle = ~RS_None; 4211 rendset = 0, rendstyle = ~RS_None;
3295 break; 4212 break;
3296 case 1: 4213 case 1:
3297 rendset = 1, rendstyle = RS_Bold; 4214 rendset = 1, rendstyle = RS_Bold;
3298 break; 4215 break;
4216 //case 2: // low intensity
4217 case 3:
4218 rendset = 1, rendstyle = RS_Italic;
4219 break;
3299 case 4: 4220 case 4:
3300 rendset = 1, rendstyle = RS_Uline; 4221 rendset = 1, rendstyle = RS_Uline;
3301 break; 4222 break;
3302 case 5: 4223 case 5: // slowly blinking
4224 case 6: // rapidly blinking
3303 rendset = 1, rendstyle = RS_Blink; 4225 rendset = 1, rendstyle = RS_Blink;
3304 break; 4226 break;
4227 //case 6: // scoansi light background
3305 case 7: 4228 case 7:
3306 rendset = 1, rendstyle = RS_RVid; 4229 rendset = 1, rendstyle = RS_RVid;
3307 break; 4230 break;
3308 case 22: 4231 case 8:
4232 // invisible. NYI
4233 break;
4234 //case 9: // crossed out
4235 //case 10: // scoansi acs off, primary font
4236 //case 11: // scoansi acs on, first alt font
4237 //case 12: // scoansi acs on, |0x80, second alt font
4238 //...
4239 //case 19: // ninth alt font
4240 //case 20: // gothic
4241 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3309 rendset = 0, rendstyle = RS_Bold; 4242 rendset = 0, rendstyle = RS_Bold;
4243 break;
4244 case 22: // normal intensity
4245 rendset = 0, rendstyle = RS_Bold;
4246 break;
4247 case 23: // disable italic
4248 rendset = 0, rendstyle = RS_Italic;
3310 break; 4249 break;
3311 case 24: 4250 case 24:
3312 rendset = 0, rendstyle = RS_Uline; 4251 rendset = 0, rendstyle = RS_Uline;
3313 break; 4252 break;
3314 case 25: 4253 case 25:
3315 rendset = 0, rendstyle = RS_Blink; 4254 rendset = 0, rendstyle = RS_Blink;
3316 break; 4255 break;
4256 case 26: // variable spacing (iso 8613)
4257 rendset = 0, rendstyle = RS_Blink;
4258 break;
3317 case 27: 4259 case 27:
3318 rendset = 0, rendstyle = RS_RVid; 4260 rendset = 0, rendstyle = RS_RVid;
3319 break; 4261 break;
4262 //case 28: // visible. NYI
4263 //case 29: // not crossed-out
3320 } 4264 }
4265
3321 if (rendset != -1) 4266 if (rendset != -1)
3322 { 4267 {
3323 scr_rendition (rendset, rendstyle); 4268 scr_rendition (rendset, rendstyle);
3324 continue; /* for (;i;) */ 4269 continue; /* for (;i;) */
3325 } 4270 }
… …
3332 case 33: 4277 case 33:
3333 case 34: 4278 case 34:
3334 case 35: 4279 case 35:
3335 case 36: 4280 case 36:
3336 case 37: 4281 case 37:
3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4282 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3338 Color_fg);
3339 break; 4283 break;
3340#ifdef TTY_256COLOR 4284 case 38: // set fg color, ISO 8613-6
3341 case 38:
3342 if (nargs > i + 2 && arg[i + 1] == 5) 4285 if (nargs > i + 2 && arg[i + 1] == 5)
3343 { 4286 {
3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4287 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3345 Color_fg);
3346 i += 2; 4288 i += 2;
3347 } 4289 }
3348 break; 4290 break;
3349#endif
3350 case 39: /* default fg */ 4291 case 39: /* default fg */
3351 scr_color (Color_fg, Color_fg); 4292 scr_color (Color_fg, Color_fg);
3352 break; 4293 break;
3353 4294
3354 case 40: 4295 case 40:
… …
3357 case 43: 4298 case 43:
3358 case 44: 4299 case 44:
3359 case 45: 4300 case 45:
3360 case 46: 4301 case 46:
3361 case 47: 4302 case 47:
3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4303 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3363 Color_bg);
3364 break; 4304 break;
3365#ifdef TTY_256COLOR 4305 case 48: // set bg color, ISO 8613-6
3366 case 48:
3367 if (nargs > i + 2 && arg[i + 1] == 5) 4306 if (nargs > i + 2 && arg[i + 1] == 5)
3368 { 4307 {
3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4308 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3370 Color_bg);
3371 i += 2; 4309 i += 2;
3372 } 4310 }
3373 break; 4311 break;
3374#endif
3375 case 49: /* default bg */ 4312 case 49: /* default bg */
3376 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
3377 break; 4314 break;
3378 4315
3379#ifndef NO_BRIGHTCOLOR 4316 //case 50: // not variable spacing
4317
4318#if !ENABLE_MINIMAL
3380 case 90: 4319 case 90:
3381 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
3382 case 92: 4321 case 92:
3383 case 93: 4322 case 93:
3384 case 94: 4323 case 94:
3385 case 95: 4324 case 95:
3386 case 96: 4325 case 96:
3387 case 97: 4326 case 97:
3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4327 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3389 Color_fg);
3390 break; 4328 break;
3391 case 100: 4329 case 100:
3392 case 101: /* set bright bg color */ 4330 case 101: /* set bright bg color */
3393 case 102: 4331 case 102:
3394 case 103: 4332 case 103:
3395 case 104: 4333 case 104:
3396 case 105: 4334 case 105:
3397 case 106: 4335 case 106:
3398 case 107: 4336 case 107:
3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4337 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3400 Color_bg);
3401 break; 4338 break;
3402#endif 4339#endif
3403
3404 } 4340 }
3405 } 4341 }
3406} 4342}
3407/*}}} */ 4343/*}}} */
3408 4344
3409/*{{{ process Rob Nation's own graphics mode sequences */ 4345/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3410void 4346void
3411rxvt_term::process_graphics () 4347rxvt_term::process_graphics ()
3412{ 4348{
3413 unsigned char ch, cmd = cmd_getc (); 4349 unicode_t ch, cmd = cmd_getc ();
3414 4350
3415 if (cmd == 'Q') 4351 if (cmd == 'Q')
3416 { /* query graphics */ 4352 { /* query graphics */
3417 tt_printf ("\033G0\n"); /* no graphics */ 4353 tt_printf ("\033G0\012"); /* no graphics */
3418 return; 4354 return;
3419 } 4355 }
3420 /* swallow other graphics sequences until terminating ':' */ 4356 /* swallow other graphics sequences until terminating ':' */
3421 do 4357 do
3422 ch = cmd_getc (); 4358 ch = cmd_getc ();
… …
3432 */ 4368 */
3433void 4369void
3434rxvt_term::tt_printf (const char *fmt,...) 4370rxvt_term::tt_printf (const char *fmt,...)
3435{ 4371{
3436 va_list arg_ptr; 4372 va_list arg_ptr;
3437 unsigned char buf[256]; 4373 char buf[256];
3438 4374
3439 va_start (arg_ptr, fmt); 4375 va_start (arg_ptr, fmt);
3440 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4376 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3441 va_end (arg_ptr); 4377 va_end (arg_ptr);
3442 tt_write (buf, STRLEN (buf)); 4378 tt_write (buf, strlen (buf));
3443} 4379}
3444 4380
3445/* ---------------------------------------------------------------------- */ 4381/* ---------------------------------------------------------------------- */
3446/* Write data to the pty as typed by the user, pasted with the mouse, 4382/* Write data to the pty as typed by the user, pasted with the mouse,
3447 * or generated by us in response to a query ESC sequence. 4383 * or generated by us in response to a query ESC sequence.
3448 */ 4384 */
4385const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4386
3449void 4387void
3450rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4388rxvt_term::tt_write (const char *data, unsigned int len)
3451{ 4389{
3452 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4390 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4391 return;
3453 4392
3454 if (len) 4393 if (pty->pty < 0)
4394 return;
4395
4396 if (v_buflen == 0)
4397 {
4398 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4399
4400 if ((unsigned int)written == len)
4401 return;
4402
4403 data += written;
4404 len -= written;
3455 { 4405 }
4406
4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4408
4409 memcpy (v_buffer + v_buflen, data, len);
4410 v_buflen += len;
4411
4412 pty_ev.set (EVENT_READ | EVENT_WRITE);
4413}
4414
4415void rxvt_term::pty_write ()
4416{
4417 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4418
4419 if (written > 0)
4420 {
4421 v_buflen -= written;
4422
3456 if (v_buflen == 0) 4423 if (v_buflen == 0)
3457 { 4424 {
3458 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3459
3460 if ((unsigned int)written == len)
3461 return;
3462
3463 data += written;
3464 len -= written;
3465 }
3466
3467
3468 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3469
3470 memcpy (v_buffer + v_buflen, data, len);
3471 v_buflen += len;
3472 }
3473
3474 for (;;)
3475 {
3476 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3477
3478 if (written > 0)
3479 {
3480 v_buflen -= written;
3481
3482 if (v_buflen == 0)
3483 {
3484 free (v_buffer); 4425 free (v_buffer);
3485 v_buffer = 0; 4426 v_buffer = 0;
3486 v_buflen = 0; 4427 v_buflen = 0;
3487 4428
3488 pty_ev.set (EVENT_READ); 4429 pty_ev.set (EVENT_READ);
3489 return;
3490 }
3491
3492 memmove (v_buffer, v_buffer + written, v_buflen);
3493 }
3494 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3495 // original code just ignores this...
3496 destroy ();
3497 else
3498 {
3499 pty_ev.set (EVENT_READ | EVENT_WRITE);
3500 return; 4430 return;
3501 } 4431 }
4432
4433 memmove (v_buffer, v_buffer + written, v_buflen);
3502 } 4434 }
4435 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4436 pty_ev.set (EVENT_READ);
3503} 4437}
3504 4438
3505/*----------------------- end-of-file (C source) -----------------------*/ 4439/*----------------------- end-of-file (C source) -----------------------*/
3506 4440

Diff Legend

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