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.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

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

Diff Legend

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