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

Diff Legend

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