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

Diff Legend

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