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

Diff Legend

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