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

Diff Legend

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