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

Diff Legend

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