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

Diff Legend

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