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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.276 by root, Fri Jan 20 11:02:46 2006 UTC

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

Diff Legend

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