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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.352 by ayin, Sun Sep 9 10:35:00 2007 UTC

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

Diff Legend

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