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.391 by root, Wed Jan 9 01:14:29 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 update_background ();
1461#endif
1333 } 1462 }
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 1463
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1344 } 1465 }
1345 break; 1466 break;
1346 1467
1468 case PropertyNotify:
1469 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1470 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1471 && ev.xproperty.state == PropertyNewValue)
1472 selection_property (ev.xproperty.window, ev.xproperty.atom);
1473
1474 break;
1475
1347 case SelectionClear: 1476 case SelectionClear:
1348 display->set_selection_owner (0); 1477 selection_clear ();
1349 break; 1478 break;
1350 1479
1351 case SelectionNotify: 1480 case SelectionNotify:
1352 if (selection_wait == Sel_normal) 1481 if (selection_wait == Sel_normal)
1353 selection_paste (ev.xselection.requestor, 1482 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1354 ev.xselection.property, True);
1355 break; 1483 break;
1356 1484
1357 case SelectionRequest: 1485 case SelectionRequest:
1358 selection_send (ev.xselectionrequest); 1486 selection_send (ev.xselectionrequest);
1359 break; 1487 break;
1360 1488
1489 case MapNotify:
1490 mapped = 1;
1491#ifdef TEXT_BLINK
1492 text_blink_ev.start ();
1493#endif
1494 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1495 break;
1496
1361 case UnmapNotify: 1497 case UnmapNotify:
1362 TermWin.mapped = 0; 1498 mapped = 0;
1363#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1364 text_blink_ev.stop (); 1500 text_blink_ev.stop ();
1365#endif 1501#endif
1502 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1366 break; 1503 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 1504
1381 case GraphicsExpose: 1505 case GraphicsExpose:
1382 case Expose: 1506 case Expose:
1383 if (ev.xany.window == TermWin.vt) 1507 if (ev.xany.window == vt)
1384 { 1508 {
1385#ifdef NO_SLOW_LINK_SUPPORT 1509 do
1510 {
1386 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1387 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1388#else 1513 }
1389 // don't understand this, so commented it out 1514 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1515
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517
1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1519 {
1390 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1391 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1392 //scr_expose (ev.xexpose.x, 0, 1522 }
1393 // ev.xexpose.width, TermWin.height, False); 1523
1394#endif
1395 want_refresh = 1; 1524 want_refresh = 1;
1396 } 1525 }
1397 else 1526 else
1398 { 1527 {
1399 XEvent unused_event; 1528 XEvent unused_event;
1400 1529
1401 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1402 Expose, 1531 ;
1403 &unused_event)) ; 1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1404 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1533 ;
1405 GraphicsExpose, 1534
1406 &unused_event)) ; 1535 if (scrollBar.state && ev.xany.window == scrollBar.win)
1407 if (isScrollbarWindow (ev.xany.window))
1408 { 1536 {
1409 scrollBar.setIdle (); 1537 scrollBar.setIdle ();
1410 scrollbar_show (0); 1538 scrollbar_show (0);
1411 } 1539 }
1412#ifdef MENUBAR
1413 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1414 menubar_expose ();
1415#endif
1416 } 1540 }
1417 break; 1541 break;
1418 1542
1419 case MotionNotify: 1543 case MotionNotify:
1420#ifdef POINTER_BLANK 1544#ifdef POINTER_BLANK
1421 if (hidden_pointer) 1545 if (hidden_pointer)
1422 pointer_unblank (); 1546 pointer_unblank ();
1423#endif 1547#endif
1424#if MENUBAR 1548 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1425 if (isMenuBarWindow (ev.xany.window)) 1549 || priv_modes & PrivMode_MouseAnyEvent)
1550 mouse_report (ev.xbutton);
1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1552 break;
1553
1554 if (ev.xany.window == vt)
1426 { 1555 {
1427 menubar_control (& (ev.xbutton)); 1556 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1428 break; 1557 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1429 } 1558 ; // 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))) 1559 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1437 { 1560 {
1438 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1561 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1439 ; 1562 ;
1440 1563
1441 XQueryPointer (display->display, TermWin.vt, 1564 XQueryPointer (dpy, vt,
1442 &unused_root, &unused_child, 1565 &unused_root, &unused_child,
1443 &unused_root_x, &unused_root_y, 1566 &unused_root_x, &unused_root_y,
1444 & (ev.xbutton.x), & (ev.xbutton.y), 1567 &ev.xbutton.x, &ev.xbutton.y,
1445 &unused_mask); 1568 &ev.xbutton.state);
1446#ifdef MOUSE_THRESHOLD 1569#ifdef MOUSE_THRESHOLD
1447 /* deal with a `jumpy' mouse */ 1570 /* deal with a `jumpy' mouse */
1448 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1571 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1449 { 1572 {
1450#endif 1573#endif
1574#if ISO_14755
1575 // 5.4
1576 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1577 {
1578 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1579 break;
1580 }
1581#endif
1451 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1582 selection_extend (ev.xbutton.x, ev.xbutton.y,
1452 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1583 ev.xbutton.state & Button3Mask ? 2 : 0);
1584
1453#ifdef SELECTION_SCROLLING 1585#ifdef SELECTION_SCROLLING
1454 if (ev.xbutton.y < TermWin.int_bwidth 1586 if (ev.xbutton.y < int_bwidth
1455 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1587 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1456 { 1588 {
1457 int dist; 1589 int dist;
1458
1459 pending_scroll_selection=1;
1460 1590
1461 /* don't clobber the current delay if we are 1591 /* don't clobber the current delay if we are
1462 * already in the middle of scrolling. 1592 * already in the middle of scrolling.
1463 */ 1593 */
1464 if (scroll_selection_delay<=0) 1594 if (!sel_scroll_ev.is_active ())
1465 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1595 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1466 1596
1467 /* save the event params so we can highlight 1597 /* save the event params so we can highlight
1468 * the selection in the pending-scroll loop 1598 * the selection in the pending-scroll loop
1469 */ 1599 */
1470 selection_save_x=ev.xbutton.x; 1600 selection_save_x = ev.xbutton.x;
1471 selection_save_y=ev.xbutton.y; 1601 selection_save_y = ev.xbutton.y;
1472 selection_save_state=
1473 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1602 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1474 1603
1475 /* calc number of lines to scroll */ 1604 /* calc number of lines to scroll */
1476 if (ev.xbutton.y<TermWin.int_bwidth) 1605 if (ev.xbutton.y < int_bwidth)
1477 { 1606 {
1478 scroll_selection_dir = UP; 1607 scroll_selection_dir = UP;
1479 dist = TermWin.int_bwidth - ev.xbutton.y; 1608 dist = int_bwidth - ev.xbutton.y;
1480 } 1609 }
1481 else 1610 else
1482 { 1611 {
1483 scroll_selection_dir = DN; 1612 scroll_selection_dir = DN;
1484 dist = ev.xbutton.y - 1613 dist = ev.xbutton.y - (int_bwidth + height);
1485 (TermWin.int_bwidth + TermWin.height);
1486 } 1614 }
1615
1487 scroll_selection_lines= (Pixel2Height (dist)/ 1616 scroll_selection_lines = Pixel2Height (dist)
1488 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1617 / SELECTION_SCROLL_LINE_SPEEDUP
1618 + 1;
1489 MIN_IT (scroll_selection_lines, 1619 min_it (scroll_selection_lines,
1490 SELECTION_SCROLL_MAX_LINES); 1620 SELECTION_SCROLL_MAX_LINES);
1491 } 1621 }
1492 else 1622 else
1493 { 1623 {
1494 /* we are within the text window, so we 1624 /* we are within the text window, so we
1495 * shouldn't be scrolling 1625 * shouldn't be scrolling
1496 */ 1626 */
1497 pending_scroll_selection = 0; 1627 sel_scroll_ev.stop();
1498 } 1628 }
1499#endif 1629#endif
1500#ifdef MOUSE_THRESHOLD 1630#ifdef MOUSE_THRESHOLD
1501
1502 } 1631 }
1503#endif 1632#endif
1504
1505 } 1633 }
1506 } 1634 }
1507 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1635 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1508 { 1636 {
1509 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1510 MotionNotify, &ev)) ; 1638 MotionNotify, &ev))
1639 ;
1640
1511 XQueryPointer (display->display, scrollBar.win, 1641 XQueryPointer (dpy, scrollBar.win,
1512 &unused_root, &unused_child, 1642 &unused_root, &unused_child,
1513 &unused_root_x, &unused_root_y, 1643 &unused_root_x, &unused_root_y,
1514 & (ev.xbutton.x), & (ev.xbutton.y), 1644 &ev.xbutton.x, &ev.xbutton.y,
1515 &unused_mask); 1645 &unused_mask);
1516 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1646 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1517 scrollbar_size ()); 1647 scrollbar_size ());
1518 scr_refresh (refresh_type);
1519 refresh_limit = 0; 1648 want_refresh = 1;
1520 scrollbar_show (1); 1649 scrollbar_show (1);
1521 } 1650 }
1522 break; 1651 break;
1523 } 1652 }
1524}
1525 1653
1654#if defined(CURSOR_BLINK)
1655 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1656 {
1657 if (hidden_cursor)
1658 {
1659 hidden_cursor = 0;
1660 want_refresh = 1;
1661 }
1662
1663 cursor_blink_ev.again ();
1664 }
1665#endif
1666
1667#if defined(POINTER_BLANK)
1668 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1669 {
1670 if (ev.type == MotionNotify
1671 || ev.type == ButtonPress
1672 || ev.type == ButtonRelease)
1673 if (hidden_pointer)
1674 pointer_unblank ();
1675
1676 if (ev.type == KeyPress && hidden_pointer == 0)
1677 pointer_blank ();
1678 }
1679#endif
1680
1681 refresh_check ();
1682}
1683
1684void
1685rxvt_term::focus_in ()
1686{
1687 if (!focus)
1688 {
1689 focus = 1;
1690 want_refresh = 1;
1691
1692 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1693
1694#if USE_XIM
1695 if (Input_Context != NULL)
1696 {
1697 IMSetPosition ();
1698 XSetICFocus (Input_Context);
1699 }
1700#endif
1701#if CURSOR_BLINK
1702 if (option (Opt_cursorBlink))
1703 cursor_blink_ev.again ();
1704#endif
1705#if OFF_FOCUS_FADING
1706 if (rs[Rs_fade])
1707 {
1708 pix_colors = pix_colors_focused;
1709 scr_recolour ();
1710 }
1711#endif
1712#if ENABLE_FRILLS
1713 if (option (Opt_urgentOnBell))
1714 {
1715 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1716 {
1717 h->flags &= ~XUrgencyHint;
1718 XSetWMHints (dpy, parent[0], h);
1719 }
1720 }
1721#endif
1722 }
1723}
1724
1725void
1726rxvt_term::focus_out ()
1727{
1728 if (focus)
1729 {
1730 focus = 0;
1731 want_refresh = 1;
1732
1733 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1734
1735#if ENABLE_FRILLS || ISO_14755
1736 if (iso14755buf)
1737 {
1738 iso14755buf = 0;
1739# if ISO_14755
1740 scr_overlay_off ();
1741# endif
1742 }
1743#endif
1744#if USE_XIM
1745 if (Input_Context != NULL)
1746 XUnsetICFocus (Input_Context);
1747#endif
1748#if CURSOR_BLINK
1749 if (option (Opt_cursorBlink))
1750 cursor_blink_ev.stop ();
1751
1752 hidden_cursor = 0;
1753#endif
1754#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade])
1756 {
1757 pix_colors = pix_colors_unfocused;
1758 scr_recolour ();
1759 }
1760#endif
1761 }
1762}
1763
1764void
1765rxvt_term::update_fade_color (unsigned int idx)
1766{
1767#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade])
1769 {
1770 rgba c;
1771 pix_colors [Color_fade].get (c);
1772 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1773 }
1774#endif
1775}
1776
1777#if ENABLE_TRANSPARENCY || ENABLE_PERL
1526void 1778void
1527rxvt_term::rootwin_cb (XEvent &ev) 1779rxvt_term::rootwin_cb (XEvent &ev)
1528{ 1780{
1529 SET_R (this); 1781 make_current ();
1530 SET_LOCALE (locale);
1531 1782
1783 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1784 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1785 return;
1786
1787# if ENABLE_TRANSPARENCY
1532 switch (ev.type) 1788 switch (ev.type)
1533 { 1789 {
1534 case PropertyNotify: 1790 case PropertyNotify:
1791 /*
1792 * if user used some Esetroot compatible prog to set the root bg,
1793 * use the property to determine the pixmap. We use it later on.
1794 */
1535 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1795 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1796 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1536 { 1797 {
1537 if (ev.xproperty.state == PropertyNewValue) 1798 bgPixmap.set_root_pixmap ();
1538 selection_property (ev.xproperty.window, ev.xproperty.atom); 1799 update_background ();
1539 break;
1540 } 1800 }
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 1801
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; 1802 break;
1803 }
1561#endif 1804# endif
1562 } 1805
1806 refresh_check ();
1563} 1807}
1808#endif
1564 1809
1565void 1810void
1566rxvt_term::button_press (const XButtonEvent &ev) 1811rxvt_term::button_press (XButtonEvent &ev)
1567{ 1812{
1568 int reportmode = 0, clickintime; 1813 int reportmode = 0, clickintime;
1569 1814
1570 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1815 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1816
1571 if (!bypass_keystate) 1817 if (!bypass_keystate)
1572 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1818 reportmode = !! (priv_modes & PrivMode_mouse_report);
1819
1573 /* 1820 /*
1574 * VT window processing of button press 1821 * VT window processing of button press
1575 */ 1822 */
1576 if (ev.window == TermWin.vt) 1823 if (ev.window == vt)
1577 { 1824 {
1825 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1826 return;
1827
1828#if ISO_14755
1829 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 {
1832 iso14755_54 (ev.x, ev.y);
1833 return;
1834 }
1835#endif
1836
1578 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1837 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1838
1579 if (reportmode) 1839 if (reportmode)
1580 { 1840 {
1581 /* mouse report from vt window */ 1841 /* mouse report from vt window */
1582 /* save the xbutton state (for ButtonRelease) */ 1842 /* save the xbutton state (for ButtonRelease) */
1583 MEvent.state = ev.state; 1843 MEvent.state = ev.state;
1584#ifdef MOUSE_REPORT_DOUBLECLICK 1844#ifdef MOUSE_REPORT_DOUBLECLICK
1585 if (ev.button == MEvent.button && clickintime) 1845 if (ev.button == MEvent.button && clickintime)
1586 { 1846 {
1587 /* same button, within alloted time */ 1847 /* same button, within alloted time */
1588 MEvent.clicks++; 1848 MEvent.clicks++;
1849
1589 if (MEvent.clicks > 1) 1850 if (MEvent.clicks > 1)
1590 { 1851 {
1591 /* only report double clicks */ 1852 /* only report double clicks */
1592 MEvent.clicks = 2; 1853 MEvent.clicks = 2;
1593 mouse_report (ev); 1854 mouse_report (ev);
… …
1605 mouse_report (ev); 1866 mouse_report (ev);
1606 } 1867 }
1607#else 1868#else
1608 MEvent.button = ev.button; 1869 MEvent.button = ev.button;
1609 mouse_report (ev); 1870 mouse_report (ev);
1610#endif /* MOUSE_REPORT_DOUBLECLICK */ 1871#endif /* MOUSE_REPORT_DOUBLECLICK */
1611 1872
1612 } 1873 }
1613 else 1874 else
1614 { 1875 {
1615 if (ev.button != MEvent.button) 1876 if (ev.button != MEvent.button)
1616 MEvent.clicks = 0; 1877 MEvent.clicks = 0;
1878
1617 switch (ev.button) 1879 switch (ev.button)
1618 { 1880 {
1619 case Button1: 1881 case Button1:
1882 /* allow meta + click to select rectangular areas */
1883 /* should be done in screen.C */
1884#if ENABLE_FRILLS
1885 selection.rect = !!(ev.state & ModMetaMask);
1886#else
1887 selection.rect = false;
1888#endif
1889
1620 /* allow shift+left click to extend selection */ 1890 /* allow shift+left click to extend selection */
1621 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1891 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1622 { 1892 {
1623 if (MEvent.button == Button1 && clickintime) 1893 if (MEvent.button == Button1 && clickintime)
1624 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1625 else 1895 else
1626 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
… …
1641 case Button3: 1911 case Button3:
1642 if (MEvent.button == Button3 && clickintime) 1912 if (MEvent.button == Button3 && clickintime)
1643 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1644 else 1914 else
1645 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
1916
1646 MEvent.button = Button3; 1917 MEvent.button = Button3;
1647 break; 1918 break;
1648 } 1919 }
1649 } 1920 }
1921
1650 MEvent.time = ev.time; 1922 MEvent.time = ev.time;
1651 return; 1923 return;
1652 } 1924 }
1653 1925
1654 /* 1926 /*
1655 * Scrollbar window processing of button press 1927 * Scrollbar window processing of button press
1656 */ 1928 */
1657 if (isScrollbarWindow (ev.window)) 1929 if (scrollBar.state && ev.window == scrollBar.win)
1658 { 1930 {
1659 scrollBar.setIdle (); 1931 scrollBar.setIdle ();
1660 /* 1932 /*
1661 * Rxvt-style scrollbar: 1933 * Rxvt-style scrollbar:
1662 * move up if mouse is above slider 1934 * move up if mouse is above slider
… …
1698 tt_printf ("\033[5~"); 1970 tt_printf ("\033[5~");
1699 break; 1971 break;
1700 } 1972 }
1701 } 1973 }
1702 else 1974 else
1703#endif /* NO_SCROLLBAR_REPORT */ 1975#endif /* NO_SCROLLBAR_REPORT */
1704 1976
1705 { 1977 {
1706 char upordown = 0; 1978 char upordown = 0;
1707 1979
1708 if (scrollBar.style == R_SB_NEXT) 1980 if (scrollBar.style == R_SB_NEXT)
1709 { 1981 {
1710 if (scrollbarnext_upButton (ev.y)) 1982 if (scrollbarnext_upButton (ev.y))
1711 upordown = -1; /* up */ 1983 upordown = -1; /* up */
… …
1717 if (scrollbarrxvt_upButton (ev.y)) 1989 if (scrollbarrxvt_upButton (ev.y))
1718 upordown = -1; /* up */ 1990 upordown = -1; /* up */
1719 else if (scrollbarrxvt_dnButton (ev.y)) 1991 else if (scrollbarrxvt_dnButton (ev.y))
1720 upordown = 1; /* down */ 1992 upordown = 1; /* down */
1721 } 1993 }
1994
1722 if (upordown) 1995 if (upordown)
1723 { 1996 {
1724#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1725 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1998 if (!cont_scroll_ev.is_active ())
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1726#endif 2000#endif
1727 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (upordown < 0 ? UP : DN, 1))
1728 { 2002 {
1729 if (upordown < 0) 2003 if (upordown < 0)
1730 scrollBar.setUp (); 2004 scrollBar.setUp ();
… …
1734 } 2008 }
1735 else 2009 else
1736 switch (ev.button) 2010 switch (ev.button)
1737 { 2011 {
1738 case Button2: 2012 case Button2:
1739 switch (scrollbar_align) 2013 switch (scrollBar.align)
1740 { 2014 {
1741 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
1742 csrO = 0; 2016 csrO = 0;
1743 break; 2017 break;
1744 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
… …
1746 break; 2020 break;
1747 case R_SB_ALIGN_BOTTOM: 2021 case R_SB_ALIGN_BOTTOM:
1748 csrO = scrollBar.bot - scrollBar.top; 2022 csrO = scrollBar.bot - scrollBar.top;
1749 break; 2023 break;
1750 } 2024 }
2025
1751 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
1752 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
1753 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
1754 scr_move_to ( scrollbar_position (ev.y) - csrO, 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1755 scrollbar_size ()); 2030
1756 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
1757 break; 2032 break;
1758 2033
1759 case Button1: 2034 case Button1:
1760 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1761 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
1762 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
1763 2038
1764 case Button3: 2039 case Button3:
1765 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
1766 { 2041 {
1767 if (scrollbar_above_slider (ev.y)) 2042 if (scrollbar_above_slider (ev.y))
1768# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1769 scr_page (UP, TermWin.nrow - 1); 2044 scr_page (UP, nrow - 1);
1770# else 2045# else
1771 scr_page (UP, TermWin.nrow / 4); 2046 scr_page (UP, nrow / 4);
1772# endif 2047# endif
1773 else if (scrollbar_below_slider (ev.y)) 2048 else if (scrollbar_below_slider (ev.y))
1774# ifdef RXVT_SCROLL_FULL 2049# ifdef RXVT_SCROLL_FULL
1775 scr_page (DN, TermWin.nrow - 1); 2050 scr_page (DN, nrow - 1);
1776# else 2051# else
1777 scr_page (DN, TermWin.nrow / 4); 2052 scr_page (DN, nrow / 4);
1778# endif 2053# endif
1779 else 2054 else
1780 scrollBar.setMotion (); 2055 scrollBar.setMotion ();
1781 } 2056 }
1782 else 2057 else
1783 { 2058 {
1784 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
1785 (TermWin.nrow 2060 (nrow
1786 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
1787 / scrollbar_size ())); 2062 / scrollbar_size ()));
1788 } 2063 }
2064
1789 break; 2065 break;
1790 } 2066 }
1791 } 2067 }
2068
1792 return; 2069 return;
1793 } 2070 }
1794#if MENUBAR
1795 /*
1796 * Menubar window processing of button press
1797 */
1798 if (isMenuBarWindow (ev.window))
1799 menubar_control (ev);
1800#endif
1801} 2071}
1802 2072
1803void 2073void
1804rxvt_term::button_release (const XButtonEvent &ev) 2074rxvt_term::button_release (XButtonEvent &ev)
1805{ 2075{
1806 int reportmode = 0; 2076 int reportmode = 0;
1807 2077
1808 csrO = 0; /* reset csr Offset */ 2078 csrO = 0; /* reset csr Offset */
1809 if (!bypass_keystate) 2079 if (!bypass_keystate)
1810 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
1811 2081
1812 if (scrollbar_isUpDn ()) 2082 if (scrollbar_isUpDn ())
1813 { 2083 {
1814 scrollBar.setIdle (); 2084 scrollBar.setIdle ();
1815 scrollbar_show (0); 2085 scrollbar_show (0);
1816#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1817 refresh_type &= ~SMOOTH_REFRESH;
1818#endif
1819
1820 } 2086 }
2087
1821#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
1822 pending_scroll_selection=0; 2089 sel_scroll_ev.stop();
1823#endif 2090#endif
2091
1824 if (ev.window == TermWin.vt) 2092 if (ev.window == vt)
1825 { 2093 {
2094 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2095 return;
2096
2097#if ISO_14755
2098 // 5.4
2099 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2100 return;
2101#endif
2102
1826 if (reportmode) 2103 if (reportmode)
1827 { 2104 {
1828 /* mouse report from vt window */ 2105 /* mouse report from vt window */
1829 /* don't report release of wheel "buttons" */ 2106 /* don't report release of wheel "buttons" */
1830 if (ev.button >= 4) 2107 if (ev.button >= 4)
… …
1841 mouse_report (ev); 2118 mouse_report (ev);
1842 } 2119 }
1843#else /* MOUSE_REPORT_DOUBLECLICK */ 2120#else /* MOUSE_REPORT_DOUBLECLICK */
1844 MEvent.button = AnyButton; 2121 MEvent.button = AnyButton;
1845 mouse_report (ev); 2122 mouse_report (ev);
1846#endif /* MOUSE_REPORT_DOUBLECLICK */ 2123#endif /* MOUSE_REPORT_DOUBLECLICK */
1847 return; 2124 return;
1848 } 2125 }
2126
1849 /* 2127 /*
1850 * dumb hack to compensate for the failure of click-and-drag 2128 * dumb hack to compensate for the failure of click-and-drag
1851 * when overriding mouse reporting 2129 * when overriding mouse reporting
1852 */ 2130 */
1853 if (PrivateModes & PrivMode_mouse_report 2131 if (priv_modes & PrivMode_mouse_report
1854 && bypass_keystate 2132 && bypass_keystate
1855 && ev.button == Button1 && MEvent.clicks <= 1) 2133 && ev.button == Button1 && MEvent.clicks <= 1)
1856 selection_extend (ev.x, ev.y, 0); 2134 selection_extend (ev.x, ev.y, 0);
1857 2135
1858 switch (ev.button) 2136 switch (ev.button)
1859 { 2137 {
1860 case Button1: 2138 case Button1:
1861 case Button3: 2139 case Button3:
1862 selection_make (ev.time); 2140 selection_make (ev.time);
1863 break; 2141 break;
2142
1864 case Button2: 2143 case Button2:
1865 selection_request (ev.time, ev.x, ev.y); 2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1866 break; 2146 break;
2147
1867#ifdef MOUSE_WHEEL 2148#ifdef MOUSE_WHEEL
1868 case Button4: 2149 case Button4:
1869 case Button5: 2150 case Button5:
1870 { 2151 {
1871 int i; 2152 int i;
1872 page_dirn v; 2153 page_dirn v;
1873 2154
1874 v = (ev.button == Button4) ? UP : DN; 2155 v = ev.button == Button4 ? UP : DN;
2156
1875 if (ev.state & ShiftMask) 2157 if (ev.state & ShiftMask)
1876 i = 1; 2158 i = 1;
1877 else if ((Options & Opt_mouseWheelScrollPage)) 2159 else if (option (Opt_mouseWheelScrollPage))
1878 i = TermWin.nrow - 1; 2160 i = nrow - 1;
1879 else 2161 else
1880 i = 5; 2162 i = 5;
2163
1881# ifdef MOUSE_SLIP_WHEELING 2164# ifdef MOUSE_SLIP_WHEELING
1882 if (ev.state & ControlMask) 2165 if (ev.state & ControlMask)
1883 { 2166 {
1884 mouse_slip_wheel_speed += (v ? -1 : 1); 2167 mouse_slip_wheel_speed += v ? -1 : 1;
1885 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2170
2171 if (!slip_wheel_ev.is_active ())
2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1886 } 2173 }
2174 else
1887# endif 2175# 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 { 2176 {
1895 scr_page (v, 1); 2177 scr_page (v, i);
1896 scr_refresh (SMOOTH_REFRESH);
1897 scrollbar_show (1); 2178 scrollbar_show (1);
1898 } 2179 }
1899# endif
1900
1901 } 2180 }
1902 break; 2181 break;
1903#endif 2182#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 { 2183 }
1943 pchanged = 1; 2184 }
1944 XSetWindowBackground (display->display, TermWin.vt, 2185}
1945 PixColors[Color_bg]); 2186
1946 am_transparent = am_pixmap_trans = 0; 2187/*}}} */
2188
2189bool
2190rxvt_term::cmd_parse ()
2191{
2192 bool flag = false;
2193 wchar_t ch = NOCHAR;
2194 char *seq_begin; // remember start of esc-sequence here
2195
2196 for (;;)
2197 {
2198 if (ch == NOCHAR)
1947 } 2199 {
1948 return pchanged; /* Don't try any more */ 2200 seq_begin = cmdbuf_ptr;
1949 } 2201 ch = next_char ();
1950 2202
1951 /* Get all X ops out of the queue so that our information is up-to-date. */ 2203 if (ch == NOCHAR)
1952 XSync (display->display, False); 2204 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 { 2205 }
1990 nw += sx; 2206
1991 nx = -sx; 2207 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
1992 sx = 0;
1993 } 2208 {
1994 if (sy < 0) 2209 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 { 2210 {
2012 pchanged = 1; 2211 seen_input = 1;
2013 if (TermWin.pixmap != None) 2212 // many badly-written programs (e.g. jed) contain a race condition:
2213 // they first read the screensize and then install a SIGWINCH handler.
2214 // some window managers resize the window early, and these programs
2215 // then sometimes get the size wrong.
2216 // unfortunately other programs are even more buggy and dislike
2217 // being sent SIGWINCH, so only do it when we were in fact being
2218 // resized.
2219 if (seen_resize && cmd_pid)
2220 kill (-cmd_pid, SIGWINCH);
2221 }
2222
2223 /* Read a text string from the input buffer */
2224 wchar_t buf[UBUFSIZ];
2225 bool refreshnow = false;
2226 int nlines = 0;
2227 wchar_t *str = buf;
2228 wchar_t *eol = str + min (ncol, UBUFSIZ);
2229
2230 for (;;)
2231 {
2232 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2233 break;
2234
2235 *str++ = ch;
2236
2237 if (ch == C0_LF || str >= eol)
2014 { 2238 {
2015 XFreePixmap (display->display, TermWin.pixmap); 2239 if (ch == C0_LF)
2016 TermWin.pixmap = None; 2240 nlines++;
2241
2242 refresh_count++;
2243
2244 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2245 {
2246 refresh_count = 0;
2247
2248 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2249 {
2250 refreshnow = true;
2251 ch = NOCHAR;
2252 break;
2253 }
2254 }
2255
2256 // scr_add_lines only works for nlines <= nrow - 1.
2257 if (nlines >= nrow - 1)
2258 {
2259 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2260 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2261 scr_add_lines (buf, str - buf, nlines);
2262
2263 nlines = 0;
2264 str = buf;
2265 eol = str + min (ncol, UBUFSIZ);
2266 }
2267
2268 if (str >= eol)
2269 {
2270 if (eol >= buf + UBUFSIZ)
2271 {
2272 ch = NOCHAR;
2273 break;
2274 }
2275 else
2276 eol = min (eol + ncol, buf + UBUFSIZ);
2277 }
2278
2017 } 2279 }
2280
2281 seq_begin = cmdbuf_ptr;
2282 ch = next_char ();
2018 } 2283 }
2019 am_pixmap_trans = 0; 2284
2285 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2286 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2287 scr_add_lines (buf, str - buf, nlines);
2288
2289 /*
2290 * If there have been a lot of new lines, then update the screen
2291 * What the heck we'll cheat and only refresh less than every page-full.
2292 * if skipScroll is enabled.
2293 */
2294 if (refreshnow)
2295 {
2296 flag = true;
2297 scr_refresh ();
2298 want_refresh = 1;
2299 }
2300
2020 } 2301 }
2021 else 2302 else
2022 { 2303 {
2023 if (TermWin.pixmap != None) 2304 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 { 2305 {
2059 if (oldp != None) 2306 process_nonprinting (ch);
2060 pchanged = 1; 2307 }
2308 catch (const class out_of_input &o)
2309 {
2310 // we ran out of input, retry later
2311 cmdbuf_ptr = seq_begin;
2061 break; 2312 break;
2062 } 2313 }
2063 if (oldp != TermWin.parent[i]) 2314
2064 pchanged = 1; 2315 ch = NOCHAR;
2065 }
2066 n = 0;
2067 if (pchanged)
2068 { 2316 }
2069 for (; n < (unsigned int)i; n++) 2317 }
2070 { 2318
2071 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2319 return flag;
2072 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2320}
2073 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2321
2074 { 2322// read the next character
2075 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2323wchar_t
2076 break; 2324rxvt_term::next_char () NOTHROW
2077 } 2325{
2078 } 2326 while (cmdbuf_ptr < cmdbuf_endp)
2327 {
2328 // assume 7-bit to be ascii ALWAYS
2329 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2330 return *cmdbuf_ptr++;
2331
2332 wchar_t wc;
2333 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2334
2335 if (len == (size_t)-2)
2079 } 2336 {
2080 if (n > (int) (sizeof (TermWin.parent) 2337 // the mbstate stores incomplete sequences. didn't know this :/
2081 / sizeof (TermWin.parent[0]))) 2338 cmdbuf_ptr = cmdbuf_endp;
2339 break;
2082 { 2340 }
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 2341
2098 rqt.tv_sec = 1; 2342 if (len == (size_t)-1)
2099 rqt.tv_nsec = 0; 2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2100 nanosleep (&rqt, NULL); 2344
2101# else 2345 // assume wchar == unicode
2102 sleep (1); 2346 cmdbuf_ptr += len;
2103# endif 2347 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 } 2348 }
2349
2350 return NOCHAR;
2351}
2352
2353// read the next octet
2354uint32_t
2355rxvt_term::next_octet () NOTHROW
2356{
2357 return cmdbuf_ptr < cmdbuf_endp
2358 ? (unsigned char)*cmdbuf_ptr++
2359 : NOCHAR;
2360}
2361
2362static class out_of_input out_of_input;
2363
2364/* rxvt_cmd_getc () - Return next input character */
2365/*
2366 * Return the next input character after first passing any keyboard input
2367 * to the command.
2368 */
2369wchar_t
2370rxvt_term::cmd_getc () THROW ((class out_of_input))
2371{
2372 wchar_t c = next_char ();
2373
2374 if (c == NOCHAR)
2375 throw out_of_input;
2376
2115 return pchanged; 2377 return c;
2116} 2378}
2117#endif
2118 2379
2119/*}}} */ 2380uint32_t
2381rxvt_term::cmd_get8 () THROW ((class out_of_input))
2382{
2383 uint32_t c = next_octet ();
2384
2385 if (c == NOCHAR)
2386 throw out_of_input;
2387
2388 return c;
2389}
2120 2390
2121/*{{{ print pipe */ 2391/*{{{ print pipe */
2122/*----------------------------------------------------------------------*/ 2392/*----------------------------------------------------------------------*/
2123#ifdef PRINTPIPE 2393#ifdef PRINTPIPE
2124FILE * 2394FILE *
2125rxvt_term::popen_printer () 2395rxvt_term::popen_printer ()
2126{ 2396{
2127 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2397 FILE *stream = popen (rs[Rs_print_pipe], "w");
2128 2398
2129 if (stream == NULL) 2399 if (stream == NULL)
2130 rxvt_print_error ("can't open printer pipe"); 2400 rxvt_warn ("can't open printer pipe, not printing.\n");
2401
2131 return stream; 2402 return stream;
2132} 2403}
2133 2404
2134int 2405int
2135rxvt_term::pclose_printer (FILE *stream) 2406rxvt_term::pclose_printer (FILE *stream)
2136{ 2407{
2137 fflush (stream); 2408 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); 2409 return pclose (stream);
2144# endif
2145} 2410}
2146 2411
2147/* 2412/*
2148 * simulate attached vt100 printer 2413 * simulate attached vt100 printer
2149 */ 2414 */
2150void 2415void
2151rxvt_term::process_print_pipe () 2416rxvt_term::process_print_pipe ()
2152{ 2417{
2153 int done; 2418 int done;
2154 FILE *fd; 2419 FILE *fd;
2155 2420
2156 if ((fd = popen_printer ()) == NULL) 2421 if ((fd = popen_printer ()) == NULL)
2157 return; 2422 return;
2158 2423
2159 /* 2424 /*
2160 * Send all input to the printer until either ESC[4i or ESC[?4i 2425 * Send all input to the printer until either ESC[4i or ESC[?4i
2161 * is received. 2426 * is received.
2162 */ 2427 */
2163 for (done = 0; !done;) 2428 for (done = 0; !done;)
2164 { 2429 {
2165 unsigned char buf[8]; 2430 unsigned char buf[8];
2166 unsigned char ch; 2431 unicode_t ch;
2167 unsigned int i, len; 2432 unsigned int i, len;
2168 2433
2169 if ((ch = cmd_getc ()) != C0_ESC) 2434 if ((ch = cmd_getc ()) != C0_ESC)
2170 { 2435 {
2171 if (putc (ch, fd) == EOF) 2436 if (putc (ch, fd) == EOF)
2172 break; /* done = 1 */ 2437 break; /* done = 1 */
… …
2187 { 2452 {
2188 if ((buf[len++] = cmd_getc ()) == 'i') 2453 if ((buf[len++] = cmd_getc ()) == 'i')
2189 break; /* done = 1 */ 2454 break; /* done = 1 */
2190 } 2455 }
2191 } 2456 }
2457
2192 for (i = 0; i < len; i++) 2458 for (i = 0; i < len; i++)
2193 if (putc (buf[i], fd) == EOF) 2459 if (putc (buf[i], fd) == EOF)
2194 { 2460 {
2195 done = 1; 2461 done = 1;
2196 break; 2462 break;
2197 } 2463 }
2198 } 2464 }
2199 } 2465 }
2466
2200 pclose_printer (fd); 2467 pclose_printer (fd);
2201} 2468}
2202#endif /* PRINTPIPE */ 2469#endif /* PRINTPIPE */
2203/*}}} */ 2470/*}}} */
2204 2471
2205/* *INDENT-OFF* */ 2472/* *INDENT-OFF* */
2206enum { 2473enum {
2207 C1_40 = 0x40, 2474 C1_40 = 0x40,
2208 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2475 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, 2476 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, 2477 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 2478 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2212}; 2479};
2213/* *INDENT-ON* */ 2480/* *INDENT-ON* */
2214 2481
2215/*{{{ process non-printing single characters */ 2482/*{{{ process non-printing single characters */
2216void 2483void
2217rxvt_term::process_nonprinting (unsigned char ch) 2484rxvt_term::process_nonprinting (unicode_t ch)
2218{ 2485{
2219 switch (ch) 2486 switch (ch)
2220 { 2487 {
2488 case C0_ESC:
2489 process_escape_seq ();
2490 break;
2221 case C0_ENQ: /* terminal Status */ 2491 case C0_ENQ: /* terminal Status */
2222 if (rs[Rs_answerbackstring]) 2492 if (rs[Rs_answerbackstring])
2223 tt_write ( 2493 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 2494 else
2227 tt_write ((unsigned char *)VT100_ANS, 2495 tt_write (VT100_ANS, strlen (VT100_ANS));
2228 (unsigned int)STRLEN (VT100_ANS));
2229 break; 2496 break;
2230 case C0_BEL: /* bell */ 2497 case C0_BEL: /* bell */
2231 scr_bell (); 2498 scr_bell ();
2232 break; 2499 break;
2233 case C0_BS: /* backspace */ 2500 case C0_BS: /* backspace */
… …
2248 scr_charset_choose (1); 2515 scr_charset_choose (1);
2249 break; 2516 break;
2250 case C0_SI: /* shift in - acs */ 2517 case C0_SI: /* shift in - acs */
2251 scr_charset_choose (0); 2518 scr_charset_choose (0);
2252 break; 2519 break;
2520
2521#ifdef EIGHT_BIT_CONTROLS
2522 // 8-bit controls
2523 case 0x90: /* DCS */
2524 process_dcs_seq ();
2525 break;
2526 case 0x9b: /* CSI */
2527 process_csi_seq ();
2528 break;
2529 case 0x9d: /* OSC */
2530 process_osc_seq ();
2531 break;
2532#endif
2253 } 2533 }
2254} 2534}
2255/*}}} */ 2535/*}}} */
2256 2536
2257 2537
2258/*{{{ process VT52 escape sequences */ 2538/*{{{ process VT52 escape sequences */
2259void 2539void
2260rxvt_term::process_escape_vt52 (unsigned char ch) 2540rxvt_term::process_escape_vt52 (unicode_t ch)
2261{ 2541{
2262 int row, col; 2542 int row, col;
2263 2543
2264 switch (ch) 2544 switch (ch)
2265 { 2545 {
… …
2317 2597
2318/*{{{ process escape sequences */ 2598/*{{{ process escape sequences */
2319void 2599void
2320rxvt_term::process_escape_seq () 2600rxvt_term::process_escape_seq ()
2321{ 2601{
2322 unsigned char ch = cmd_getc (); 2602 unicode_t ch = cmd_getc ();
2323 2603
2324 if (PrivateModes & PrivMode_vt52) 2604 if (priv_modes & PrivMode_vt52)
2325 { 2605 {
2326 process_escape_vt52 (ch); 2606 process_escape_vt52 (ch);
2327 return; 2607 return;
2328 } 2608 }
2329 2609
… …
2344 scr_charset_set (2, (unsigned int)cmd_getc ()); 2624 scr_charset_set (2, (unsigned int)cmd_getc ());
2345 break; 2625 break;
2346 case '+': 2626 case '+':
2347 scr_charset_set (3, (unsigned int)cmd_getc ()); 2627 scr_charset_set (3, (unsigned int)cmd_getc ());
2348 break; 2628 break;
2349#ifdef MULTICHAR_SET 2629#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': 2630 case '6':
2356 scr_backindex (); 2631 scr_backindex ();
2357 break; 2632 break;
2358#endif 2633#endif
2359 case '7': 2634 case '7':
2360 scr_cursor (SAVE); 2635 scr_cursor (SAVE);
2361 break; 2636 break;
2362 case '8': 2637 case '8':
2363 scr_cursor (RESTORE); 2638 scr_cursor (RESTORE);
2364 break; 2639 break;
2365#ifndef NO_FRILLS 2640#if !ENABLE_MINIMAL
2366 case '9': 2641 case '9':
2367 scr_forwardindex (); 2642 scr_forwardindex ();
2368 break; 2643 break;
2369#endif 2644#endif
2370 case '=': 2645 case '=':
… …
2380 break; 2655 break;
2381 2656
2382 /* 8.3.87: NEXT LINE */ 2657 /* 8.3.87: NEXT LINE */
2383 case C1_NEL: /* ESC E */ 2658 case C1_NEL: /* ESC E */
2384 { 2659 {
2385 uint32_t nlcr[] = { '\n', '\r' }; 2660 wchar_t nlcr[] = { C0_LF, C0_CR };
2386 scr_add_lines (nlcr, 1, 2); 2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2387 } 2662 }
2388 break; 2663 break;
2389 2664
2390 /* kidnapped escape sequence: Should be 8.3.48 */ 2665 /* kidnapped escape sequence: Should be 8.3.48 */
2391 case C1_ESA: /* ESC G */ 2666 case C1_ESA: /* ESC G */
… …
2401 case C1_RI: /* ESC M */ 2676 case C1_RI: /* ESC M */
2402 scr_index (DN); 2677 scr_index (DN);
2403 break; 2678 break;
2404 2679
2405 /* 8.3.142: SINGLE-SHIFT TWO */ 2680 /* 8.3.142: SINGLE-SHIFT TWO */
2406 /*case C1_SS2: scr_single_shift (2); break; */ 2681 /*case C1_SS2: scr_single_shift (2); break; */
2407 2682
2408 /* 8.3.143: SINGLE-SHIFT THREE */ 2683 /* 8.3.143: SINGLE-SHIFT THREE */
2409 /*case C1_SS3: scr_single_shift (3); break; */ 2684 /*case C1_SS3: scr_single_shift (3); break; */
2410 2685
2411 /* 8.3.27: DEVICE CONTROL STRING */ 2686 /* 8.3.27: DEVICE CONTROL STRING */
2412 case C1_DCS: /* ESC P */ 2687 case C1_DCS: /* ESC P */
2413 process_dcs_seq (); 2688 process_dcs_seq ();
2414 break; 2689 break;
2415 2690
2416 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2417 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
2418 tt_write ((const unsigned char *)ESCZ_ANSWER, 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2419 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2420 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
2421 2695
2422 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2423 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
2424 process_csi_seq (); 2698 process_csi_seq ();
… …
2429 process_osc_seq (); 2703 process_osc_seq ();
2430 break; 2704 break;
2431 2705
2432 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE */
2433 case 'c': 2707 case 'c':
2708 mbstate.reset ();
2434 scr_poweron (); 2709 scr_poweron ();
2435 scrollbar_show (1); 2710 scrollbar_show (1);
2436 break; 2711 break;
2437 2712
2438 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2450 2725
2451/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2726/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2452/* *INDENT-OFF* */ 2727/* *INDENT-OFF* */
2453enum { 2728enum {
2454 CSI_ICH = 0x40, 2729 CSI_ICH = 0x40,
2455 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2730 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 , 2731 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, 2732 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, 2733 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, 2734 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, 2735 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, */ 2750 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, [, \, ], ^, _, */ 2751 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, */ 2752 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, */ 2753 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, */ 2754 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, {, |, }, ~, */ 2755 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2481 }; 2756 };
2482/* *INDENT-ON* */ 2757/* *INDENT-ON* */
2483 2758
2484void 2759void
2485rxvt_term::process_csi_seq () 2760rxvt_term::process_csi_seq ()
2486{ 2761{
2487 unsigned char ch, priv, i; 2762 unicode_t ch, priv, i;
2488 unsigned int nargs, p; 2763 unsigned int nargs, p;
2489 int n, ndef; 2764 int n, ndef;
2490 int arg[ESC_ARGS]; 2765 int arg[ESC_ARGS] = { };
2491 2766
2492 for (nargs = ESC_ARGS; nargs > 0;) 2767 nargs = 0;
2493 arg[--nargs] = 0;
2494 2768
2495 priv = 0; 2769 priv = 0;
2496 ch = cmd_getc (); 2770 ch = cmd_getc ();
2497 if (ch >= '<' && ch <= '?') 2771 if (ch >= '<' && ch <= '?')
2772 {
2498 { /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' */
2499 priv = ch; 2774 priv = ch;
2500 ch = cmd_getc (); 2775 ch = cmd_getc ();
2501 } 2776 }
2777
2502 /* read any numerical arguments */ 2778 /* read any numerical arguments */
2503 for (n = -1; ch < CSI_ICH; ) 2779 for (n = -1; ch < CSI_ICH; )
2504 { 2780 {
2505 if (isdigit (ch)) 2781 if (isdigit (ch))
2506 { 2782 {
… …
2513 { 2789 {
2514 if (nargs < ESC_ARGS) 2790 if (nargs < ESC_ARGS)
2515 arg[nargs++] = n; 2791 arg[nargs++] = n;
2516 n = -1; 2792 n = -1;
2517 } 2793 }
2518 else if (ch == '\b') 2794 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); 2795 process_nonprinting (ch);
2530 } 2796
2531 ch = cmd_getc (); 2797 ch = cmd_getc ();
2532 } 2798 }
2533 2799
2534 if (ch > CSI_7F) 2800 if (ch > CSI_7F)
2535 return; 2801 return;
… …
2541 ndef = get_byte_array_bit (csi_defaults, i); 2807 ndef = get_byte_array_bit (csi_defaults, i);
2542 for (p = 0; p < nargs; p++) 2808 for (p = 0; p < nargs; p++)
2543 if (arg[p] == -1) 2809 if (arg[p] == -1)
2544 arg[p] = ndef; 2810 arg[p] = ndef;
2545 2811
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 /* 2812 /*
2554 * private mode handling 2813 * private mode handling
2555 */ 2814 */
2556 if (priv) 2815 if (priv)
2557 { 2816 {
2558 switch (priv) 2817 switch (priv)
2559 { 2818 {
2560 case '>': 2819 case '>':
2561 if (ch == CSI_DA) /* secondary device attributes */ 2820 if (ch == CSI_DA) /* secondary device attributes */
2821 {
2822 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2823 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2824 //
2825 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2826 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2827 // versions.
2828 //
2562 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2829 tt_printf ("\033[>%d;95;0c", 'U');
2830 }
2563 break; 2831 break;
2564 case '?': 2832 case '?':
2565 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2566 process_terminal_mode (ch, priv, nargs, arg); 2834 process_terminal_mode (ch, priv, nargs, arg);
2567 break; 2835 break;
… …
2672 2940
2673 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2941 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2674 arg[0] = -arg[0]; 2942 arg[0] = -arg[0];
2675 /* FALLTHROUGH */ 2943 /* FALLTHROUGH */
2676 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2944 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2677 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2678 break; 2946 break;
2679 2947
2680 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2681 tt_write ((const unsigned char *)VT100_ANS, 2949 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2682 (unsigned int) (sizeof (VT100_ANS) - 1));
2683 break; 2950 break;
2684 2951
2685 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2952 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2686 process_sgr_mode (nargs, arg); 2953 process_sgr_mode (nargs, arg);
2687 break; 2954 break;
… …
2693 tt_printf ("\033[0n"); 2960 tt_printf ("\033[0n");
2694 break; 2961 break;
2695 case 6: /* CPR requested */ 2962 case 6: /* CPR requested */
2696 scr_report_position (); 2963 scr_report_position ();
2697 break; 2964 break;
2698#if defined (ENABLE_DISPLAY_ANSWER)
2699 case 7: /* unofficial extension */ 2965 case 7: /* unofficial extension */
2966 if (option (Opt_insecure))
2700 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2967 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2701 break; 2968 break;
2702#endif
2703 case 8: /* unofficial extension */ 2969 case 8: /* unofficial extension */
2704 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2970 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2705 break; 2971 break;
2706 } 2972 }
2707 break; 2973 break;
2708 2974
2709 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2975 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2742 break; 3008 break;
2743 3009
2744 case CSI_RM: /* 8.3.107: RESET MODE */ 3010 case CSI_RM: /* 8.3.107: RESET MODE */
2745 if (arg[0] == 4) 3011 if (arg[0] == 4)
2746 scr_insert_mode (0); 3012 scr_insert_mode (0);
3013 else if (arg[0] == 20)
3014 priv_modes &= ~PrivMode_LFNL;
2747 break; 3015 break;
2748 3016
2749 case CSI_SM: /* 8.3.126: SET MODE */ 3017 case CSI_SM: /* 8.3.126: SET MODE */
2750 if (arg[0] == 4) 3018 if (arg[0] == 4)
2751 scr_insert_mode (1); 3019 scr_insert_mode (1);
3020 else if (arg[0] == 20)
3021 priv_modes |= PrivMode_LFNL;
2752 break; 3022 break;
2753 3023
2754 /* 3024 /*
2755 * PRIVATE USE beyond this point. All CSI_7? sequences here 3025 * PRIVATE USE beyond this point. All CSI_7? sequences here
2756 */ 3026 */
… …
2768 break; 3038 break;
2769 case CSI_75: 3039 case CSI_75:
2770 scr_cursor (RESTORE); 3040 scr_cursor (RESTORE);
2771 break; 3041 break;
2772 3042
2773#ifndef NO_FRILLS 3043#if !ENABLE_MINIMAL
2774 case CSI_74: 3044 case CSI_74:
2775 process_window_ops (arg, nargs); 3045 process_window_ops (arg, nargs);
2776 break; 3046 break;
2777#endif 3047#endif
2778 3048
2779 case CSI_78: /* DECREQTPARM */ 3049 case CSI_78: /* DECREQTPARM */
2780 if (arg[0] == 0 || arg[0] == 1) 3050 if (arg[0] == 0 || arg[0] == 1)
2781 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3051 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2782 /* FALLTHROUGH */ 3052 break;
2783 3053
2784 default: 3054 default:
2785 break; 3055 break;
2786 } 3056 }
2787} 3057}
2788/*}}} */ 3058/*}}} */
2789 3059
2790#ifndef NO_FRILLS 3060#if !ENABLE_MINIMAL
2791/* ARGSUSED */ 3061/* ARGSUSED */
2792void 3062void
2793rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3063rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2794{ 3064{
2795 int x, y; 3065 int x, y;
2796#if 0
2797 char *s;
2798#endif
2799 XWindowAttributes wattr; 3066 XWindowAttributes wattr;
2800 Window wdummy; 3067 Window wdummy;
3068
3069 dLocal (Display *, dpy);
2801 3070
2802 if (nargs == 0) 3071 if (nargs == 0)
2803 return; 3072 return;
3073
2804 switch (args[0]) 3074 switch (args[0])
2805 { 3075 {
2806 /* 3076 /*
2807 * commands 3077 * commands
2808 */ 3078 */
2809 case 1: /* deiconify window */ 3079 case 1: /* deiconify window */
2810 XMapWindow (display->display, TermWin.parent[0]); 3080 XMapWindow (dpy, parent[0]);
2811 break; 3081 break;
2812 case 2: /* iconify window */ 3082 case 2: /* iconify window */
2813 XIconifyWindow (display->display, TermWin.parent[0], 3083 XIconifyWindow (dpy, parent[0], display->screen);
2814 DefaultScreen (display->display));
2815 break; 3084 break;
2816 case 3: /* set position (pixels) */ 3085 case 3: /* set position (pixels) */
2817 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3086 XMoveWindow (dpy, parent[0], args[1], args[2]);
2818 break; 3087 break;
2819 case 4: /* set size (pixels) */ 3088 case 4: /* set size (pixels) */
2820 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3089 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2821 break; 3090 break;
2822 case 5: /* raise window */ 3091 case 5: /* raise window */
2823 XRaiseWindow (display->display, TermWin.parent[0]); 3092 XRaiseWindow (dpy, parent[0]);
2824 break; 3093 break;
2825 case 6: /* lower window */ 3094 case 6: /* lower window */
2826 XLowerWindow (display->display, TermWin.parent[0]); 3095 XLowerWindow (dpy, parent[0]);
2827 break; 3096 break;
2828 case 7: /* refresh window */ 3097 case 7: /* refresh window */
2829 scr_touch (true); 3098 scr_touch (true);
2830 break; 3099 break;
2831 case 8: /* set size (chars) */ 3100 case 8: /* set size (chars) */
2832 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3101 set_widthheight ((unsigned int) (args[2] * fwidth),
2833 (unsigned int) (args[1] * TermWin.fheight)); 3102 (unsigned int) (args[1] * fheight));
2834 break; 3103 break;
3104
3105 //case 9: NYI, TODO, restore maximized window or maximize window
2835 default: 3106 default:
2836 if (args[0] >= 24) /* set height (chars) */ 3107 if (args[0] >= 24) /* set height (chars) */
2837 set_widthheight ((unsigned int)TermWin.width, 3108 set_widthheight ((unsigned int)width,
2838 (unsigned int) (args[1] * TermWin.fheight)); 3109 (unsigned int) (args[1] * fheight));
2839 break; 3110 break;
3111
2840 /* 3112 /*
2841 * reports - some output format copied from XTerm 3113 * reports - some output format copied from XTerm
2842 */ 3114 */
2843 case 11: /* report window state */ 3115 case 11: /* report window state */
2844 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3116 XGetWindowAttributes (dpy, parent[0], &wattr);
2845 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3117 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2846 break; 3118 break;
2847 case 13: /* report window position */ 3119 case 13: /* report window position */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3120 XGetWindowAttributes (dpy, parent[0], &wattr);
2849 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3121 XTranslateCoordinates (dpy, parent[0], wattr.root,
2850 -wattr.border_width, -wattr.border_width, 3122 -wattr.border_width, -wattr.border_width,
2851 &x, &y, &wdummy); 3123 &x, &y, &wdummy);
2852 tt_printf ("\033[3;%d;%dt", x, y); 3124 tt_printf ("\033[3;%d;%dt", x, y);
2853 break; 3125 break;
2854 case 14: /* report window size (pixels) */ 3126 case 14: /* report window size (pixels) */
2855 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3127 XGetWindowAttributes (dpy, parent[0], &wattr);
2856 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3128 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2857 break; 3129 break;
3130 case 18: /* report text area size (chars) */
3131 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3132 break;
2858 case 18: /* report window size (chars) */ 3133 case 19: /* report window size (chars) */
2859 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3134 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2860 break; 3135 break;
2861#if 0 /* XXX: currently disabled due to security concerns */
2862 case 20: /* report icon label */ 3136 case 20: /* report icon label */
3137 {
3138 char *s;
2863 XGetIconName (display->display, TermWin.parent[0], &s); 3139 XGetIconName (dpy, parent[0], &s);
2864 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3140 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3141 XFree (s);
3142 }
2865 break; 3143 break;
2866 case 21: /* report window title */ 3144 case 21: /* report window title */
3145 {
3146 char *s;
2867 XFetchName (display->display, TermWin.parent[0], &s); 3147 XFetchName (dpy, parent[0], &s);
2868 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3148 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3149 XFree (s);
3150 }
2869 break; 3151 break;
2870#endif
2871
2872 } 3152 }
2873} 3153}
2874#endif 3154#endif
2875 3155
2876/*----------------------------------------------------------------------*/ 3156/*----------------------------------------------------------------------*/
2877/* 3157/*
2878 * get input up until STRING TERMINATOR (or BEL) 3158 * get input up until STRING TERMINATOR (or BEL)
2879 * ends_how is terminator used. returned input must be free ()d 3159 * ends_how is terminator used. returned input must be free()'d
2880 */ 3160 */
2881unsigned char * 3161char *
2882rxvt_term::get_to_st (unsigned char *ends_how) 3162rxvt_term::get_to_st (unicode_t &ends_how)
2883{ 3163{
2884 int seen_esc = 0; /* seen escape? */ 3164 unicode_t ch;
3165 bool seen_esc = false;
2885 unsigned int n = 0; 3166 unsigned int n = 0;
2886 unsigned char *s; 3167 wchar_t string[STRING_MAX];
2887 unsigned char ch, string[STRING_MAX];
2888 3168
2889 for (; (ch = cmd_getc ());) 3169 while ((ch = cmd_getc ()) != NOCHAR)
2890 { 3170 {
2891 if (ch == C0_BEL 3171 if (seen_esc)
2892 || ch == CHAR_ST 3172 {
2893 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3173 if (ch == 0x5c) /* 7bit ST */
2894 break; 3174 break;
3175 else
3176 return NULL;
3177 }
2895 if (ch == C0_ESC) 3178 else if (ch == C0_ESC)
2896 { 3179 {
2897 seen_esc = 1; 3180 seen_esc = true;
2898 continue; 3181 continue;
2899 } 3182 }
3183 else if (ch == C0_BEL || ch == CHAR_ST)
3184 break;
2900 else if (ch == '\t') 3185 else if (ch == C0_SYN)
2901 ch = ' '; /* translate '\t' to space */ 3186 ch = cmd_get8 ();
2902 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3187 else if (ch < 0x20)
2903 return NULL; /* other control character - exit */ 3188 return NULL; /* other control character - exit */
2904 if (n < sizeof (string) - 1) 3189
3190 seen_esc = false;
3191
3192 if (n >= STRING_MAX - 1)
3193 // stop at some sane length
3194 return NULL;
3195
2905 string[n++] = ch; 3196 string[n++] = ch;
2906 seen_esc = 0;
2907 } 3197 }
3198
2908 string[n++] = '\0'; 3199 string[n++] = '\0';
2909 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3200
2910 return NULL;
2911 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3201 ends_how = (ch == 0x5c ? C0_ESC : ch);
2912 STRNCPY (s, string, n); 3202
2913 return s; 3203 return rxvt_wcstombs (string);
2914} 3204}
2915 3205
2916/*----------------------------------------------------------------------*/ 3206/*----------------------------------------------------------------------*/
2917/* 3207/*
2918 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3208 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2919 */ 3209 */
2920void 3210void
2921rxvt_term::process_dcs_seq () 3211rxvt_term::process_dcs_seq ()
2922{ 3212{
2923 unsigned char eh, *s; 3213 char *s;
3214 unicode_t eh;
3215
2924 /* 3216 /*
2925 * Not handled yet 3217 * Not handled yet
2926 */ 3218 */
2927 s = get_to_st (&eh); 3219 s = get_to_st (eh);
2928 if (s) 3220 if (s)
2929 free (s); 3221 free (s);
3222
2930 return; 3223 return;
2931} 3224}
2932 3225
2933/*----------------------------------------------------------------------*/ 3226/*----------------------------------------------------------------------*/
2934/* 3227/*
2935 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3228 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2936 */ 3229 */
2937void 3230void
2938rxvt_term::process_osc_seq () 3231rxvt_term::process_osc_seq ()
2939{ 3232{
2940 unsigned char ch, eh, *s; 3233 unicode_t ch, eh;
2941 int arg; 3234 int arg;
2942 3235
2943 ch = cmd_getc (); 3236 ch = cmd_getc ();
2944 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3237 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2945 arg = arg * 10 + (ch - '0'); 3238 arg = arg * 10 + (ch - '0');
2946 3239
2947 if (ch == ';') 3240 if (ch == ';')
2948 { 3241 {
2949 s = get_to_st (&eh); 3242 char *s = get_to_st (eh);
3243
2950 if (s) 3244 if (s)
2951 { 3245 {
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); 3246 process_xterm_seq (arg, s, eh);
2964 free (s); 3247 free (s);
2965 } 3248 }
2966 } 3249 }
2967} 3250}
3251
3252void
3253rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3254{
3255 if (str[0] == '?' && !str[1])
3256 {
3257 rgba c;
3258 pix_colors_focused[color].get (c);
3259
3260#if XFT
3261 if (c.a != rgba::MAX_CC)
3262 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3263 else
3264#endif
3265 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3266 }
3267 else
3268 set_window_color (color, str);
3269}
3270
2968/* 3271/*
2969 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3272 * 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 */ 3273 */
2990void 3274void
2991rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3275rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2992{ 3276{
2993 int changed = 0; 3277 int color;
2994 int color;
2995 char *buf, *name; 3278 char *buf, *name;
3279 bool query = str[0] == '?' && !str[1];
3280 int saveop = op;
3281
3282 dLocal (Display *, dpy);
2996 3283
2997 assert (str != NULL); 3284 assert (str != NULL);
3285
3286 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3287 return;
3288
2998 switch (op) 3289 switch (op)
2999 { 3290 {
3000 case XTerm_name: 3291 case XTerm_name:
3001 set_title (str); 3292 set_title (str);
3002 /* FALLTHROUGH */ 3293 /* FALLTHROUGH */
3003 case XTerm_iconName: 3294 case XTerm_iconName:
3004 set_iconName (str); 3295 set_icon_name (str);
3005 break; 3296 break;
3006 case XTerm_title: 3297 case XTerm_title:
3007 set_title (str); 3298 set_title (str);
3008 break; 3299 break;
3300 case XTerm_property:
3301 if (str[0] == '?')
3302 {
3303 Atom prop = display->atom (str + 1);
3304 Atom actual_type;
3305 int actual_format;
3306 unsigned long nitems;
3307 unsigned long bytes_after;
3308 unsigned char *value = 0;
3309 const char *str = "";
3310
3311 if (prop
3312 && XGetWindowProperty (dpy, parent[0],
3313 prop, 0, 1<<16, 0, AnyPropertyType,
3314 &actual_type, &actual_format,
3315 &nitems, &bytes_after, &value) == Success
3316 && actual_type != None
3317 && actual_format == 8)
3318 str = (const char *)(value);
3319
3320 tt_printf ("\033]%d;%s%c", op, str, resp);
3321
3322 XFree (value);
3323 }
3324 else
3325 {
3326 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3327
3328 if (eq)
3329 {
3330 *eq = 0;
3331 set_utf8_property (display->atom (str), eq + 1);
3332 }
3333 else
3334 XDeleteProperty (dpy, parent[0],
3335 display->atom (str));
3336 }
3337 break;
3338
3009 case XTerm_Color: 3339 case XTerm_Color:
3010 for (buf = (char *)str; buf && *buf;) 3340 for (buf = (char *)str; buf && *buf;)
3011 { 3341 {
3012 if ((name = STRCHR (buf, ';')) == NULL) 3342 if ((name = strchr (buf, ';')) == NULL)
3013 break; 3343 break;
3344
3014 *name++ = '\0'; 3345 *name++ = '\0';
3015 color = atoi (buf); 3346 color = atoi (buf) + minCOLOR;
3016 if (color < 0 || color >= TOTAL_COLORS) 3347
3348 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3017 break; 3349 break;
3350
3018 if ((buf = STRCHR (name, ';')) != NULL) 3351 if ((buf = strchr (name, ';')) != NULL)
3019 *buf++ = '\0'; 3352 *buf++ = '\0';
3020 set_window_color (color + minCOLOR, name); 3353
3354 process_color_seq (op, color, name, resp);
3021 } 3355 }
3356 break;
3357 case XTerm_Color00:
3358 process_color_seq (op, Color_fg, str, resp);
3359 break;
3360 case XTerm_Color01:
3361 process_color_seq (op, Color_bg, str, resp);
3022 break; 3362 break;
3023#ifndef NO_CURSORCOLOR 3363#ifndef NO_CURSORCOLOR
3024 case XTerm_Color_cursor: 3364 case XTerm_Color_cursor:
3025 set_window_color (Color_cursor, str); 3365 process_color_seq (op, Color_cursor, str, resp);
3026 break; 3366 break;
3027#endif 3367#endif
3028 case XTerm_Color_pointer: 3368 case XTerm_Color_pointer_fg:
3029 set_window_color (Color_pointer, str); 3369 process_color_seq (op, Color_pointer_fg, str, resp);
3370 break;
3371 case XTerm_Color_pointer_bg:
3372 process_color_seq (op, Color_pointer_bg, str, resp);
3030 break; 3373 break;
3031#ifndef NO_BOLD_UNDERLINE_REVERSE 3374#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: 3375 case XTerm_Color_RV:
3039 set_window_color (Color_RV, str); 3376 process_color_seq (op, Color_RV, str, resp);
3040 break; 3377 break;
3378 case Rxvt_Color_BD:
3379 case URxvt_Color_BD:
3380 process_color_seq (op, Color_BD, str, resp);
3381 break;
3382 case Rxvt_Color_UL:
3383 case URxvt_Color_UL:
3384 process_color_seq (op, Color_UL, str, resp);
3385 break;
3386 case URxvt_Color_IT:
3387 process_color_seq (op, Color_IT, str, resp);
3388 break;
3041#endif 3389#endif
3042 3390#if ENABLE_TRANSPARENCY
3043 case XTerm_Menu: 3391 case URxvt_Color_tint:
3392 process_color_seq (op, Color_tint, str, resp);
3044 /* 3393 {
3045 * rxvt_menubar_dispatch () violates the constness of the string, 3394 bool changed = false;
3046 * so DON'T do it here 3395
3396 if (ISSET_PIXCOLOR (Color_tint))
3397 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3398 else
3399 changed = bgPixmap.unset_tint ();
3400
3401 if (changed)
3402 update_background ();
3047 */ 3403 }
3404
3048 break; 3405 break;
3406#endif
3407
3408#if BG_IMAGE_FROM_FILE
3049 case XTerm_Pixmap: 3409 case Rxvt_Pixmap:
3050 if (*str != ';') 3410 if (!strcmp (str, "?"))
3051 { 3411 {
3052#if XPM_BACKGROUND 3412 char str[256];
3053 scale_pixmap (""); /* reset to default scaling */ 3413
3054 set_bgPixmap (str); /* change pixmap */ 3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3055#endif 3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3056 scr_touch (true); 3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3417 process_xterm_seq (XTerm_title, str, CHAR_ST);
3057 } 3418 }
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 3419 else
3090 { 3420 {
3421 int changed = 0;
3422
3423 if (*str != ';')
3424 {
3425 /* reset to default scaling :*/
3426 bgPixmap.unset_geometry ();
3427 if (bgPixmap.set_file (str)) /* change pixmap */
3428 changed++;
3429 str = strchr (str, ';');
3430 if (str == NULL)
3431 bgPixmap.set_defaultGeometry ();
3432 }
3433
3091 set_locale (str); 3434 while (str)
3092 im_cb (); 3435 {
3436 str++;
3437 if (bgPixmap.set_geometry (str))
3438 changed++;
3439 str = strchr (str, ';');
3440 }
3441
3442 if (changed)
3443 update_background ();
3093 } 3444 }
3094 break; 3445 break;
3446#endif
3447
3448 case Rxvt_restoreFG:
3449 set_window_color (Color_fg, str);
3450 break;
3451 case Rxvt_restoreBG:
3452 set_window_color (Color_bg, str);
3453 break;
3454
3455 case XTerm_logfile:
3456 // TODO, when secure mode?
3457 break;
3458
3095#if 0 3459#if 0
3096 case XTerm_dumpscreen: /* no error notices */ 3460 case Rxvt_dumpscreen: /* no error notices */
3097 { 3461 {
3098 int fd; 3462 int fd;
3099 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3463 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3100 { 3464 {
3101 scr_dump (fd); 3465 scr_dump (fd);
3102 close (fd); 3466 close (fd);
3103 } 3467 }
3104 } 3468 }
3105 break; 3469 break;
3106#endif 3470#endif
3471 case XTerm_font:
3472 op = URxvt_font;
3473 case URxvt_font:
3474#if ENABLE_STYLES
3475 case URxvt_boldFont:
3476 case URxvt_italicFont:
3477 case URxvt_boldItalicFont:
3478#endif
3479 if (query)
3480 tt_printf ("\33]%d;%-.250s%c", saveop,
3481 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3482 ? fontset[op - URxvt_font]->fontdesc : "",
3483 resp);
3484 else
3485 {
3486 const char *&res = rs[Rs_font + (op - URxvt_font)];
3107 3487
3488 res = strdup (str);
3489 allocated.push_back ((void *)res);
3490 set_fonts ();
3491 }
3492 break;
3493
3494 case URxvt_version:
3495 if (query)
3496 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3497 op,
3498 rs[Rs_name], VERSION[0], VERSION[2],
3499 resp);
3500 break;
3501
3502#if !ENABLE_MINIMAL
3503 case URxvt_locale:
3504 if (query)
3505 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3506 else
3507 {
3508 set_locale (str);
3509 pty->set_utf8_mode (enc_utf8);
3510 init_xlocale ();
3511 }
3512 break;
3513
3514 case URxvt_view_up:
3515 case URxvt_view_down:
3516 {
3517 int lines = atoi (str);
3518
3519 if (lines)
3520 scr_page (op == URxvt_view_up ? UP : DN, lines);
3521 else
3522 scr_erase_savelines ();
3523 }
3524
3525 break;
3526#endif
3527
3528#if ENABLE_PERL
3529 case URxvt_perl:
3530 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3531 ; // no responses yet
3532 break;
3533#endif
3108 } 3534 }
3109} 3535}
3110/*----------------------------------------------------------------------*/ 3536/*----------------------------------------------------------------------*/
3111 3537
3112/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3538/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3120 * so no need for fancy checking 3546 * so no need for fancy checking
3121 */ 3547 */
3122int 3548int
3123rxvt_term::privcases (int mode, unsigned long bit) 3549rxvt_term::privcases (int mode, unsigned long bit)
3124{ 3550{
3125 int state; 3551 int state;
3126 3552
3127 if (mode == 's') 3553 if (mode == 's')
3128 { 3554 {
3129 SavedModes |= (PrivateModes & bit); 3555 SavedModes |= (priv_modes & bit);
3130 return -1; 3556 return -1;
3131 } 3557 }
3132 else 3558 else
3133 { 3559 {
3134 if (mode == 'r') 3560 if (mode == 'r')
3135 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3136 else 3562 else
3137 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3563 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3138 PrivMode (state, bit); 3564 PrivMode (state, bit);
3139 } 3565 }
3566
3140 return state; 3567 return state;
3141} 3568}
3142 3569
3143/* we're not using priv _yet_ */ 3570/* we're not using priv _yet_ */
3144void 3571void
3145rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3572rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3146{ 3573{
3147 unsigned int i, j; 3574 unsigned int i, j;
3148 int state; 3575 int state;
3576
3149 static const struct 3577 static const struct
3150 { 3578 {
3151 const int argval; 3579 const int argval;
3152 const unsigned long bit; 3580 const unsigned long bit;
3153 }
3154 argtopriv[] = { 3581 } argtopriv[] = {
3155 { 1, PrivMode_aplCUR }, 3582 { 1, PrivMode_aplCUR },
3156 { 2, PrivMode_vt52 }, 3583 { 2, PrivMode_vt52 },
3157 { 3, PrivMode_132 }, 3584 { 3, PrivMode_132 },
3158 { 4, PrivMode_smoothScroll }, 3585 { 4, PrivMode_smoothScroll },
3159 { 5, PrivMode_rVideo }, 3586 { 5, PrivMode_rVideo },
3160 { 6, PrivMode_relOrigin }, 3587 { 6, PrivMode_relOrigin },
3161 { 7, PrivMode_Autowrap }, 3588 { 7, PrivMode_Autowrap },
3589 // 8, bi-directional support mode
3162 { 9, PrivMode_MouseX10 }, 3590 { 9, PrivMode_MouseX10 },
3163#ifdef menuBar_esc 3591 // 18, 19 printing-related
3164 { menuBar_esc, PrivMode_menuBar }, 3592 { 25, PrivMode_VisibleCursor },
3165#endif
3166#ifdef scrollBar_esc 3593#ifdef scrollBar_esc
3167 { scrollBar_esc, PrivMode_scrollBar }, 3594 { scrollBar_esc, PrivMode_scrollBar },
3168#endif 3595#endif
3169 { 25, PrivMode_VisibleCursor },
3170 { 35, PrivMode_ShiftKeys }, 3596 { 35, PrivMode_ShiftKeys }, // rxvt extension
3171 { 40, PrivMode_132OK }, 3597 { 40, PrivMode_132OK },
3598 // 41 xterm more fixes NYI
3599 // 45 margin bell NYI
3600 // 46 start logging
3172 { 47, PrivMode_Screen }, 3601 { 47, PrivMode_Screen },
3173 { 66, PrivMode_aplKP }, 3602 { 66, PrivMode_aplKP },
3174#ifndef NO_BACKSPACE_KEY 3603#ifndef NO_BACKSPACE_KEY
3175 { 67, PrivMode_BackSpace }, 3604 { 67, PrivMode_BackSpace },
3176#endif 3605#endif
3177 { 1000, PrivMode_MouseX11 }, 3606 { 1000, PrivMode_MouseX11 },
3607 { 1002, PrivMode_MouseBtnEvent },
3608 { 1003, PrivMode_MouseAnyEvent },
3178 { 1010, PrivMode_TtyOutputInh }, 3609 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3179 { 1011, PrivMode_Keypress }, 3610 { 1011, PrivMode_Keypress }, // rxvt extension
3611 // 1035 enable modifiers for alt, numlock NYI
3612 // 1036 send ESC for meta keys NYI
3613 // 1037 send DEL for keypad delete NYI
3180 { 1047, PrivMode_Screen }, 3614 { 1047, PrivMode_Screen },
3615 // 1048 save and restore cursor
3181 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3616 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3617 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3618 };
3183 3619
3184 if (nargs == 0) 3620 if (nargs == 0)
3185 return; 3621 return;
3186 3622
… …
3201 state = privcases (mode, argtopriv[j].bit); 3637 state = privcases (mode, argtopriv[j].bit);
3202 break; 3638 break;
3203 } 3639 }
3204 3640
3205 /* extra handling for values with state unkept */ 3641 /* extra handling for values with state unkept */
3206 if (state == -1)
3207 switch (arg[i]) 3642 switch (arg[i])
3208 { 3643 {
3644#if ENABLE_STYLES
3645 case 1021:
3646 set_option (Opt_intensityStyles, mode);
3647
3648 scr_touch (true);
3649 break;
3650#endif
3209 case 1048: /* alternative cursor save */ 3651 case 1048: /* alternative cursor save */
3652 case 1049:
3653 if (option (Opt_secondaryScreen))
3210 if (mode == 0) 3654 if (mode == 0)
3211 scr_cursor (RESTORE); 3655 scr_cursor (RESTORE);
3212 else if (mode == 1) 3656 else if (mode == 1)
3213 scr_cursor (SAVE); 3657 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; 3658 break;
3659 }
3660
3661 if (state >= 0)
3662 /* extra handling for values with valid 0 or 1 state */
3663 switch (arg[i])
3664 {
3665 /* case 1: - application cursor keys */
3666 case 2: /* VT52 mode */
3667 /* oddball mode. should be set regardless of set/reset
3668 * parameter. Return from VT52 mode with an ESC < from
3669 * within VT52 mode
3670 */
3671 PrivMode (1, PrivMode_vt52);
3672 break;
3230 case 3: /* 80/132 */ 3673 case 3: /* 80/132 */
3231 if (PrivateModes & PrivMode_132OK) 3674 if (priv_modes & PrivMode_132OK)
3232 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3675 {
3233 (unsigned int)TermWin.height); 3676 scr_poweron ();
3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3678 }
3234 break; 3679 break;
3235 case 4: /* smooth scrolling */ 3680 case 4: /* smooth scrolling */
3236 if (state)
3237 Options &= ~Opt_jumpScroll;
3238 else
3239 Options |= Opt_jumpScroll; 3681 set_option (Opt_jumpScroll, !state);
3240 break; 3682 break;
3241 case 5: /* reverse video */ 3683 case 5: /* reverse video */
3242 scr_rvideo_mode (state); 3684 scr_rvideo_mode (state);
3243 break; 3685 break;
3244 case 6: /* relative/absolute origins */ 3686 case 6: /* relative/absolute origins */
3245 scr_relative_origin (state); 3687 scr_relative_origin (state);
3246 break; 3688 break;
3247 case 7: /* autowrap */ 3689 case 7: /* autowrap */
3248 scr_autowrap (state); 3690 scr_autowrap (state);
3249 break; 3691 break;
3250 /* case 8: - auto repeat, can't do on a per window basis */ 3692 /* case 8: - auto repeat, can't do on a per window basis */
3251 case 9: /* X10 mouse reporting */ 3693 case 9: /* X10 mouse reporting */
3252 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
3253 PrivateModes &= ~ (PrivMode_MouseX11); 3695 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3254 break; 3696 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 3697#ifdef scrollBar_esc
3263 case scrollBar_esc: 3698 case scrollBar_esc:
3264 if (scrollbar_mapping (state)) 3699 if (scrollbar_mapping (state))
3265 { 3700 {
3266 resize_all_windows (0, 0, 0); 3701 resize_all_windows (0, 0, 0);
3267 scr_touch (true); 3702 scr_touch (true);
3268 } 3703 }
3269 break; 3704 break;
3270#endif 3705#endif
3271 case 25: /* visible/invisible cursor */ 3706 case 25: /* visible/invisible cursor */
3272 scr_cursor_visible (state); 3707 scr_cursor_visible (state);
3273 break; 3708 break;
3274 /* case 35: - shift keys */ 3709 /* case 35: - shift keys */
3275 /* case 40: - 80 <--> 132 mode */ 3710 /* case 40: - 80 <--> 132 mode */
3276 case 47: /* secondary screen */ 3711 case 47: /* secondary screen */
3277 scr_change_screen (state); 3712 scr_change_screen (state);
3278 break; 3713 break;
3279 /* case 66: - application key pad */ 3714 /* case 66: - application key pad */
3280 /* case 67: - backspace key */ 3715 /* case 67: - backspace key */
3281 case 1000: /* X11 mouse reporting */ 3716 case 1000: /* X11 mouse reporting */
3282 if (state) /* orthogonal */ 3717 if (state) /* orthogonal */
3283 PrivateModes &= ~ (PrivMode_MouseX10); 3718 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3284 break; 3719 break;
3285#if 0
3286 case 1001: 3720 case 1002:
3287 break; /* X11 mouse highlighting */ 3721 case 1003:
3288#endif 3722 if (state)
3723 {
3724 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3725 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3726 vt_emask_mouse = PointerMotionMask;
3727 }
3728 else
3729 vt_emask_mouse = NoEventMask;
3730 vt_select_input ();
3731 break;
3289 case 1010: /* scroll to bottom on TTY output inhibit */ 3732 case 1010: /* scroll to bottom on TTY output inhibit */
3290 if (state)
3291 Options &= ~Opt_scrollTtyOutput;
3292 else
3293 Options |= Opt_scrollTtyOutput; 3733 set_option (Opt_scrollTtyOutput, !state);
3294 break; 3734 break;
3295 case 1011: /* scroll to bottom on key press */ 3735 case 1011: /* scroll to bottom on key press */
3296 if (state)
3297 Options |= Opt_scrollTtyKeypress; 3736 set_option (Opt_scrollTtyKeypress, state);
3298 else
3299 Options &= ~Opt_scrollTtyKeypress;
3300 break; 3737 break;
3301 case 1047: /* secondary screen w/ clearing */ 3738 case 1047: /* secondary screen w/ clearing last */
3302 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3739 if (option (Opt_secondaryScreen))
3303 if (current_screen != PRIMARY) 3740 if (current_screen != PRIMARY)
3304 scr_erase_screen (2); 3741 scr_erase_screen (2);
3305 scr_change_screen (state); 3742 scr_change_screen (state);
3306 /* FALLTHROUGH */
3307 default:
3308 break; 3743 break;
3744 case 1049: /* secondary screen w/ clearing first */
3745 scr_change_screen (state);
3746 if (option (Opt_secondaryScreen))
3747 if (current_screen != PRIMARY)
3748 scr_erase_screen (2);
3749 break;
3750 default:
3751 break;
3309 } 3752 }
3310 } 3753 }
3311} 3754}
3312/*}}} */ 3755/*}}} */
3313 3756
3314/*{{{ process sgr sequences */ 3757/*{{{ process sgr sequences */
3315void 3758void
3316rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3759rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3317{ 3760{
3318 unsigned int i; 3761 unsigned int i;
3319 short rendset; 3762 short rendset;
3320 int rendstyle; 3763 int rendstyle;
3321 3764
3322 if (nargs == 0) 3765 if (nargs == 0)
3323 { 3766 {
3324 scr_rendition (0, ~RS_None); 3767 scr_rendition (0, ~RS_None);
3325 return; 3768 return;
3326 } 3769 }
3770
3327 for (i = 0; i < nargs; i++) 3771 for (i = 0; i < nargs; i++)
3328 { 3772 {
3329 rendset = -1; 3773 rendset = -1;
3330 switch (arg[i]) 3774 switch (arg[i])
3331 { 3775 {
… …
3333 rendset = 0, rendstyle = ~RS_None; 3777 rendset = 0, rendstyle = ~RS_None;
3334 break; 3778 break;
3335 case 1: 3779 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3780 rendset = 1, rendstyle = RS_Bold;
3337 break; 3781 break;
3782 //case 2: // low intensity
3783 case 3:
3784 rendset = 1, rendstyle = RS_Italic;
3785 break;
3338 case 4: 3786 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3787 rendset = 1, rendstyle = RS_Uline;
3340 break; 3788 break;
3341 case 5: 3789 case 5: // slowly blinking
3790 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3791 rendset = 1, rendstyle = RS_Blink;
3343 break; 3792 break;
3793 //case 6: // scoansi light background
3344 case 7: 3794 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3795 rendset = 1, rendstyle = RS_RVid;
3346 break; 3796 break;
3347 case 22: 3797 case 8:
3798 // invisible. NYI
3799 break;
3800 //case 9: // crossed out
3801 //case 10: // scoansi acs off, primary font
3802 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font
3804 //...
3805 //case 19: // ninth alt font
3806 //case 20: // gothic
3807 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3348 rendset = 0, rendstyle = RS_Bold; 3808 rendset = 0, rendstyle = RS_Bold;
3809 break;
3810 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold;
3812 break;
3813 case 23: // disable italic
3814 rendset = 0, rendstyle = RS_Italic;
3349 break; 3815 break;
3350 case 24: 3816 case 24:
3351 rendset = 0, rendstyle = RS_Uline; 3817 rendset = 0, rendstyle = RS_Uline;
3352 break; 3818 break;
3353 case 25: 3819 case 25:
3354 rendset = 0, rendstyle = RS_Blink; 3820 rendset = 0, rendstyle = RS_Blink;
3355 break; 3821 break;
3822 case 26: // variable spacing (iso 8613)
3823 rendset = 0, rendstyle = RS_Blink;
3824 break;
3356 case 27: 3825 case 27:
3357 rendset = 0, rendstyle = RS_RVid; 3826 rendset = 0, rendstyle = RS_RVid;
3358 break; 3827 break;
3828 //case 28: // visible. NYI
3829 //case 29: // not crossed-out
3359 } 3830 }
3831
3360 if (rendset != -1) 3832 if (rendset != -1)
3361 { 3833 {
3362 scr_rendition (rendset, rendstyle); 3834 scr_rendition (rendset, rendstyle);
3363 continue; /* for (;i;) */ 3835 continue; /* for (;i;) */
3364 } 3836 }
… …
3371 case 33: 3843 case 33:
3372 case 34: 3844 case 34:
3373 case 35: 3845 case 35:
3374 case 36: 3846 case 36:
3375 case 37: 3847 case 37:
3376 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3848 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3377 Color_fg);
3378 break; 3849 break;
3379#ifdef TTY_256COLOR 3850 case 38: // set fg color, ISO 8613-6
3380 case 38:
3381 if (nargs > i + 2 && arg[i + 1] == 5) 3851 if (nargs > i + 2 && arg[i + 1] == 5)
3382 { 3852 {
3383 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3853 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3384 Color_fg);
3385 i += 2; 3854 i += 2;
3386 } 3855 }
3387 break; 3856 break;
3388#endif
3389 case 39: /* default fg */ 3857 case 39: /* default fg */
3390 scr_color (Color_fg, Color_fg); 3858 scr_color (Color_fg, Color_fg);
3391 break; 3859 break;
3392 3860
3393 case 40: 3861 case 40:
… …
3396 case 43: 3864 case 43:
3397 case 44: 3865 case 44:
3398 case 45: 3866 case 45:
3399 case 46: 3867 case 46:
3400 case 47: 3868 case 47:
3401 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3869 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3402 Color_bg);
3403 break; 3870 break;
3404#ifdef TTY_256COLOR 3871 case 48: // set bg color, ISO 8613-6
3405 case 48:
3406 if (nargs > i + 2 && arg[i + 1] == 5) 3872 if (nargs > i + 2 && arg[i + 1] == 5)
3407 { 3873 {
3408 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3874 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3409 Color_bg);
3410 i += 2; 3875 i += 2;
3411 } 3876 }
3412 break; 3877 break;
3413#endif
3414 case 49: /* default bg */ 3878 case 49: /* default bg */
3415 scr_color (Color_bg, Color_bg); 3879 scr_color (Color_bg, Color_bg);
3416 break; 3880 break;
3417 3881
3418#ifndef NO_BRIGHTCOLOR 3882 //case 50: // not variable spacing
3883
3884#if !ENABLE_MINIMAL
3419 case 90: 3885 case 90:
3420 case 91: /* set bright fg color */ 3886 case 91: /* set bright fg color */
3421 case 92: 3887 case 92:
3422 case 93: 3888 case 93:
3423 case 94: 3889 case 94:
3424 case 95: 3890 case 95:
3425 case 96: 3891 case 96:
3426 case 97: 3892 case 97:
3427 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3893 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3428 Color_fg);
3429 break; 3894 break;
3430 case 100: 3895 case 100:
3431 case 101: /* set bright bg color */ 3896 case 101: /* set bright bg color */
3432 case 102: 3897 case 102:
3433 case 103: 3898 case 103:
3434 case 104: 3899 case 104:
3435 case 105: 3900 case 105:
3436 case 106: 3901 case 106:
3437 case 107: 3902 case 107:
3438 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3903 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3439 Color_bg);
3440 break; 3904 break;
3441#endif 3905#endif
3442
3443 } 3906 }
3444 } 3907 }
3445} 3908}
3446/*}}} */ 3909/*}}} */
3447 3910
3448/*{{{ process Rob Nation's own graphics mode sequences */ 3911/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3449void 3912void
3450rxvt_term::process_graphics () 3913rxvt_term::process_graphics ()
3451{ 3914{
3452 unsigned char ch, cmd = cmd_getc (); 3915 unicode_t ch, cmd = cmd_getc ();
3453 3916
3454 if (cmd == 'Q') 3917 if (cmd == 'Q')
3918 {
3455 { /* query graphics */ 3919 /* query graphics */
3456 tt_printf ("\033G0\n"); /* no graphics */ 3920 tt_printf ("\033G0\012"); /* no graphics */
3457 return; 3921 return;
3458 } 3922 }
3459 /* swallow other graphics sequences until terminating ':' */ 3923 /* swallow other graphics sequences until terminating ':' */
3460 do 3924 do
3461 ch = cmd_getc (); 3925 ch = cmd_getc ();
… …
3471 */ 3935 */
3472void 3936void
3473rxvt_term::tt_printf (const char *fmt,...) 3937rxvt_term::tt_printf (const char *fmt,...)
3474{ 3938{
3475 va_list arg_ptr; 3939 va_list arg_ptr;
3476 unsigned char buf[256]; 3940 char buf[256];
3477 3941
3478 va_start (arg_ptr, fmt); 3942 va_start (arg_ptr, fmt);
3479 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3943 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3480 va_end (arg_ptr); 3944 va_end (arg_ptr);
3481 tt_write (buf, STRLEN (buf)); 3945 tt_write (buf, strlen (buf));
3482} 3946}
3483 3947
3484/* ---------------------------------------------------------------------- */ 3948/* ---------------------------------------------------------------------- */
3485/* Write data to the pty as typed by the user, pasted with the mouse, 3949/* 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. 3950 * or generated by us in response to a query ESC sequence.
3487 */ 3951 */
3952const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3953
3488void 3954void
3489rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3955rxvt_term::tt_write (const char *data, unsigned int len)
3490{ 3956{
3491 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3957 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3958 return;
3492 3959
3493 if (len) 3960 if (pty->pty < 0)
3961 return;
3962
3963 if (v_buflen == 0)
3964 {
3965 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3966
3967 if ((unsigned int)written == len)
3968 return;
3969
3970 data += written;
3971 len -= written;
3494 { 3972 }
3973
3974 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3975
3976 memcpy (v_buffer + v_buflen, data, len);
3977 v_buflen += len;
3978
3979 pty_ev.set (ev::READ | ev::WRITE);
3980}
3981
3982void rxvt_term::pty_write ()
3983{
3984 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3985
3986 if (written > 0)
3987 {
3988 v_buflen -= written;
3989
3495 if (v_buflen == 0) 3990 if (v_buflen == 0)
3496 { 3991 {
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); 3992 free (v_buffer);
3524 v_buffer = 0; 3993 v_buffer = 0;
3525 v_buflen = 0;
3526 3994
3527 pty_ev.set (EVENT_READ); 3995 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; 3996 return;
3540 } 3997 }
3998
3999 memmove (v_buffer, v_buffer + written, v_buflen);
3541 } 4000 }
4001 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4002 pty_ev.set (ev::READ);
3542} 4003}
3543 4004
3544/*----------------------- end-of-file (C source) -----------------------*/ 4005/*----------------------- end-of-file (C source) -----------------------*/
3545 4006

Diff Legend

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