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.278 by root, Fri Jan 20 18:50:49 2006 UTC

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

Diff Legend

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