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.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.287 by root, Sat Jan 28 20:08:05 2006 UTC

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

Diff Legend

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