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.58 by pcg, Wed Feb 25 15:06:03 2004 UTC vs.
Revision 1.388 by ayin, Mon Dec 31 01:16:47 2007 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;
699 959
700 if (n > 0 && s < count) 960 if (n > 0 && s < count)
701 { 961 {
702 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 962 memmove (cmdbuf_base, cmdbuf_ptr,
703 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 963 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
704 cmdbuf_ptr = cmdbuf_base; 964 cmdbuf_ptr = cmdbuf_base;
705 cmdbuf_endp -= n; 965 cmdbuf_endp -= n;
706 s += n; 966 s += n;
707 } 967 }
708 968
709 if (count > s) 969 if (count > s)
710 { 970 {
711 rxvt_print_error ("data loss: cmd_write too large"); 971 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
712 count = s; 972 count = s;
713 } 973 }
714 974
715 for (; count--;) 975 for (; count--;)
716 *cmdbuf_endp++ = *str++; 976 *cmdbuf_endp++ = *str++;
717 977
718 cmd_parse (); 978 cmd_parse ();
719 979
720 return 0; 980 return 0;
721} 981}
722#endif /* MENUBAR_MAX */ 982#endif
723 983
724void 984void
725rxvt_term::flush () 985rxvt_term::flush ()
726{ 986{
727#ifdef TRANSPARENT 987 flush_ev.stop ();
728 if (want_full_refresh) 988
989#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.check_clearChanged ())
729 { 991 {
730 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
731 scr_clear ();
732 scr_touch (false); 993 scr_touch (false);
733 want_refresh = 1;
734 } 994 }
735#endif 995#endif
736 996
737 if (want_refresh) 997 if (want_refresh)
738 { 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
739 scr_refresh (refresh_type); 1037 scr_refresh ();
740 scrollbar_show (1); 1038 scrollbar_show (1);
741#ifdef USE_XIM 1039#ifdef USE_XIM
742 IMSendSpot (); 1040 IMSendSpot ();
743#endif 1041#endif
744
745 } 1042 }
746 1043
747 display->flush (); 1044 display->flush ();
748} 1045}
749 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
750void 1048void
751rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
752{ 1050{
753 SET_R (this); 1051 if (want_refresh && !flush_ev.is_active ())
754 SET_LOCALE (locale); 1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
755 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;
756 flush (); 1063 flush ();
757} 1064}
758 1065
759#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
760void 1067void
761rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
762{ 1069{
763 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
764 want_refresh = 1; 1071 want_refresh = 1;
765 1072 refresh_check ();
766 w.start (w.at + BLINK_INTERVAL);
767} 1073}
768#endif 1074#endif
769 1075
770#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
771void 1077void
772rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
773{ 1079{
774 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
775 { 1081 {
776 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
777 want_refresh = 1; 1083 want_refresh = 1;
778 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))
779 } 1097 {
1098 want_refresh = 1;
1099 refresh_check ();
1100 }
1101 else
1102 w.stop ();
780} 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;
781#endif 1162#endif
782 1163
783bool 1164bool
784rxvt_term::pty_fill () 1165rxvt_term::pty_fill ()
785{ 1166{
786 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 }
787 1174
788 memmove (cmdbuf_base, cmdbuf_ptr, n); 1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
789 cmdbuf_ptr = cmdbuf_base; 1176 cmdbuf_ptr = cmdbuf_base;
790 cmdbuf_endp = cmdbuf_ptr + n; 1177 cmdbuf_endp = cmdbuf_ptr + n;
791 1178
792 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
793 1180
794 if (n > 0) 1181 if (r > 0)
795 { 1182 {
796 cmdbuf_endp += n; 1183 cmdbuf_endp += r;
797 return true; 1184 return true;
798 } 1185 }
799 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))
800 destroy (); 1198 destroy ();
801 1199 }
1200
802 return false; 1201 return false;
803} 1202}
804 1203
805void 1204void
806rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
807{ 1206{
808 SET_R (this); 1207 make_current ();
809 SET_LOCALE (locale);
810 1208
811 if (revents & EVENT_WRITE) 1209 if (revents & ev::READ)
812 tt_write (0, 0);
813 else if (revents & EVENT_READ)
814 {
815 bool flag = true;
816
817 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
818 // the number of loops is fully arbitrary, and thus wrong
819 while (flag && pty_fill ()) 1211 while (pty_fill ())
820 {
821 if (!seen_input)
822 {
823 seen_input = 1;
824 /* once we know the shell is running, send the screen size. Again! */
825 tt_winch ();
826 }
827
828 if (cmd_parse ()) 1212 if (cmd_parse ())
829 break; 1213 break;
830 }
831 }
832}
833 1214
834bool 1215 if (revents & ev::WRITE)
835rxvt_term::cmd_parse () 1216 pty_write ();
836{
837 bool flag = false;
838 uint32_t ch = NOCHAR;
839 1217
840 for (;;) 1218 refresh_check ();
841 {
842 if (ch == NOCHAR)
843 ch = next_char ();
844
845 if (ch == NOCHAR) // TODO: improve
846 break;
847
848 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
849 {
850 /* Read a text string from the input buffer */
851 uint32_t buf[BUFSIZ];
852 bool refreshnow = false;
853 int nlines = 0;
854 uint32_t *str = buf;
855
856 *str++ = ch;
857
858 for (;;)
859 {
860 ch = next_char ();
861
862 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
863 break;
864 else
865 {
866 *str++ = ch;
867
868 if (ch == '\n')
869 {
870 nlines++;
871 refresh_count++;
872
873 if (! (Options & Opt_jumpScroll)
874 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
875 {
876 refreshnow = true;
877 flag = false;
878 ch = NOCHAR;
879 break;
880 }
881
882 // scr_add_lines only works for nlines < TermWin.nrow - 1.
883 if (nlines >= TermWin.nrow - 1)
884 {
885 scr_add_lines (buf, nlines, str - buf);
886 nlines = 0;
887 str = buf;
888 }
889 }
890
891 if (str >= buf + BUFSIZ)
892 {
893 ch = NOCHAR;
894 break;
895 }
896 }
897 }
898
899 scr_add_lines (buf, nlines, str - buf);
900
901 /*
902 * If there have been a lot of new lines, then update the screen
903 * What the heck I'll cheat and only refresh less than every page-full.
904 * the number of pages between refreshes is refresh_limit, which
905 * is incremented here because we must be doing flat-out scrolling.
906 *
907 * refreshing should be correct for small scrolls, because of the
908 * time-out
909 */
910 if (refreshnow)
911 {
912 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
913 refresh_limit++;
914
915 scr_refresh (refresh_type);
916 }
917
918 }
919 else
920 {
921 switch (ch)
922 {
923 default:
924 process_nonprinting (ch);
925 break;
926 case C0_ESC: /* escape char */
927 process_escape_seq ();
928 break;
929 /*case 0x9b: */ /* CSI */
930 /* process_csi_seq (); */
931 }
932
933 ch = NOCHAR;
934 }
935 }
936
937 return flag;
938} 1219}
939 1220
940// read the next character, currently handles UTF-8 1221void
941// will probably handle all sorts of other stuff in the future 1222rxvt_term::pointer_unblank ()
942uint32_t
943rxvt_term::next_char ()
944{ 1223{
945 while (cmdbuf_ptr < cmdbuf_endp) 1224 XDefineCursor (dpy, vt, TermWin_cursor);
946 { 1225 recolour_cursor ();
947 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
948 return *cmdbuf_ptr++;
949 1226
950 wchar_t wc; 1227#ifdef POINTER_BLANK
951 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1228 hidden_pointer = 0;
952 1229
953 if (len == (size_t)-2) 1230 if (option (Opt_pointerBlank))
954 return NOCHAR; 1231 pointer_ev.start (pointerBlankDelay);
955 1232#endif
956 if (len == (size_t)-1)
957 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
958
959 // assume wchar == unicode
960 cmdbuf_ptr += len;
961 return wc;
962 }
963
964 return NOCHAR;
965}
966
967/* rxvt_cmd_getc () - Return next input character */
968/*
969 * Return the next input character after first passing any keyboard input
970 * to the command.
971 */
972uint32_t
973rxvt_term::cmd_getc ()
974{
975 for (;;)
976 {
977 uint32_t c = next_char ();
978 if (c != NOCHAR)
979 return c;
980
981 // incomplete sequences should occur rarely, still, a better solution
982 // would be preferred. either setjmp/longjmp or better design.
983 fcntl (cmd_fd, F_SETFL, 0);
984 pty_fill ();
985 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
986 }
987} 1233}
988 1234
989#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
990void 1236void
991rxvt_term::pointer_unblank () 1237rxvt_term::pointer_blank ()
992{ 1238{
993 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1239 if (!option (Opt_pointerBlank))
994 recolour_cursor (); 1240 return;
995 1241
1242 XDefineCursor (dpy, vt, display->blank_cursor);
1243 XFlush (dpy);
1244
996 hidden_pointer = 0; 1245 hidden_pointer = 1;
997
998 if (Options & Opt_pointerBlank)
999 pointer_ev.start (NOW + pointerBlankDelay);
1000} 1246}
1001 1247
1002void 1248void
1003rxvt_term::pointer_blank () 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1004{ 1250{
1005 if (! (Options & Opt_pointerBlank)) 1251 make_current ();
1006 return;
1007
1008 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1009 XFlush (display->display);
1010
1011 hidden_pointer = 1;
1012}
1013
1014void
1015rxvt_term::pointer_cb (time_watcher &w)
1016{
1017 SET_R (this);
1018 SET_LOCALE (locale);
1019 1252
1020 pointer_blank (); 1253 pointer_blank ();
1021} 1254}
1022#endif 1255#endif
1023 1256
1024void 1257void
1025rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1026{ 1259{
1027 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1028 int x, y; 1261 int x, y;
1262 int code = 32;
1029 1263
1030 x = ev.x; 1264 x = Pixel2Col (ev.x);
1031 y = ev.y; 1265 y = Pixel2Row (ev.y);
1032 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 }
1033 1274
1034 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1035 {
1036 button_number = 3; 1276 button_number = 3;
1037 }
1038 else 1277 else
1039 { 1278 {
1040 button_number = MEvent.button - Button1; 1279 button_number = MEvent.button - Button1;
1041 /* add 0x3D for wheel events, like xterm does */ 1280 /* add 0x3D for wheel events, like xterm does */
1042 if (button_number >= 3) 1281 if (button_number >= 3)
1043 button_number += (64 - 3); 1282 button_number += (64 - 3);
1044 } 1283 }
1045 1284
1046 if (PrivateModes & PrivMode_MouseX10) 1285 if (priv_modes & PrivMode_MouseX10)
1047 { 1286 {
1048 /* 1287 /*
1049 * do not report ButtonRelease 1288 * do not report ButtonRelease
1050 * no state info allowed 1289 * no state info allowed
1051 */ 1290 */
… …
1066 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1305 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1067 + ((MEvent.state & ControlMask) ? 16 : 0); 1306 + ((MEvent.state & ControlMask) ? 16 : 0);
1068#ifdef MOUSE_REPORT_DOUBLECLICK 1307#ifdef MOUSE_REPORT_DOUBLECLICK
1069 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1308 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1070#endif 1309#endif
1071
1072 } 1310 }
1073 1311
1074#ifdef DEBUG_MOUSEREPORT 1312#if DEBUG_MOUSEREPORT
1075 fprintf (stderr, "Mouse ["); 1313 fprintf (stderr, "Mouse [");
1076 if (key_state & 16) 1314 if (key_state & 16)
1077 fputc ('C', stderr); 1315 fputc ('C', stderr);
1078 if (key_state & 4) 1316 if (key_state & 4)
1079 fputc ('S', stderr); 1317 fputc ('S', stderr);
… …
1083 fputc ('2', stderr); 1321 fputc ('2', stderr);
1084 fprintf (stderr, "]: <%d>, %d/%d\n", 1322 fprintf (stderr, "]: <%d>, %d/%d\n",
1085 button_number, 1323 button_number,
1086 x + 1, 1324 x + 1,
1087 y + 1); 1325 y + 1);
1088#else 1326#endif
1327
1089 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1090 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1091 (32 + x + 1), 1330 (32 + x + 1),
1092 (32 + y + 1)); 1331 (32 + y + 1));
1093#endif
1094} 1332}
1095
1096#ifdef USING_W11LIB
1097void
1098rxvt_W11_process_x_event (XEvent *ev)
1099{
1100 rxvt_t *r = rxvt_get_r ();
1101
1102 x_cb (*ev);
1103}
1104#endif
1105 1333
1106/*{{{ process an X event */ 1334/*{{{ process an X event */
1107void 1335void
1108rxvt_term::x_cb (XEvent &ev) 1336rxvt_term::x_cb (XEvent &ev)
1109{ 1337{
1110 SET_R (this); 1338 make_current ();
1111 SET_LOCALE (locale);
1112 1339
1113#if defined(CURSOR_BLINK) 1340 dLocal (Display *, dpy);
1114 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1115 {
1116 if (hidden_cursor)
1117 {
1118 hidden_cursor = 0;
1119 want_refresh = 1;
1120 }
1121 1341
1122 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1342 if (ev.xany.window == vt
1123 } 1343 && SHOULD_INVOKE (HOOK_X_EVENT)
1124#endif 1344 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1125
1126#if defined(POINTER_BLANK)
1127 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1128 {
1129 if (ev.type == MotionNotify
1130 || ev.type == ButtonPress
1131 || ev.type == ButtonRelease)
1132 if (hidden_pointer)
1133 pointer_unblank ();
1134
1135 if (ev.type == KeyPress && hidden_pointer == 0)
1136 pointer_blank ();
1137 }
1138#endif
1139
1140#ifdef USE_XIM
1141 if (XFilterEvent (&ev, None))
1142 return; 1345 return;
1143#endif
1144 1346
1347 // for XQueryPointer
1145 Window unused_root, unused_child; 1348 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1349 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1350 unsigned int unused_mask;
1148
1149#ifdef DEBUG_X
1150 const char *const eventnames[] =
1151 { /* mason - this matches my system */
1152 "",
1153 "",
1154 "KeyPress",
1155 "KeyRelease",
1156 "ButtonPress",
1157 "ButtonRelease",
1158 "MotionNotify",
1159 "EnterNotify",
1160 "LeaveNotify",
1161 "FocusIn",
1162 "FocusOut",
1163 "KeymapNotify",
1164 "Expose",
1165 "GraphicsExpose",
1166 "NoExpose",
1167 "VisibilityNotify",
1168 "CreateNotify",
1169 "DestroyNotify",
1170 "UnmapNotify",
1171 "MapNotify",
1172 "MapRequest",
1173 "ReparentNotify",
1174 "ConfigureNotify",
1175 "ConfigureRequest",
1176 "GravityNotify",
1177 "ResizeRequest",
1178 "CirculateNotify",
1179 "CirculateRequest",
1180 "PropertyNotify",
1181 "SelectionClear",
1182 "SelectionRequest",
1183 "SelectionNotify",
1184 "ColormapNotify",
1185 "ClientMessage",
1186 "MappingNotify"
1187 };
1188#endif
1189
1190#ifdef DEBUG_X
1191 struct timeval tp;
1192 struct tm *ltt;
1193 (void)gettimeofday (&tp, NULL);
1194 ltt = localtime (& (tp.tv_sec));
1195 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));
1196#endif
1197 1351
1198 switch (ev.type) 1352 switch (ev.type)
1199 { 1353 {
1200 case KeyPress: 1354 case KeyPress:
1201 lookup_key (ev.xkey); 1355 key_press (ev.xkey);
1202 break; 1356 break;
1203 1357
1204#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1205 case KeyRelease: 1358 case KeyRelease:
1206 { 1359 key_release (ev.xkey);
1207 if (! (ev.xkey.state & ControlMask))
1208 mouse_slip_wheel_speed = 0;
1209 else
1210 {
1211 KeySym ks;
1212
1213 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1214 if (ks == XK_Control_L || ks == XK_Control_R)
1215 mouse_slip_wheel_speed = 0;
1216 }
1217 break; 1360 break;
1218 }
1219#endif
1220 1361
1221 case ButtonPress: 1362 case ButtonPress:
1222 button_press (ev.xbutton); 1363 button_press (ev.xbutton);
1223 break; 1364 break;
1224 1365
… …
1226 button_release (ev.xbutton); 1367 button_release (ev.xbutton);
1227 break; 1368 break;
1228 1369
1229 case ClientMessage: 1370 case ClientMessage:
1230 if (ev.xclient.format == 32 1371 if (ev.xclient.format == 32
1231 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1372 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1232 destroy ();
1233#ifdef OFFIX_DND
1234 /* OffiX Dnd (drag 'n' drop) protocol */
1235 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1236 && (ev.xclient.data.l[0] == DndFile
1237 || ev.xclient.data.l[0] == DndDir
1238 || ev.xclient.data.l[0] == DndLink))
1239 { 1373 {
1240 /* Get Dnd data */ 1374 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1241 Atom ActualType; 1375 {
1242 int ActualFormat; 1376 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1243 unsigned char *data; 1377 {
1244 unsigned long Size, RemainingBytes; 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1245 1379 {
1246 XGetWindowProperty (display->display, display->root, 1380 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1247 xa[XA_DNDSELECTION], 1381 destroy ();
1248 0L, 1000000L, 1382 }
1249 False, AnyPropertyType, 1383#if ENABLE_EWMH
1250 &ActualType, &ActualFormat, 1384 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1251 &Size, &RemainingBytes, 1385 XSendEvent (dpy, ev.xclient.window = display->root,
1386 False, SubstructureRedirectMask | SubstructureNotifyMask,
1252 &data); 1387 &ev);
1253 XChangeProperty (display->display, display->root, 1388#endif
1254 XA_CUT_BUFFER0, XA_STRING, 1389 }
1255 8, PropModeReplace, 1390 }
1256 data, STRLEN (data)); 1391#if ENABLE_XEMBED
1257 selection_paste (display->root, XA_CUT_BUFFER0, True); 1392 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1258 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
1259 } 1400 }
1260#endif /* OFFIX_DND */
1261 break;
1262
1263 case MappingNotify:
1264 XRefreshKeyboardMapping (& (ev.xmapping));
1265 break; 1401 break;
1266 1402
1267 /* 1403 /*
1268 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1269 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1288 break; 1424 break;
1289 } 1425 }
1290 break; 1426 break;
1291 1427
1292 case FocusIn: 1428 case FocusIn:
1293 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])
1294 { 1447 {
1295 TermWin.focus = 1; 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1296 want_refresh = 1;
1297#ifdef USE_XIM
1298 if (Input_Context != NULL)
1299 XSetICFocus (Input_Context);
1300#endif
1301#ifdef CURSOR_BLINK
1302 if (Options & Opt_cursorBlink)
1303 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1304#endif
1305
1306 } 1449 ;
1307 break;
1308 1450
1309 case FocusOut: 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1310 if (TermWin.focus)
1311 { 1452 {
1312 TermWin.focus = 0; 1453 seen_resize = 1;
1313 want_refresh = 1; 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1314#ifdef USE_XIM
1315 if (Input_Context != NULL)
1316 XUnsetICFocus (Input_Context);
1317#endif
1318#ifdef CURSOR_BLINK
1319 if (Options & Opt_cursorBlink)
1320 cursor_blink_ev.stop ();
1321 hidden_cursor = 0;
1322#endif
1323
1324 }
1325 break;
1326
1327 case ConfigureNotify:
1328 if (ev.xconfigure.window == TermWin.parent[0])
1329 {
1330 int height, width;
1331
1332 do
1333 { /* Wrap lots of configures into one */
1334 width = ev.xconfigure.width;
1335 height = ev.xconfigure.height;
1336 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1337 } 1455 }
1338 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1339
1340 if (szHint.width != width || szHint.height != height)
1341 {
1342 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1343 resize_all_windows (width, height, 1);
1344 }
1345#ifdef DEBUG_SIZE
1346 else 1456 else
1347 { 1457 {
1348 D_SIZE ((stderr, "Size: Not resizing")); 1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 update_background ();
1461#endif
1349 } 1462 }
1350#endif
1351#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1352 if (Options & Opt_transparent)
1353 {
1354 check_our_parents ();
1355 if (am_transparent)
1356 want_full_refresh = 1;
1357 }
1358#endif
1359 1463
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1360 } 1465 }
1361 break; 1466 break;
1362 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
1363 case SelectionClear: 1476 case SelectionClear:
1364 display->set_selection_owner (0); 1477 selection_clear ();
1365 break; 1478 break;
1366 1479
1367 case SelectionNotify: 1480 case SelectionNotify:
1368 if (selection_wait == Sel_normal) 1481 if (selection_wait == Sel_normal)
1369 selection_paste (ev.xselection.requestor, 1482 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1370 ev.xselection.property, True);
1371 break; 1483 break;
1372 1484
1373 case SelectionRequest: 1485 case SelectionRequest:
1374 selection_send (ev.xselectionrequest); 1486 selection_send (ev.xselectionrequest);
1375 break; 1487 break;
1376 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
1377 case UnmapNotify: 1497 case UnmapNotify:
1378 TermWin.mapped = 0; 1498 mapped = 0;
1379#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1380 text_blink_ev.stop (); 1500 text_blink_ev.stop ();
1381#endif 1501#endif
1502 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1382 break; 1503 break;
1383
1384 case MapNotify:
1385 TermWin.mapped = 1;
1386#ifdef TEXT_BLINK
1387 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1388#endif
1389 break;
1390
1391#ifdef TRANSPARENT
1392 case ReparentNotify:
1393 rootwin_cb (ev);
1394 break;
1395#endif /* TRANSPARENT */
1396 1504
1397 case GraphicsExpose: 1505 case GraphicsExpose:
1398 case Expose: 1506 case Expose:
1399 if (ev.xany.window == TermWin.vt) 1507 if (ev.xany.window == vt)
1400 { 1508 {
1401#ifdef NO_SLOW_LINK_SUPPORT 1509 do
1510 {
1402 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1403 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1404#else 1513 }
1405 // 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 {
1406 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1407 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1408 //scr_expose (ev.xexpose.x, 0, 1522 }
1409 // ev.xexpose.width, TermWin.height, False); 1523
1410#endif
1411 want_refresh = 1; 1524 want_refresh = 1;
1412 } 1525 }
1413 else 1526 else
1414 { 1527 {
1415 XEvent unused_event; 1528 XEvent unused_event;
1416 1529
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1418 Expose, 1531 ;
1419 &unused_event)) ; 1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1420 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1533 ;
1421 GraphicsExpose, 1534
1422 &unused_event)) ;
1423 if (isScrollbarWindow (ev.xany.window)) 1535 if (isScrollbarWindow (ev.xany.window))
1424 { 1536 {
1425 scrollBar.setIdle (); 1537 scrollBar.setIdle ();
1426 scrollbar_show (0); 1538 scrollbar_show (0);
1427 } 1539 }
1428#ifdef MENUBAR
1429 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1430 menubar_expose ();
1431#endif
1432 } 1540 }
1433 break; 1541 break;
1434 1542
1435 case MotionNotify: 1543 case MotionNotify:
1436#ifdef POINTER_BLANK 1544#ifdef POINTER_BLANK
1437 if (hidden_pointer) 1545 if (hidden_pointer)
1438 pointer_unblank (); 1546 pointer_unblank ();
1439#endif 1547#endif
1440#if MENUBAR 1548 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1441 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)
1442 { 1555 {
1443 menubar_control (ev.xbutton); 1556 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1444 break; 1557 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1445 } 1558 ; // nop
1446#endif
1447 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1448 break;
1449
1450 if (ev.xany.window == TermWin.vt)
1451 {
1452 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1559 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1453 { 1560 {
1454 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1561 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1455 ; 1562 ;
1456 1563
1457 XQueryPointer (display->display, TermWin.vt, 1564 XQueryPointer (dpy, vt,
1458 &unused_root, &unused_child, 1565 &unused_root, &unused_child,
1459 &unused_root_x, &unused_root_y, 1566 &unused_root_x, &unused_root_y,
1460 & (ev.xbutton.x), & (ev.xbutton.y), 1567 &ev.xbutton.x, &ev.xbutton.y,
1461 &unused_mask); 1568 &ev.xbutton.state);
1462#ifdef MOUSE_THRESHOLD 1569#ifdef MOUSE_THRESHOLD
1463 /* deal with a `jumpy' mouse */ 1570 /* deal with a `jumpy' mouse */
1464 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1571 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1465 { 1572 {
1466#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
1467 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1582 selection_extend (ev.xbutton.x, ev.xbutton.y,
1468 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1583 ev.xbutton.state & Button3Mask ? 2 : 0);
1584
1469#ifdef SELECTION_SCROLLING 1585#ifdef SELECTION_SCROLLING
1470 if (ev.xbutton.y < TermWin.int_bwidth 1586 if (ev.xbutton.y < int_bwidth
1471 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1587 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1472 { 1588 {
1473 int dist; 1589 int dist;
1474
1475 pending_scroll_selection=1;
1476 1590
1477 /* don't clobber the current delay if we are 1591 /* don't clobber the current delay if we are
1478 * already in the middle of scrolling. 1592 * already in the middle of scrolling.
1479 */ 1593 */
1480 if (scroll_selection_delay<=0) 1594 if (!sel_scroll_ev.is_active ())
1481 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1595 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1482 1596
1483 /* save the event params so we can highlight 1597 /* save the event params so we can highlight
1484 * the selection in the pending-scroll loop 1598 * the selection in the pending-scroll loop
1485 */ 1599 */
1486 selection_save_x=ev.xbutton.x; 1600 selection_save_x = ev.xbutton.x;
1487 selection_save_y=ev.xbutton.y; 1601 selection_save_y = ev.xbutton.y;
1488 selection_save_state=
1489 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1602 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1490 1603
1491 /* calc number of lines to scroll */ 1604 /* calc number of lines to scroll */
1492 if (ev.xbutton.y<TermWin.int_bwidth) 1605 if (ev.xbutton.y < int_bwidth)
1493 { 1606 {
1494 scroll_selection_dir = UP; 1607 scroll_selection_dir = UP;
1495 dist = TermWin.int_bwidth - ev.xbutton.y; 1608 dist = int_bwidth - ev.xbutton.y;
1496 } 1609 }
1497 else 1610 else
1498 { 1611 {
1499 scroll_selection_dir = DN; 1612 scroll_selection_dir = DN;
1500 dist = ev.xbutton.y - 1613 dist = ev.xbutton.y - (int_bwidth + height);
1501 (TermWin.int_bwidth + TermWin.height);
1502 } 1614 }
1615
1503 scroll_selection_lines= (Pixel2Height (dist)/ 1616 scroll_selection_lines = Pixel2Height (dist)
1504 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1617 / SELECTION_SCROLL_LINE_SPEEDUP
1618 + 1;
1505 MIN_IT (scroll_selection_lines, 1619 min_it (scroll_selection_lines,
1506 SELECTION_SCROLL_MAX_LINES); 1620 SELECTION_SCROLL_MAX_LINES);
1507 } 1621 }
1508 else 1622 else
1509 { 1623 {
1510 /* we are within the text window, so we 1624 /* we are within the text window, so we
1511 * shouldn't be scrolling 1625 * shouldn't be scrolling
1512 */ 1626 */
1513 pending_scroll_selection = 0; 1627 sel_scroll_ev.stop();
1514 } 1628 }
1515#endif 1629#endif
1516#ifdef MOUSE_THRESHOLD 1630#ifdef MOUSE_THRESHOLD
1517
1518 } 1631 }
1519#endif 1632#endif
1520
1521 } 1633 }
1522 } 1634 }
1523 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1635 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1524 { 1636 {
1525 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1526 MotionNotify, &ev)) ; 1638 MotionNotify, &ev))
1639 ;
1640
1527 XQueryPointer (display->display, scrollBar.win, 1641 XQueryPointer (dpy, scrollBar.win,
1528 &unused_root, &unused_child, 1642 &unused_root, &unused_child,
1529 &unused_root_x, &unused_root_y, 1643 &unused_root_x, &unused_root_y,
1530 & (ev.xbutton.x), & (ev.xbutton.y), 1644 &ev.xbutton.x, &ev.xbutton.y,
1531 &unused_mask); 1645 &unused_mask);
1532 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1646 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1533 scrollbar_size ()); 1647 scrollbar_size ());
1534 scr_refresh (refresh_type);
1535 refresh_limit = 0; 1648 want_refresh = 1;
1536 scrollbar_show (1); 1649 scrollbar_show (1);
1537 } 1650 }
1538 break; 1651 break;
1539 } 1652 }
1540}
1541 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
1542void 1778void
1543rxvt_term::rootwin_cb (XEvent &ev) 1779rxvt_term::rootwin_cb (XEvent &ev)
1544{ 1780{
1545 SET_R (this); 1781 make_current ();
1546 SET_LOCALE (locale);
1547 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
1548 switch (ev.type) 1788 switch (ev.type)
1549 { 1789 {
1550 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 */
1551 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])
1552 { 1797 {
1553 if (ev.xproperty.state == PropertyNewValue) 1798 bgPixmap.set_root_pixmap ();
1554 selection_property (ev.xproperty.window, ev.xproperty.atom); 1799 update_background ();
1555 break;
1556 } 1800 }
1557#ifdef TRANSPARENT
1558 else
1559 {
1560 /*
1561 * if user used some Esetroot compatible prog to set the root bg,
1562 * use the property to determine the pixmap. We use it later on.
1563 */
1564 if (xa[XA_XROOTPMAPID] == 0)
1565 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1566 1801
1567 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1568 return;
1569 }
1570
1571 /* FALLTHROUGH */
1572 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ())
1574 if (am_transparent)
1575 want_full_refresh = 1;
1576 break; 1802 break;
1803 }
1577#endif 1804# endif
1578 } 1805
1806 refresh_check ();
1579} 1807}
1808#endif
1580 1809
1581void 1810void
1582rxvt_term::button_press (XButtonEvent &ev) 1811rxvt_term::button_press (XButtonEvent &ev)
1583{ 1812{
1584 int reportmode = 0, clickintime; 1813 int reportmode = 0, clickintime;
1585 1814
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1815 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1816
1587 if (!bypass_keystate) 1817 if (!bypass_keystate)
1588 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1818 reportmode = !! (priv_modes & PrivMode_mouse_report);
1819
1589 /* 1820 /*
1590 * VT window processing of button press 1821 * VT window processing of button press
1591 */ 1822 */
1592 if (ev.window == TermWin.vt) 1823 if (ev.window == vt)
1593 { 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
1594 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1837 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1838
1595 if (reportmode) 1839 if (reportmode)
1596 { 1840 {
1597 /* mouse report from vt window */ 1841 /* mouse report from vt window */
1598 /* save the xbutton state (for ButtonRelease) */ 1842 /* save the xbutton state (for ButtonRelease) */
1599 MEvent.state = ev.state; 1843 MEvent.state = ev.state;
1600#ifdef MOUSE_REPORT_DOUBLECLICK 1844#ifdef MOUSE_REPORT_DOUBLECLICK
1601 if (ev.button == MEvent.button && clickintime) 1845 if (ev.button == MEvent.button && clickintime)
1602 { 1846 {
1603 /* same button, within alloted time */ 1847 /* same button, within alloted time */
1604 MEvent.clicks++; 1848 MEvent.clicks++;
1849
1605 if (MEvent.clicks > 1) 1850 if (MEvent.clicks > 1)
1606 { 1851 {
1607 /* only report double clicks */ 1852 /* only report double clicks */
1608 MEvent.clicks = 2; 1853 MEvent.clicks = 2;
1609 mouse_report (ev); 1854 mouse_report (ev);
… …
1621 mouse_report (ev); 1866 mouse_report (ev);
1622 } 1867 }
1623#else 1868#else
1624 MEvent.button = ev.button; 1869 MEvent.button = ev.button;
1625 mouse_report (ev); 1870 mouse_report (ev);
1626#endif /* MOUSE_REPORT_DOUBLECLICK */ 1871#endif /* MOUSE_REPORT_DOUBLECLICK */
1627 1872
1628 } 1873 }
1629 else 1874 else
1630 { 1875 {
1631 if (ev.button != MEvent.button) 1876 if (ev.button != MEvent.button)
1632 MEvent.clicks = 0; 1877 MEvent.clicks = 0;
1878
1633 switch (ev.button) 1879 switch (ev.button)
1634 { 1880 {
1635 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
1636 /* allow shift+left click to extend selection */ 1890 /* allow shift+left click to extend selection */
1637 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1891 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1638 { 1892 {
1639 if (MEvent.button == Button1 && clickintime) 1893 if (MEvent.button == Button1 && clickintime)
1640 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1641 else 1895 else
1642 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
… …
1657 case Button3: 1911 case Button3:
1658 if (MEvent.button == Button3 && clickintime) 1912 if (MEvent.button == Button3 && clickintime)
1659 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1660 else 1914 else
1661 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
1916
1662 MEvent.button = Button3; 1917 MEvent.button = Button3;
1663 break; 1918 break;
1664 } 1919 }
1665 } 1920 }
1921
1666 MEvent.time = ev.time; 1922 MEvent.time = ev.time;
1667 return; 1923 return;
1668 } 1924 }
1669 1925
1670 /* 1926 /*
… …
1714 tt_printf ("\033[5~"); 1970 tt_printf ("\033[5~");
1715 break; 1971 break;
1716 } 1972 }
1717 } 1973 }
1718 else 1974 else
1719#endif /* NO_SCROLLBAR_REPORT */ 1975#endif /* NO_SCROLLBAR_REPORT */
1720 1976
1721 { 1977 {
1722 char upordown = 0; 1978 char upordown = 0;
1723 1979
1724 if (scrollBar.style == R_SB_NEXT) 1980 if (scrollBar.style == R_SB_NEXT)
1725 { 1981 {
1726 if (scrollbarnext_upButton (ev.y)) 1982 if (scrollbarnext_upButton (ev.y))
1727 upordown = -1; /* up */ 1983 upordown = -1; /* up */
… …
1733 if (scrollbarrxvt_upButton (ev.y)) 1989 if (scrollbarrxvt_upButton (ev.y))
1734 upordown = -1; /* up */ 1990 upordown = -1; /* up */
1735 else if (scrollbarrxvt_dnButton (ev.y)) 1991 else if (scrollbarrxvt_dnButton (ev.y))
1736 upordown = 1; /* down */ 1992 upordown = 1; /* down */
1737 } 1993 }
1994
1738 if (upordown) 1995 if (upordown)
1739 { 1996 {
1740#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1741 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1998 if (!cont_scroll_ev.is_active ())
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1742#endif 2000#endif
1743 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (upordown < 0 ? UP : DN, 1))
1744 { 2002 {
1745 if (upordown < 0) 2003 if (upordown < 0)
1746 scrollBar.setUp (); 2004 scrollBar.setUp ();
… …
1750 } 2008 }
1751 else 2009 else
1752 switch (ev.button) 2010 switch (ev.button)
1753 { 2011 {
1754 case Button2: 2012 case Button2:
1755 switch (scrollbar_align) 2013 switch (scrollBar.align)
1756 { 2014 {
1757 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
1758 csrO = 0; 2016 csrO = 0;
1759 break; 2017 break;
1760 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
… …
1762 break; 2020 break;
1763 case R_SB_ALIGN_BOTTOM: 2021 case R_SB_ALIGN_BOTTOM:
1764 csrO = scrollBar.bot - scrollBar.top; 2022 csrO = scrollBar.bot - scrollBar.top;
1765 break; 2023 break;
1766 } 2024 }
2025
1767 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
1768 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
1769 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
1770 scr_move_to ( scrollbar_position (ev.y) - csrO, 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1771 scrollbar_size ()); 2030
1772 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
1773 break; 2032 break;
1774 2033
1775 case Button1: 2034 case Button1:
1776 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1777 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
1778 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
1779 2038
1780 case Button3: 2039 case Button3:
1781 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
1782 { 2041 {
1783 if (scrollbar_above_slider (ev.y)) 2042 if (scrollbar_above_slider (ev.y))
1784# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1785 scr_page (UP, TermWin.nrow - 1); 2044 scr_page (UP, nrow - 1);
1786# else 2045# else
1787 scr_page (UP, TermWin.nrow / 4); 2046 scr_page (UP, nrow / 4);
1788# endif 2047# endif
1789 else if (scrollbar_below_slider (ev.y)) 2048 else if (scrollbar_below_slider (ev.y))
1790# ifdef RXVT_SCROLL_FULL 2049# ifdef RXVT_SCROLL_FULL
1791 scr_page (DN, TermWin.nrow - 1); 2050 scr_page (DN, nrow - 1);
1792# else 2051# else
1793 scr_page (DN, TermWin.nrow / 4); 2052 scr_page (DN, nrow / 4);
1794# endif 2053# endif
1795 else 2054 else
1796 scrollBar.setMotion (); 2055 scrollBar.setMotion ();
1797 } 2056 }
1798 else 2057 else
1799 { 2058 {
1800 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
1801 (TermWin.nrow 2060 (nrow
1802 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
1803 / scrollbar_size ())); 2062 / scrollbar_size ()));
1804 } 2063 }
2064
1805 break; 2065 break;
1806 } 2066 }
1807 } 2067 }
2068
1808 return; 2069 return;
1809 } 2070 }
1810#if MENUBAR
1811 /*
1812 * Menubar window processing of button press
1813 */
1814 if (isMenuBarWindow (ev.window))
1815 menubar_control (ev);
1816#endif
1817} 2071}
1818 2072
1819void 2073void
1820rxvt_term::button_release (XButtonEvent &ev) 2074rxvt_term::button_release (XButtonEvent &ev)
1821{ 2075{
1822 int reportmode = 0; 2076 int reportmode = 0;
1823 2077
1824 csrO = 0; /* reset csr Offset */ 2078 csrO = 0; /* reset csr Offset */
1825 if (!bypass_keystate) 2079 if (!bypass_keystate)
1826 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
1827 2081
1828 if (scrollbar_isUpDn ()) 2082 if (scrollbar_isUpDn ())
1829 { 2083 {
1830 scrollBar.setIdle (); 2084 scrollBar.setIdle ();
1831 scrollbar_show (0); 2085 scrollbar_show (0);
1832#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1833 refresh_type &= ~SMOOTH_REFRESH;
1834#endif
1835
1836 } 2086 }
2087
1837#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
1838 pending_scroll_selection=0; 2089 sel_scroll_ev.stop();
1839#endif 2090#endif
2091
1840 if (ev.window == TermWin.vt) 2092 if (ev.window == vt)
1841 { 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
1842 if (reportmode) 2103 if (reportmode)
1843 { 2104 {
1844 /* mouse report from vt window */ 2105 /* mouse report from vt window */
1845 /* don't report release of wheel "buttons" */ 2106 /* don't report release of wheel "buttons" */
1846 if (ev.button >= 4) 2107 if (ev.button >= 4)
… …
1857 mouse_report (ev); 2118 mouse_report (ev);
1858 } 2119 }
1859#else /* MOUSE_REPORT_DOUBLECLICK */ 2120#else /* MOUSE_REPORT_DOUBLECLICK */
1860 MEvent.button = AnyButton; 2121 MEvent.button = AnyButton;
1861 mouse_report (ev); 2122 mouse_report (ev);
1862#endif /* MOUSE_REPORT_DOUBLECLICK */ 2123#endif /* MOUSE_REPORT_DOUBLECLICK */
1863 return; 2124 return;
1864 } 2125 }
2126
1865 /* 2127 /*
1866 * dumb hack to compensate for the failure of click-and-drag 2128 * dumb hack to compensate for the failure of click-and-drag
1867 * when overriding mouse reporting 2129 * when overriding mouse reporting
1868 */ 2130 */
1869 if (PrivateModes & PrivMode_mouse_report 2131 if (priv_modes & PrivMode_mouse_report
1870 && bypass_keystate 2132 && bypass_keystate
1871 && ev.button == Button1 && MEvent.clicks <= 1) 2133 && ev.button == Button1 && MEvent.clicks <= 1)
1872 selection_extend (ev.x, ev.y, 0); 2134 selection_extend (ev.x, ev.y, 0);
1873 2135
1874 switch (ev.button) 2136 switch (ev.button)
1875 { 2137 {
1876 case Button1: 2138 case Button1:
1877 case Button3: 2139 case Button3:
1878 selection_make (ev.time); 2140 selection_make (ev.time);
1879 break; 2141 break;
2142
1880 case Button2: 2143 case Button2:
1881 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);
1882 break; 2146 break;
2147
1883#ifdef MOUSE_WHEEL 2148#ifdef MOUSE_WHEEL
1884 case Button4: 2149 case Button4:
1885 case Button5: 2150 case Button5:
1886 { 2151 {
1887 int i; 2152 int i;
1888 page_dirn v; 2153 page_dirn v;
1889 2154
1890 v = (ev.button == Button4) ? UP : DN; 2155 v = ev.button == Button4 ? UP : DN;
2156
1891 if (ev.state & ShiftMask) 2157 if (ev.state & ShiftMask)
1892 i = 1; 2158 i = 1;
1893 else if ((Options & Opt_mouseWheelScrollPage)) 2159 else if (option (Opt_mouseWheelScrollPage))
1894 i = TermWin.nrow - 1; 2160 i = nrow - 1;
1895 else 2161 else
1896 i = 5; 2162 i = 5;
2163
1897# ifdef MOUSE_SLIP_WHEELING 2164# ifdef MOUSE_SLIP_WHEELING
1898 if (ev.state & ControlMask) 2165 if (ev.state & ControlMask)
1899 { 2166 {
1900 mouse_slip_wheel_speed += (v ? -1 : 1); 2167 mouse_slip_wheel_speed += v ? -1 : 1;
1901 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);
2173 }
2174 else
2175 {
2176# endif
2177 scr_page (v, i);
2178 scrollbar_show (1);
2179# ifdef MOUSE_SLIP_WHEELING
1902 } 2180 }
1903# endif 2181# endif
1904# ifdef JUMP_MOUSE_WHEEL
1905 scr_page (v, i);
1906 scr_refresh (SMOOTH_REFRESH);
1907 scrollbar_show (1);
1908# else
1909 while (i--)
1910 {
1911 scr_page (v, 1);
1912 scr_refresh (SMOOTH_REFRESH);
1913 scrollbar_show (1);
1914 }
1915# endif
1916
1917 } 2182 }
1918 break; 2183 break;
1919#endif 2184#endif
1920
1921 }
1922 }
1923#ifdef MENUBAR
1924 else if (isMenuBarWindow (ev.window))
1925 menubar_control (ev);
1926#endif
1927}
1928
1929
1930#ifdef TRANSPARENT
1931/*
1932 * Check our parents are still who we think they are.
1933 * Do transparency updates if required
1934 */
1935int
1936rxvt_term::check_our_parents ()
1937{
1938 int i, pchanged, aformat, have_pixmap, rootdepth;
1939 unsigned long nitems, bytes_after;
1940 Atom atype;
1941 unsigned char *prop = NULL;
1942 Window root, oldp, *list;
1943 Pixmap rootpixmap = None;
1944 XWindowAttributes wattr, wrootattr;
1945
1946 pchanged = 0;
1947
1948 if (! (Options & Opt_transparent))
1949 return pchanged; /* Don't try any more */
1950
1951 XGetWindowAttributes (display->display, display->root, &wrootattr);
1952 rootdepth = wrootattr.depth;
1953
1954 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1955 if (rootdepth != wattr.depth)
1956 {
1957 if (am_transparent)
1958 { 2185 }
1959 pchanged = 1; 2186 }
1960 XSetWindowBackground (display->display, TermWin.vt, 2187}
1961 PixColors[Color_bg]); 2188
1962 am_transparent = am_pixmap_trans = 0; 2189/*}}} */
2190
2191bool
2192rxvt_term::cmd_parse ()
2193{
2194 bool flag = false;
2195 wchar_t ch = NOCHAR;
2196 char *seq_begin; // remember start of esc-sequence here
2197
2198 for (;;)
2199 {
2200 if (ch == NOCHAR)
1963 } 2201 {
1964 return pchanged; /* Don't try any more */ 2202 seq_begin = cmdbuf_ptr;
1965 } 2203 ch = next_char ();
1966 2204
1967 /* Get all X ops out of the queue so that our information is up-to-date. */ 2205 if (ch == NOCHAR)
1968 XSync (display->display, False); 2206 break;
1969
1970 /*
1971 * Make the frame window set by the window manager have
1972 * the root background. Some window managers put multiple nested frame
1973 * windows for each client, so we have to take care about that.
1974 */
1975 i = (xa[XA_XROOTPMAPID] != 0
1976 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1977 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1978 &nitems, &bytes_after, &prop) == Success));
1979 if (!i || prop == NULL)
1980 have_pixmap = 0;
1981 else
1982 {
1983 have_pixmap = 1;
1984 rootpixmap = * ((Pixmap *)prop);
1985 XFree (prop);
1986 }
1987 if (have_pixmap)
1988 {
1989 /*
1990 * Copy display->root pixmap transparency
1991 */
1992 int sx, sy, nx, ny;
1993 unsigned int nw, nh;
1994 Window cr;
1995 XImage *image;
1996 GC gc;
1997 XGCValues gcvalue;
1998
1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2000 0, 0, &sx, &sy, &cr);
2001 nw = (unsigned int)szHint.width;
2002 nh = (unsigned int)szHint.height;
2003 nx = ny = 0;
2004 if (sx < 0)
2005 { 2207 }
2006 nw += sx; 2208
2007 nx = -sx; 2209 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2008 sx = 0;
2009 } 2210 {
2010 if (sy < 0) 2211 if (!seen_input)
2011 {
2012 nh += sy;
2013 ny = -sy;
2014 sy = 0;
2015 }
2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2018 allowedxerror = -1;
2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2020 ZPixmap);
2021 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2022 /* XXX: may need a delay here? */
2023 allowedxerror = 0;
2024 if (image == NULL)
2025 {
2026 if (am_transparent && am_pixmap_trans)
2027 { 2212 {
2028 pchanged = 1; 2213 seen_input = 1;
2029 if (TermWin.pixmap != None) 2214 // many badly-written programs (e.g. jed) contain a race condition:
2215 // they first read the screensize and then install a SIGWINCH handler.
2216 // some window managers resize the window early, and these programs
2217 // then sometimes get the size wrong.
2218 // unfortunately other programs are even more buggy and dislike
2219 // being sent SIGWINCH, so only do it when we were in fact being
2220 // resized.
2221 if (seen_resize && cmd_pid)
2222 kill (-cmd_pid, SIGWINCH);
2223 }
2224
2225 /* Read a text string from the input buffer */
2226 wchar_t buf[UBUFSIZ];
2227 bool refreshnow = false;
2228 int nlines = 0;
2229 wchar_t *str = buf;
2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2231
2232 for (;;)
2233 {
2234 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2235 break;
2236
2237 *str++ = ch;
2238
2239 if (ch == C0_LF || str >= eol)
2030 { 2240 {
2031 XFreePixmap (display->display, TermWin.pixmap); 2241 if (ch == C0_LF)
2032 TermWin.pixmap = None; 2242 nlines++;
2243
2244 refresh_count++;
2245
2246 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2247 {
2248 refresh_count = 0;
2249
2250 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2251 {
2252 refreshnow = true;
2253 ch = NOCHAR;
2254 break;
2255 }
2256 }
2257
2258 // scr_add_lines only works for nlines <= nrow - 1.
2259 if (nlines >= nrow - 1)
2260 {
2261 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2262 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2263 scr_add_lines (buf, str - buf, nlines);
2264
2265 nlines = 0;
2266 str = buf;
2267 eol = str + min (ncol, UBUFSIZ);
2268 }
2269
2270 if (str >= eol)
2271 {
2272 if (eol >= buf + UBUFSIZ)
2273 {
2274 ch = NOCHAR;
2275 break;
2276 }
2277 else
2278 eol = min (eol + ncol, buf + UBUFSIZ);
2279 }
2280
2033 } 2281 }
2282
2283 seq_begin = cmdbuf_ptr;
2284 ch = next_char ();
2034 } 2285 }
2035 am_pixmap_trans = 0; 2286
2287 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2288 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2289 scr_add_lines (buf, str - buf, nlines);
2290
2291 /*
2292 * If there have been a lot of new lines, then update the screen
2293 * What the heck we'll cheat and only refresh less than every page-full.
2294 * if skipScroll is enabled.
2295 */
2296 if (refreshnow)
2297 {
2298 flag = true;
2299 scr_refresh ();
2300 want_refresh = 1;
2301 }
2302
2036 } 2303 }
2037 else 2304 else
2038 { 2305 {
2039 if (TermWin.pixmap != None) 2306 try
2040 XFreePixmap (display->display, TermWin.pixmap);
2041 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2042 (unsigned int)szHint.width,
2043 (unsigned int)szHint.height,
2044 (unsigned int)image->depth);
2045 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2046 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2047 nx, ny, (unsigned int)image->width,
2048 (unsigned int)image->height);
2049 XFreeGC (display->display, gc);
2050 XDestroyImage (image);
2051 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2052 TermWin.pixmap);
2053 if (!am_transparent || !am_pixmap_trans)
2054 pchanged = 1;
2055 am_transparent = am_pixmap_trans = 1;
2056 }
2057 }
2058 if (!am_pixmap_trans)
2059 {
2060 unsigned int n;
2061 /*
2062 * InheritPixmap transparency
2063 */
2064 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2065 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2066 i++)
2067 {
2068 oldp = TermWin.parent[i];
2069 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2070 &TermWin.parent[i], &list, &n);
2071 XFree (list);
2072 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2073 if (TermWin.parent[i] == display->root)
2074 { 2307 {
2075 if (oldp != None) 2308 process_nonprinting (ch);
2076 pchanged = 1; 2309 }
2310 catch (const class out_of_input &o)
2311 {
2312 // we ran out of input, retry later
2313 cmdbuf_ptr = seq_begin;
2077 break; 2314 break;
2078 } 2315 }
2079 if (oldp != TermWin.parent[i]) 2316
2080 pchanged = 1; 2317 ch = NOCHAR;
2081 }
2082 n = 0;
2083 if (pchanged)
2084 { 2318 }
2085 for (; n < (unsigned int)i; n++) 2319 }
2086 { 2320
2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2321 return flag;
2088 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2322}
2089 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2323
2090 { 2324// read the next character
2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2325wchar_t
2092 break; 2326rxvt_term::next_char () NOTHROW
2093 } 2327{
2094 } 2328 while (cmdbuf_ptr < cmdbuf_endp)
2329 {
2330 // assume 7-bit to be ascii ALWAYS
2331 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2332 return *cmdbuf_ptr++;
2333
2334 wchar_t wc;
2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2336
2337 if (len == (size_t)-2)
2095 } 2338 {
2096 if (n > (int) (sizeof (TermWin.parent) 2339 // the mbstate stores incomplete sequences. didn't know this :/
2097 / sizeof (TermWin.parent[0]))) 2340 cmdbuf_ptr = cmdbuf_endp;
2341 break;
2098 { 2342 }
2099 D_X ((stderr, "InheritPixmap Turning off"));
2100 XSetWindowBackground (display->display, TermWin.parent[0],
2101 PixColors[Color_fg]);
2102 XSetWindowBackground (display->display, TermWin.vt,
2103 PixColors[Color_bg]);
2104 am_transparent = 0;
2105 /* XXX: also turn off Opt_transparent? */
2106 }
2107 else
2108 {
2109 /* wait (an arbitrary period) for the WM to do its thing
2110 * needed for fvwm2.2.2 (and before?) */
2111# ifdef HAVE_NANOSLEEP
2112 struct timespec rqt;
2113 2343
2114 rqt.tv_sec = 1; 2344 if (len == (size_t)-1)
2115 rqt.tv_nsec = 0; 2345 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2116 nanosleep (&rqt, NULL); 2346
2117# else 2347 // assume wchar == unicode
2118 sleep (1); 2348 cmdbuf_ptr += len;
2119# endif 2349 return wc & UNICODE_MASK;
2120 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2121 for (n = 0; n < (unsigned int)i; n++)
2122 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2123 ParentRelative);
2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2125 ParentRelative);
2126 am_transparent = 1;
2127 }
2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2129 TermWin.parent[i] = None;
2130 } 2350 }
2351
2352 return NOCHAR;
2353}
2354
2355// read the next octet
2356uint32_t
2357rxvt_term::next_octet () NOTHROW
2358{
2359 return cmdbuf_ptr < cmdbuf_endp
2360 ? (unsigned char)*cmdbuf_ptr++
2361 : NOCHAR;
2362}
2363
2364static class out_of_input out_of_input;
2365
2366/* rxvt_cmd_getc () - Return next input character */
2367/*
2368 * Return the next input character after first passing any keyboard input
2369 * to the command.
2370 */
2371wchar_t
2372rxvt_term::cmd_getc () THROW ((class out_of_input))
2373{
2374 wchar_t c = next_char ();
2375
2376 if (c == NOCHAR)
2377 throw out_of_input;
2378
2131 return pchanged; 2379 return c;
2132} 2380}
2133#endif
2134 2381
2135/*}}} */ 2382uint32_t
2383rxvt_term::cmd_get8 () THROW ((class out_of_input))
2384{
2385 uint32_t c = next_octet ();
2386
2387 if (c == NOCHAR)
2388 throw out_of_input;
2389
2390 return c;
2391}
2136 2392
2137/*{{{ print pipe */ 2393/*{{{ print pipe */
2138/*----------------------------------------------------------------------*/ 2394/*----------------------------------------------------------------------*/
2139#ifdef PRINTPIPE 2395#ifdef PRINTPIPE
2140FILE * 2396FILE *
2141rxvt_term::popen_printer () 2397rxvt_term::popen_printer ()
2142{ 2398{
2143 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2399 FILE *stream = popen (rs[Rs_print_pipe], "w");
2144 2400
2145 if (stream == NULL) 2401 if (stream == NULL)
2146 rxvt_print_error ("can't open printer pipe"); 2402 rxvt_warn ("can't open printer pipe, not printing.\n");
2403
2147 return stream; 2404 return stream;
2148} 2405}
2149 2406
2150int 2407int
2151rxvt_term::pclose_printer (FILE *stream) 2408rxvt_term::pclose_printer (FILE *stream)
2152{ 2409{
2153 fflush (stream); 2410 fflush (stream);
2154 /* pclose () reported not to work on SunOS 4.1.3 */
2155# if defined (__sun__) /* TODO: RESOLVE THIS */
2156 /* pclose works provided SIGCHLD handler uses waitpid */
2157 return pclose (stream); /* return fclose (stream); */
2158# else
2159 return pclose (stream); 2411 return pclose (stream);
2160# endif
2161} 2412}
2162 2413
2163/* 2414/*
2164 * simulate attached vt100 printer 2415 * simulate attached vt100 printer
2165 */ 2416 */
2166void 2417void
2167rxvt_term::process_print_pipe () 2418rxvt_term::process_print_pipe ()
2168{ 2419{
2169 int done; 2420 int done;
2170 FILE *fd; 2421 FILE *fd;
2171 2422
2172 if ((fd = popen_printer ()) == NULL) 2423 if ((fd = popen_printer ()) == NULL)
2173 return; 2424 return;
2174 2425
2175 /* 2426 /*
2176 * Send all input to the printer until either ESC[4i or ESC[?4i 2427 * Send all input to the printer until either ESC[4i or ESC[?4i
2177 * is received. 2428 * is received.
2178 */ 2429 */
2179 for (done = 0; !done;) 2430 for (done = 0; !done;)
2180 { 2431 {
2181 unsigned char buf[8]; 2432 unsigned char buf[8];
2182 unsigned char ch; 2433 unicode_t ch;
2183 unsigned int i, len; 2434 unsigned int i, len;
2184 2435
2185 if ((ch = cmd_getc ()) != C0_ESC) 2436 if ((ch = cmd_getc ()) != C0_ESC)
2186 { 2437 {
2187 if (putc (ch, fd) == EOF) 2438 if (putc (ch, fd) == EOF)
2188 break; /* done = 1 */ 2439 break; /* done = 1 */
… …
2203 { 2454 {
2204 if ((buf[len++] = cmd_getc ()) == 'i') 2455 if ((buf[len++] = cmd_getc ()) == 'i')
2205 break; /* done = 1 */ 2456 break; /* done = 1 */
2206 } 2457 }
2207 } 2458 }
2459
2208 for (i = 0; i < len; i++) 2460 for (i = 0; i < len; i++)
2209 if (putc (buf[i], fd) == EOF) 2461 if (putc (buf[i], fd) == EOF)
2210 { 2462 {
2211 done = 1; 2463 done = 1;
2212 break; 2464 break;
2213 } 2465 }
2214 } 2466 }
2215 } 2467 }
2468
2216 pclose_printer (fd); 2469 pclose_printer (fd);
2217} 2470}
2218#endif /* PRINTPIPE */ 2471#endif /* PRINTPIPE */
2219/*}}} */ 2472/*}}} */
2220 2473
2221/* *INDENT-OFF* */ 2474/* *INDENT-OFF* */
2222enum { 2475enum {
2223 C1_40 = 0x40, 2476 C1_40 = 0x40,
2224 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2477 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2225 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2478 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2226 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2479 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2227 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2480 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2228}; 2481};
2229/* *INDENT-ON* */ 2482/* *INDENT-ON* */
2230 2483
2231/*{{{ process non-printing single characters */ 2484/*{{{ process non-printing single characters */
2232void 2485void
2233rxvt_term::process_nonprinting (unsigned char ch) 2486rxvt_term::process_nonprinting (unicode_t ch)
2234{ 2487{
2235 switch (ch) 2488 switch (ch)
2236 { 2489 {
2490 case C0_ESC:
2491 process_escape_seq ();
2492 break;
2237 case C0_ENQ: /* terminal Status */ 2493 case C0_ENQ: /* terminal Status */
2238 if (rs[Rs_answerbackstring]) 2494 if (rs[Rs_answerbackstring])
2239 tt_write ( 2495 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2240 (const unsigned char *)rs[Rs_answerbackstring],
2241 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2242 else 2496 else
2243 tt_write ((unsigned char *)VT100_ANS, 2497 tt_write (VT100_ANS, strlen (VT100_ANS));
2244 (unsigned int)STRLEN (VT100_ANS));
2245 break; 2498 break;
2246 case C0_BEL: /* bell */ 2499 case C0_BEL: /* bell */
2247 scr_bell (); 2500 scr_bell ();
2248 break; 2501 break;
2249 case C0_BS: /* backspace */ 2502 case C0_BS: /* backspace */
… …
2264 scr_charset_choose (1); 2517 scr_charset_choose (1);
2265 break; 2518 break;
2266 case C0_SI: /* shift in - acs */ 2519 case C0_SI: /* shift in - acs */
2267 scr_charset_choose (0); 2520 scr_charset_choose (0);
2268 break; 2521 break;
2522
2523#ifdef EIGHT_BIT_CONTROLS
2524 // 8-bit controls
2525 case 0x90: /* DCS */
2526 process_dcs_seq ();
2527 break;
2528 case 0x9b: /* CSI */
2529 process_csi_seq ();
2530 break;
2531 case 0x9d: /* OSC */
2532 process_osc_seq ();
2533 break;
2534#endif
2269 } 2535 }
2270} 2536}
2271/*}}} */ 2537/*}}} */
2272 2538
2273 2539
2274/*{{{ process VT52 escape sequences */ 2540/*{{{ process VT52 escape sequences */
2275void 2541void
2276rxvt_term::process_escape_vt52 (unsigned char ch) 2542rxvt_term::process_escape_vt52 (unicode_t ch)
2277{ 2543{
2278 int row, col; 2544 int row, col;
2279 2545
2280 switch (ch) 2546 switch (ch)
2281 { 2547 {
… …
2333 2599
2334/*{{{ process escape sequences */ 2600/*{{{ process escape sequences */
2335void 2601void
2336rxvt_term::process_escape_seq () 2602rxvt_term::process_escape_seq ()
2337{ 2603{
2338 unsigned char ch = cmd_getc (); 2604 unicode_t ch = cmd_getc ();
2339 2605
2340 if (PrivateModes & PrivMode_vt52) 2606 if (priv_modes & PrivMode_vt52)
2341 { 2607 {
2342 process_escape_vt52 (ch); 2608 process_escape_vt52 (ch);
2343 return; 2609 return;
2344 } 2610 }
2345 2611
… …
2360 scr_charset_set (2, (unsigned int)cmd_getc ()); 2626 scr_charset_set (2, (unsigned int)cmd_getc ());
2361 break; 2627 break;
2362 case '+': 2628 case '+':
2363 scr_charset_set (3, (unsigned int)cmd_getc ()); 2629 scr_charset_set (3, (unsigned int)cmd_getc ());
2364 break; 2630 break;
2365#ifdef MULTICHAR_SET 2631#if !ENABLE_MINIMAL
2366 case '$':
2367 scr_charset_set (-2, (unsigned int)cmd_getc ());
2368 break;
2369#endif
2370#ifndef NO_FRILLS
2371 case '6': 2632 case '6':
2372 scr_backindex (); 2633 scr_backindex ();
2373 break; 2634 break;
2374#endif 2635#endif
2375 case '7': 2636 case '7':
2376 scr_cursor (SAVE); 2637 scr_cursor (SAVE);
2377 break; 2638 break;
2378 case '8': 2639 case '8':
2379 scr_cursor (RESTORE); 2640 scr_cursor (RESTORE);
2380 break; 2641 break;
2381#ifndef NO_FRILLS 2642#if !ENABLE_MINIMAL
2382 case '9': 2643 case '9':
2383 scr_forwardindex (); 2644 scr_forwardindex ();
2384 break; 2645 break;
2385#endif 2646#endif
2386 case '=': 2647 case '=':
… …
2396 break; 2657 break;
2397 2658
2398 /* 8.3.87: NEXT LINE */ 2659 /* 8.3.87: NEXT LINE */
2399 case C1_NEL: /* ESC E */ 2660 case C1_NEL: /* ESC E */
2400 { 2661 {
2401 uint32_t nlcr[] = { '\n', '\r' }; 2662 wchar_t nlcr[] = { C0_LF, C0_CR };
2402 scr_add_lines (nlcr, 1, 2); 2663 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2403 } 2664 }
2404 break; 2665 break;
2405 2666
2406 /* kidnapped escape sequence: Should be 8.3.48 */ 2667 /* kidnapped escape sequence: Should be 8.3.48 */
2407 case C1_ESA: /* ESC G */ 2668 case C1_ESA: /* ESC G */
… …
2417 case C1_RI: /* ESC M */ 2678 case C1_RI: /* ESC M */
2418 scr_index (DN); 2679 scr_index (DN);
2419 break; 2680 break;
2420 2681
2421 /* 8.3.142: SINGLE-SHIFT TWO */ 2682 /* 8.3.142: SINGLE-SHIFT TWO */
2422 /*case C1_SS2: scr_single_shift (2); break; */ 2683 /*case C1_SS2: scr_single_shift (2); break; */
2423 2684
2424 /* 8.3.143: SINGLE-SHIFT THREE */ 2685 /* 8.3.143: SINGLE-SHIFT THREE */
2425 /*case C1_SS3: scr_single_shift (3); break; */ 2686 /*case C1_SS3: scr_single_shift (3); break; */
2426 2687
2427 /* 8.3.27: DEVICE CONTROL STRING */ 2688 /* 8.3.27: DEVICE CONTROL STRING */
2428 case C1_DCS: /* ESC P */ 2689 case C1_DCS: /* ESC P */
2429 process_dcs_seq (); 2690 process_dcs_seq ();
2430 break; 2691 break;
2431 2692
2432 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2433 case C1_SCI: /* ESC Z */ 2694 case C1_SCI: /* ESC Z */
2434 tt_write ((const unsigned char *)ESCZ_ANSWER, 2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2435 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2436 break; /* steal obsolete ESC [ c */ 2696 break; /* steal obsolete ESC [ c */
2437 2697
2438 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2439 case C1_CSI: /* ESC [ */ 2699 case C1_CSI: /* ESC [ */
2440 process_csi_seq (); 2700 process_csi_seq ();
… …
2445 process_osc_seq (); 2705 process_osc_seq ();
2446 break; 2706 break;
2447 2707
2448 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE */
2449 case 'c': 2709 case 'c':
2710 mbstate.reset ();
2450 scr_poweron (); 2711 scr_poweron ();
2451 scrollbar_show (1); 2712 scrollbar_show (1);
2452 break; 2713 break;
2453 2714
2454 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2466 2727
2467/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2728/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2468/* *INDENT-OFF* */ 2729/* *INDENT-OFF* */
2469enum { 2730enum {
2470 CSI_ICH = 0x40, 2731 CSI_ICH = 0x40,
2471 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2732 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2472 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2733 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2473 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2734 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2474 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2735 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2475 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2736 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2476 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2737 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2491 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2752 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2492 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2753 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2493 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2754 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2494 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2755 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2495 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2756 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2496 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2757 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2497 }; 2758 };
2498/* *INDENT-ON* */ 2759/* *INDENT-ON* */
2499 2760
2500void 2761void
2501rxvt_term::process_csi_seq () 2762rxvt_term::process_csi_seq ()
2502{ 2763{
2503 unsigned char ch, priv, i; 2764 unicode_t ch, priv, i;
2504 unsigned int nargs, p; 2765 unsigned int nargs, p;
2505 int n, ndef; 2766 int n, ndef;
2506 int arg[ESC_ARGS]; 2767 int arg[ESC_ARGS] = { };
2507 2768
2508 for (nargs = ESC_ARGS; nargs > 0;) 2769 nargs = 0;
2509 arg[--nargs] = 0;
2510 2770
2511 priv = 0; 2771 priv = 0;
2512 ch = cmd_getc (); 2772 ch = cmd_getc ();
2513 if (ch >= '<' && ch <= '?') 2773 if (ch >= '<' && ch <= '?')
2774 {
2514 { /* '<' '=' '>' '?' */ 2775 /* '<' '=' '>' '?' */
2515 priv = ch; 2776 priv = ch;
2516 ch = cmd_getc (); 2777 ch = cmd_getc ();
2517 } 2778 }
2779
2518 /* read any numerical arguments */ 2780 /* read any numerical arguments */
2519 for (n = -1; ch < CSI_ICH; ) 2781 for (n = -1; ch < CSI_ICH; )
2520 { 2782 {
2521 if (isdigit (ch)) 2783 if (isdigit (ch))
2522 { 2784 {
… …
2529 { 2791 {
2530 if (nargs < ESC_ARGS) 2792 if (nargs < ESC_ARGS)
2531 arg[nargs++] = n; 2793 arg[nargs++] = n;
2532 n = -1; 2794 n = -1;
2533 } 2795 }
2534 else if (ch == '\b') 2796 else if (IS_CONTROL (ch))
2535 {
2536 scr_backspace ();
2537 }
2538 else if (ch == C0_ESC)
2539 {
2540 process_escape_seq ();
2541 return;
2542 }
2543 else if (ch < ' ')
2544 {
2545 process_nonprinting (ch); 2797 process_nonprinting (ch);
2546 } 2798
2547 ch = cmd_getc (); 2799 ch = cmd_getc ();
2548 } 2800 }
2549 2801
2550 if (ch > CSI_7F) 2802 if (ch > CSI_7F)
2551 return; 2803 return;
… …
2557 ndef = get_byte_array_bit (csi_defaults, i); 2809 ndef = get_byte_array_bit (csi_defaults, i);
2558 for (p = 0; p < nargs; p++) 2810 for (p = 0; p < nargs; p++)
2559 if (arg[p] == -1) 2811 if (arg[p] == -1)
2560 arg[p] = ndef; 2812 arg[p] = ndef;
2561 2813
2562#ifdef DEBUG_CMD
2563 fprintf (stderr, "CSI ");
2564 for (p = 0; p < nargs; p++)
2565 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2566 fprintf (stderr, "%c\n", ch);
2567#endif
2568
2569 /* 2814 /*
2570 * private mode handling 2815 * private mode handling
2571 */ 2816 */
2572 if (priv) 2817 if (priv)
2573 { 2818 {
2574 switch (priv) 2819 switch (priv)
2575 { 2820 {
2576 case '>': 2821 case '>':
2577 if (ch == CSI_DA) /* secondary device attributes */ 2822 if (ch == CSI_DA) /* secondary device attributes */
2823 {
2824 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2825 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2826 //
2827 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2828 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2829 // versions.
2830 //
2578 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2831 tt_printf ("\033[>%d;95;0c", 'U');
2832 }
2579 break; 2833 break;
2580 case '?': 2834 case '?':
2581 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2582 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
2583 break; 2837 break;
… …
2688 2942
2689 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2943 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2690 arg[0] = -arg[0]; 2944 arg[0] = -arg[0];
2691 /* FALLTHROUGH */ 2945 /* FALLTHROUGH */
2692 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2946 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2693 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2947 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2694 break; 2948 break;
2695 2949
2696 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2950 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2697 tt_write ((const unsigned char *)VT100_ANS, 2951 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2698 (unsigned int) (sizeof (VT100_ANS) - 1));
2699 break; 2952 break;
2700 2953
2701 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2954 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2702 process_sgr_mode (nargs, arg); 2955 process_sgr_mode (nargs, arg);
2703 break; 2956 break;
… …
2709 tt_printf ("\033[0n"); 2962 tt_printf ("\033[0n");
2710 break; 2963 break;
2711 case 6: /* CPR requested */ 2964 case 6: /* CPR requested */
2712 scr_report_position (); 2965 scr_report_position ();
2713 break; 2966 break;
2714#if defined (ENABLE_DISPLAY_ANSWER)
2715 case 7: /* unofficial extension */ 2967 case 7: /* unofficial extension */
2968 if (option (Opt_insecure))
2716 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2969 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2717 break; 2970 break;
2718#endif
2719 case 8: /* unofficial extension */ 2971 case 8: /* unofficial extension */
2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2972 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2721 break; 2973 break;
2722 } 2974 }
2723 break; 2975 break;
2724 2976
2725 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2977 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2758 break; 3010 break;
2759 3011
2760 case CSI_RM: /* 8.3.107: RESET MODE */ 3012 case CSI_RM: /* 8.3.107: RESET MODE */
2761 if (arg[0] == 4) 3013 if (arg[0] == 4)
2762 scr_insert_mode (0); 3014 scr_insert_mode (0);
3015 else if (arg[0] == 20)
3016 priv_modes &= ~PrivMode_LFNL;
2763 break; 3017 break;
2764 3018
2765 case CSI_SM: /* 8.3.126: SET MODE */ 3019 case CSI_SM: /* 8.3.126: SET MODE */
2766 if (arg[0] == 4) 3020 if (arg[0] == 4)
2767 scr_insert_mode (1); 3021 scr_insert_mode (1);
3022 else if (arg[0] == 20)
3023 priv_modes |= PrivMode_LFNL;
2768 break; 3024 break;
2769 3025
2770 /* 3026 /*
2771 * PRIVATE USE beyond this point. All CSI_7? sequences here 3027 * PRIVATE USE beyond this point. All CSI_7? sequences here
2772 */ 3028 */
… …
2784 break; 3040 break;
2785 case CSI_75: 3041 case CSI_75:
2786 scr_cursor (RESTORE); 3042 scr_cursor (RESTORE);
2787 break; 3043 break;
2788 3044
2789#ifndef NO_FRILLS 3045#if !ENABLE_MINIMAL
2790 case CSI_74: 3046 case CSI_74:
2791 process_window_ops (arg, nargs); 3047 process_window_ops (arg, nargs);
2792 break; 3048 break;
2793#endif 3049#endif
2794 3050
2795 case CSI_78: /* DECREQTPARM */ 3051 case CSI_78: /* DECREQTPARM */
2796 if (arg[0] == 0 || arg[0] == 1) 3052 if (arg[0] == 0 || arg[0] == 1)
2797 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3053 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2798 /* FALLTHROUGH */ 3054 break;
2799 3055
2800 default: 3056 default:
2801 break; 3057 break;
2802 } 3058 }
2803} 3059}
2804/*}}} */ 3060/*}}} */
2805 3061
2806#ifndef NO_FRILLS 3062#if !ENABLE_MINIMAL
2807/* ARGSUSED */ 3063/* ARGSUSED */
2808void 3064void
2809rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3065rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2810{ 3066{
2811 int x, y; 3067 int x, y;
2812#if 0
2813 char *s;
2814#endif
2815 XWindowAttributes wattr; 3068 XWindowAttributes wattr;
2816 Window wdummy; 3069 Window wdummy;
3070
3071 dLocal (Display *, dpy);
2817 3072
2818 if (nargs == 0) 3073 if (nargs == 0)
2819 return; 3074 return;
3075
2820 switch (args[0]) 3076 switch (args[0])
2821 { 3077 {
2822 /* 3078 /*
2823 * commands 3079 * commands
2824 */ 3080 */
2825 case 1: /* deiconify window */ 3081 case 1: /* deiconify window */
2826 XMapWindow (display->display, TermWin.parent[0]); 3082 XMapWindow (dpy, parent[0]);
2827 break; 3083 break;
2828 case 2: /* iconify window */ 3084 case 2: /* iconify window */
2829 XIconifyWindow (display->display, TermWin.parent[0], 3085 XIconifyWindow (dpy, parent[0], display->screen);
2830 DefaultScreen (display->display));
2831 break; 3086 break;
2832 case 3: /* set position (pixels) */ 3087 case 3: /* set position (pixels) */
2833 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3088 XMoveWindow (dpy, parent[0], args[1], args[2]);
2834 break; 3089 break;
2835 case 4: /* set size (pixels) */ 3090 case 4: /* set size (pixels) */
2836 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3091 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2837 break; 3092 break;
2838 case 5: /* raise window */ 3093 case 5: /* raise window */
2839 XRaiseWindow (display->display, TermWin.parent[0]); 3094 XRaiseWindow (dpy, parent[0]);
2840 break; 3095 break;
2841 case 6: /* lower window */ 3096 case 6: /* lower window */
2842 XLowerWindow (display->display, TermWin.parent[0]); 3097 XLowerWindow (dpy, parent[0]);
2843 break; 3098 break;
2844 case 7: /* refresh window */ 3099 case 7: /* refresh window */
2845 scr_touch (true); 3100 scr_touch (true);
2846 break; 3101 break;
2847 case 8: /* set size (chars) */ 3102 case 8: /* set size (chars) */
2848 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3103 set_widthheight ((unsigned int) (args[2] * fwidth),
2849 (unsigned int) (args[1] * TermWin.fheight)); 3104 (unsigned int) (args[1] * fheight));
2850 break; 3105 break;
3106
3107 //case 9: NYI, TODO, restore maximized window or maximize window
2851 default: 3108 default:
2852 if (args[0] >= 24) /* set height (chars) */ 3109 if (args[0] >= 24) /* set height (chars) */
2853 set_widthheight ((unsigned int)TermWin.width, 3110 set_widthheight ((unsigned int)width,
2854 (unsigned int) (args[1] * TermWin.fheight)); 3111 (unsigned int) (args[1] * fheight));
2855 break; 3112 break;
3113
2856 /* 3114 /*
2857 * reports - some output format copied from XTerm 3115 * reports - some output format copied from XTerm
2858 */ 3116 */
2859 case 11: /* report window state */ 3117 case 11: /* report window state */
2860 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3118 XGetWindowAttributes (dpy, parent[0], &wattr);
2861 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3119 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2862 break; 3120 break;
2863 case 13: /* report window position */ 3121 case 13: /* report window position */
2864 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3122 XGetWindowAttributes (dpy, parent[0], &wattr);
2865 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3123 XTranslateCoordinates (dpy, parent[0], wattr.root,
2866 -wattr.border_width, -wattr.border_width, 3124 -wattr.border_width, -wattr.border_width,
2867 &x, &y, &wdummy); 3125 &x, &y, &wdummy);
2868 tt_printf ("\033[3;%d;%dt", x, y); 3126 tt_printf ("\033[3;%d;%dt", x, y);
2869 break; 3127 break;
2870 case 14: /* report window size (pixels) */ 3128 case 14: /* report window size (pixels) */
2871 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
2872 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3130 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2873 break; 3131 break;
3132 case 18: /* report text area size (chars) */
3133 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3134 break;
2874 case 18: /* report window size (chars) */ 3135 case 19: /* report window size (chars) */
2875 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3136 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2876 break; 3137 break;
2877#if 0 /* XXX: currently disabled due to security concerns */
2878 case 20: /* report icon label */ 3138 case 20: /* report icon label */
3139 {
3140 char *s;
2879 XGetIconName (display->display, TermWin.parent[0], &s); 3141 XGetIconName (dpy, parent[0], &s);
2880 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3142 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3143 XFree (s);
3144 }
2881 break; 3145 break;
2882 case 21: /* report window title */ 3146 case 21: /* report window title */
3147 {
3148 char *s;
2883 XFetchName (display->display, TermWin.parent[0], &s); 3149 XFetchName (dpy, parent[0], &s);
2884 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3150 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3151 XFree (s);
3152 }
2885 break; 3153 break;
2886#endif
2887
2888 } 3154 }
2889} 3155}
2890#endif 3156#endif
2891 3157
2892/*----------------------------------------------------------------------*/ 3158/*----------------------------------------------------------------------*/
2893/* 3159/*
2894 * get input up until STRING TERMINATOR (or BEL) 3160 * get input up until STRING TERMINATOR (or BEL)
2895 * ends_how is terminator used. returned input must be free ()d 3161 * ends_how is terminator used. returned input must be free()'d
2896 */ 3162 */
2897unsigned char * 3163char *
2898rxvt_term::get_to_st (unsigned char *ends_how) 3164rxvt_term::get_to_st (unicode_t &ends_how)
2899{ 3165{
2900 int seen_esc = 0; /* seen escape? */ 3166 unicode_t ch;
3167 bool seen_esc = false;
2901 unsigned int n = 0; 3168 unsigned int n = 0;
2902 unsigned char *s; 3169 wchar_t string[STRING_MAX];
2903 unsigned char ch, string[STRING_MAX];
2904 3170
2905 for (; (ch = cmd_getc ());) 3171 while ((ch = cmd_getc ()) != NOCHAR)
2906 { 3172 {
2907 if (ch == C0_BEL 3173 if (seen_esc)
2908 || ch == CHAR_ST 3174 {
2909 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3175 if (ch == 0x5c) /* 7bit ST */
2910 break; 3176 break;
3177 else
3178 return NULL;
3179 }
2911 if (ch == C0_ESC) 3180 else if (ch == C0_ESC)
2912 { 3181 {
2913 seen_esc = 1; 3182 seen_esc = true;
2914 continue; 3183 continue;
2915 } 3184 }
3185 else if (ch == C0_BEL || ch == CHAR_ST)
3186 break;
2916 else if (ch == '\t') 3187 else if (ch == C0_SYN)
2917 ch = ' '; /* translate '\t' to space */ 3188 ch = cmd_get8 ();
2918 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3189 else if (ch < 0x20)
2919 return NULL; /* other control character - exit */ 3190 return NULL; /* other control character - exit */
2920 if (n < sizeof (string) - 1) 3191
3192 seen_esc = false;
3193
3194 if (n >= STRING_MAX - 1)
3195 // stop at some sane length
3196 return NULL;
3197
2921 string[n++] = ch; 3198 string[n++] = ch;
2922 seen_esc = 0;
2923 } 3199 }
3200
2924 string[n++] = '\0'; 3201 string[n++] = '\0';
2925 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3202
2926 return NULL;
2927 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3203 ends_how = (ch == 0x5c ? C0_ESC : ch);
2928 STRNCPY (s, string, n); 3204
2929 return s; 3205 return rxvt_wcstombs (string);
2930} 3206}
2931 3207
2932/*----------------------------------------------------------------------*/ 3208/*----------------------------------------------------------------------*/
2933/* 3209/*
2934 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3210 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2935 */ 3211 */
2936void 3212void
2937rxvt_term::process_dcs_seq () 3213rxvt_term::process_dcs_seq ()
2938{ 3214{
2939 unsigned char eh, *s; 3215 char *s;
3216 unicode_t eh;
3217
2940 /* 3218 /*
2941 * Not handled yet 3219 * Not handled yet
2942 */ 3220 */
2943 s = get_to_st (&eh); 3221 s = get_to_st (eh);
2944 if (s) 3222 if (s)
2945 free (s); 3223 free (s);
3224
2946 return; 3225 return;
2947} 3226}
2948 3227
2949/*----------------------------------------------------------------------*/ 3228/*----------------------------------------------------------------------*/
2950/* 3229/*
2951 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3230 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2952 */ 3231 */
2953void 3232void
2954rxvt_term::process_osc_seq () 3233rxvt_term::process_osc_seq ()
2955{ 3234{
2956 unsigned char ch, eh, *s; 3235 unicode_t ch, eh;
2957 int arg; 3236 int arg;
2958 3237
2959 ch = cmd_getc (); 3238 ch = cmd_getc ();
2960 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3239 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2961 arg = arg * 10 + (ch - '0'); 3240 arg = arg * 10 + (ch - '0');
2962 3241
2963 if (ch == ';') 3242 if (ch == ';')
2964 { 3243 {
2965 s = get_to_st (&eh); 3244 char *s = get_to_st (eh);
3245
2966 if (s) 3246 if (s)
2967 { 3247 {
2968 /*
2969 * rxvt_menubar_dispatch () violates the constness of the string,
2970 * so do it here
2971 */
2972 if (arg == XTerm_Menu)
2973#if 0 /* XXX: currently disabled due to security concerns */
2974 menubar_dispatch ((char *)s);
2975#else
2976 (void)0;
2977#endif
2978 else
2979 xterm_seq (arg, (char *)s, eh); 3248 process_xterm_seq (arg, s, eh);
2980 free (s); 3249 free (s);
2981 } 3250 }
2982 } 3251 }
2983} 3252}
3253
3254void
3255rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3256{
3257 if (str[0] == '?' && !str[1])
3258 {
3259 rgba c;
3260 pix_colors_focused[color].get (c);
3261
3262#if XFT
3263 if (c.a != rgba::MAX_CC)
3264 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3265 else
3266#endif
3267 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3268 }
3269 else
3270 set_window_color (color, str);
3271}
3272
2984/* 3273/*
2985 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3274 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2986 * 0 = change iconName/title
2987 * 1 = change iconName
2988 * 2 = change title
2989 * 4 = change color
2990 * 12 = change text color
2991 * 13 = change mouse foreground color
2992 * 17 = change highlight character colour
2993 * 18 = change bold character color
2994 * 19 = change underlined character color
2995 * 46 = change logfile (not implemented)
2996 * 50 = change font
2997 *
2998 * rxvt extensions:
2999 * 9 = change locale (NYI)
3000 * 10 = menu (may change in future)
3001 * 20 = bg pixmap
3002 * 39 = change default fg color
3003 * 49 = change default bg color
3004 * 55 = dump scrollback buffer and all of screen
3005 */ 3275 */
3006void 3276void
3007rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3277rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3008{ 3278{
3009 int changed = 0; 3279 int color;
3010 int color;
3011 char *buf, *name; 3280 char *buf, *name;
3281 bool query = str[0] == '?' && !str[1];
3282 int saveop = op;
3283
3284 dLocal (Display *, dpy);
3012 3285
3013 assert (str != NULL); 3286 assert (str != NULL);
3287
3288 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3289 return;
3290
3014 switch (op) 3291 switch (op)
3015 { 3292 {
3016 case XTerm_name: 3293 case XTerm_name:
3017 set_title (str); 3294 set_title (str);
3018 /* FALLTHROUGH */ 3295 /* FALLTHROUGH */
3019 case XTerm_iconName: 3296 case XTerm_iconName:
3020 set_iconName (str); 3297 set_icon_name (str);
3021 break; 3298 break;
3022 case XTerm_title: 3299 case XTerm_title:
3023 set_title (str); 3300 set_title (str);
3024 break; 3301 break;
3302 case XTerm_property:
3303 if (str[0] == '?')
3304 {
3305 Atom prop = display->atom (str + 1);
3306 Atom actual_type;
3307 int actual_format;
3308 unsigned long nitems;
3309 unsigned long bytes_after;
3310 unsigned char *value = 0;
3311 const char *str = "";
3312
3313 if (prop
3314 && XGetWindowProperty (dpy, parent[0],
3315 prop, 0, 1<<16, 0, AnyPropertyType,
3316 &actual_type, &actual_format,
3317 &nitems, &bytes_after, &value) == Success
3318 && actual_type != None
3319 && actual_format == 8)
3320 str = (const char *)(value);
3321
3322 tt_printf ("\033]%d;%s%c", op, str, resp);
3323
3324 XFree (value);
3325 }
3326 else
3327 {
3328 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3329
3330 if (eq)
3331 {
3332 *eq = 0;
3333 set_utf8_property (display->atom (str), eq + 1);
3334 }
3335 else
3336 XDeleteProperty (dpy, parent[0],
3337 display->atom (str));
3338 }
3339 break;
3340
3025 case XTerm_Color: 3341 case XTerm_Color:
3026 for (buf = (char *)str; buf && *buf;) 3342 for (buf = (char *)str; buf && *buf;)
3027 { 3343 {
3028 if ((name = STRCHR (buf, ';')) == NULL) 3344 if ((name = strchr (buf, ';')) == NULL)
3029 break; 3345 break;
3346
3030 *name++ = '\0'; 3347 *name++ = '\0';
3031 color = atoi (buf); 3348 color = atoi (buf) + minCOLOR;
3032 if (color < 0 || color >= TOTAL_COLORS) 3349
3350 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3033 break; 3351 break;
3352
3034 if ((buf = STRCHR (name, ';')) != NULL) 3353 if ((buf = strchr (name, ';')) != NULL)
3035 *buf++ = '\0'; 3354 *buf++ = '\0';
3036 set_window_color (color + minCOLOR, name); 3355
3356 process_color_seq (op, color, name, resp);
3037 } 3357 }
3358 break;
3359 case XTerm_Color00:
3360 process_color_seq (op, Color_fg, str, resp);
3361 break;
3362 case XTerm_Color01:
3363 process_color_seq (op, Color_bg, str, resp);
3038 break; 3364 break;
3039#ifndef NO_CURSORCOLOR 3365#ifndef NO_CURSORCOLOR
3040 case XTerm_Color_cursor: 3366 case XTerm_Color_cursor:
3041 set_window_color (Color_cursor, str); 3367 process_color_seq (op, Color_cursor, str, resp);
3042 break; 3368 break;
3043#endif 3369#endif
3044 case XTerm_Color_pointer: 3370 case XTerm_Color_pointer_fg:
3045 set_window_color (Color_pointer, str); 3371 process_color_seq (op, Color_pointer_fg, str, resp);
3372 break;
3373 case XTerm_Color_pointer_bg:
3374 process_color_seq (op, Color_pointer_bg, str, resp);
3046 break; 3375 break;
3047#ifndef NO_BOLD_UNDERLINE_REVERSE 3376#ifndef NO_BOLD_UNDERLINE_REVERSE
3048 case XTerm_Color_BD:
3049 set_window_color (Color_BD, str);
3050 break;
3051 case XTerm_Color_UL:
3052 set_window_color (Color_UL, str);
3053 break;
3054 case XTerm_Color_RV: 3377 case XTerm_Color_RV:
3055 set_window_color (Color_RV, str); 3378 process_color_seq (op, Color_RV, str, resp);
3056 break; 3379 break;
3380 case Rxvt_Color_BD:
3381 case URxvt_Color_BD:
3382 process_color_seq (op, Color_BD, str, resp);
3383 break;
3384 case Rxvt_Color_UL:
3385 case URxvt_Color_UL:
3386 process_color_seq (op, Color_UL, str, resp);
3387 break;
3388 case URxvt_Color_IT:
3389 process_color_seq (op, Color_IT, str, resp);
3390 break;
3057#endif 3391#endif
3058 3392#if ENABLE_TRANSPARENCY
3059 case XTerm_Menu: 3393 case URxvt_Color_tint:
3394 process_color_seq (op, Color_tint, str, resp);
3060 /* 3395 {
3061 * rxvt_menubar_dispatch () violates the constness of the string, 3396 bool changed = false;
3062 * so DON'T do it here 3397
3398 if (ISSET_PIXCOLOR (Color_tint))
3399 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3400 else
3401 changed = bgPixmap.unset_tint ();
3402
3403 if (changed)
3404 update_background ();
3063 */ 3405 }
3406
3064 break; 3407 break;
3408#endif
3409
3410#if BG_IMAGE_FROM_FILE
3065 case XTerm_Pixmap: 3411 case Rxvt_Pixmap:
3066 if (*str != ';') 3412 if (!strcmp (str, "?"))
3067 { 3413 {
3068#if XPM_BACKGROUND 3414 char str[256];
3069 scale_pixmap (""); /* reset to default scaling */ 3415
3070 set_bgPixmap (str); /* change pixmap */ 3416 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3071#endif 3417 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3072 scr_touch (true); 3418 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3419 process_xterm_seq (XTerm_title, str, CHAR_ST);
3073 } 3420 }
3074 while ((str = STRCHR (str, ';')) != NULL)
3075 {
3076 str++;
3077#if XPM_BACKGROUND
3078 changed += scale_pixmap (str);
3079#endif
3080
3081 }
3082 if (changed)
3083 {
3084#ifdef XPM_BACKGROUND
3085 resize_pixmap ();
3086#endif
3087 scr_touch (true);
3088 }
3089 break;
3090
3091 case XTerm_restoreFG:
3092 set_window_color (Color_fg, str);
3093 break;
3094 case XTerm_restoreBG:
3095 set_window_color (Color_bg, str);
3096 break;
3097 case XTerm_logfile:
3098 break;
3099 case XTerm_font:
3100 change_font (str);
3101 break;
3102 case XTerm_locale:
3103 if (str[0] == '?' && !str[1])
3104 tt_printf ("%-.250s\n", locale);
3105 else 3421 else
3106 { 3422 {
3423 int changed = 0;
3424
3425 if (*str != ';')
3426 {
3427 /* reset to default scaling :*/
3428 bgPixmap.unset_geometry ();
3429 if (bgPixmap.set_file (str)) /* change pixmap */
3430 changed++;
3431 str = strchr (str, ';');
3432 if (str == NULL)
3433 bgPixmap.set_defaultGeometry ();
3434 }
3435
3107 set_locale (str); 3436 while (str)
3108 im_cb (); 3437 {
3438 str++;
3439 if (bgPixmap.set_geometry (str))
3440 changed++;
3441 str = strchr (str, ';');
3442 }
3109 3443
3110 if (display->selection_owner == this) 3444 if (changed)
3111 display->set_selection_owner (0); 3445 update_background ();
3112 } 3446 }
3113 break; 3447 break;
3448#endif
3449
3450 case Rxvt_restoreFG:
3451 set_window_color (Color_fg, str);
3452 break;
3453 case Rxvt_restoreBG:
3454 set_window_color (Color_bg, str);
3455 break;
3456
3457 case XTerm_logfile:
3458 // TODO, when secure mode?
3459 break;
3460
3114#if 0 3461#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3462 case Rxvt_dumpscreen: /* no error notices */
3116 { 3463 {
3117 int fd; 3464 int fd;
3118 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3465 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3119 { 3466 {
3120 scr_dump (fd); 3467 scr_dump (fd);
3121 close (fd); 3468 close (fd);
3122 } 3469 }
3123 } 3470 }
3124 break; 3471 break;
3125#endif 3472#endif
3473 case XTerm_font:
3474 op = URxvt_font;
3475 case URxvt_font:
3476#if ENABLE_STYLES
3477 case URxvt_boldFont:
3478 case URxvt_italicFont:
3479 case URxvt_boldItalicFont:
3480#endif
3481 if (query)
3482 tt_printf ("\33]%d;%-.250s%c", saveop,
3483 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3484 ? fontset[op - URxvt_font]->fontdesc : "",
3485 resp);
3486 else
3487 {
3488 const char *&res = rs[Rs_font + (op - URxvt_font)];
3126 3489
3490 res = strdup (str);
3491 allocated.push_back ((void *)res);
3492 set_fonts ();
3493 }
3494 break;
3495
3496 case URxvt_version:
3497 if (query)
3498 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3499 op,
3500 rs[Rs_name], VERSION[0], VERSION[2],
3501 resp);
3502 break;
3503
3504#if !ENABLE_MINIMAL
3505 case URxvt_locale:
3506 if (query)
3507 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3508 else
3509 {
3510 set_locale (str);
3511 pty->set_utf8_mode (enc_utf8);
3512 init_xlocale ();
3513 }
3514 break;
3515
3516 case URxvt_view_up:
3517 case URxvt_view_down:
3518 {
3519 int lines = atoi (str);
3520
3521 if (lines)
3522 scr_page (op == URxvt_view_up ? UP : DN, lines);
3523 else
3524 scr_erase_savelines ();
3525 }
3526
3527 break;
3528#endif
3529
3530#if ENABLE_PERL
3531 case URxvt_perl:
3532 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3533 ; // no responses yet
3534 break;
3535#endif
3127 } 3536 }
3128} 3537}
3129/*----------------------------------------------------------------------*/ 3538/*----------------------------------------------------------------------*/
3130 3539
3131/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3540/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3139 * so no need for fancy checking 3548 * so no need for fancy checking
3140 */ 3549 */
3141int 3550int
3142rxvt_term::privcases (int mode, unsigned long bit) 3551rxvt_term::privcases (int mode, unsigned long bit)
3143{ 3552{
3144 int state; 3553 int state;
3145 3554
3146 if (mode == 's') 3555 if (mode == 's')
3147 { 3556 {
3148 SavedModes |= (PrivateModes & bit); 3557 SavedModes |= (priv_modes & bit);
3149 return -1; 3558 return -1;
3150 } 3559 }
3151 else 3560 else
3152 { 3561 {
3153 if (mode == 'r') 3562 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3563 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 3564 else
3156 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3565 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3157 PrivMode (state, bit); 3566 PrivMode (state, bit);
3158 } 3567 }
3568
3159 return state; 3569 return state;
3160} 3570}
3161 3571
3162/* we're not using priv _yet_ */ 3572/* we're not using priv _yet_ */
3163void 3573void
3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3574rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3165{ 3575{
3166 unsigned int i, j; 3576 unsigned int i, j;
3167 int state; 3577 int state;
3578
3168 static const struct 3579 static const struct
3169 { 3580 {
3170 const int argval; 3581 const int argval;
3171 const unsigned long bit; 3582 const unsigned long bit;
3172 }
3173 argtopriv[] = { 3583 } argtopriv[] = {
3174 { 1, PrivMode_aplCUR }, 3584 { 1, PrivMode_aplCUR },
3175 { 2, PrivMode_vt52 }, 3585 { 2, PrivMode_vt52 },
3176 { 3, PrivMode_132 }, 3586 { 3, PrivMode_132 },
3177 { 4, PrivMode_smoothScroll }, 3587 { 4, PrivMode_smoothScroll },
3178 { 5, PrivMode_rVideo }, 3588 { 5, PrivMode_rVideo },
3179 { 6, PrivMode_relOrigin }, 3589 { 6, PrivMode_relOrigin },
3180 { 7, PrivMode_Autowrap }, 3590 { 7, PrivMode_Autowrap },
3591 // 8, bi-directional support mode
3181 { 9, PrivMode_MouseX10 }, 3592 { 9, PrivMode_MouseX10 },
3182#ifdef menuBar_esc 3593 // 18, 19 printing-related
3183 { menuBar_esc, PrivMode_menuBar }, 3594 { 25, PrivMode_VisibleCursor },
3184#endif
3185#ifdef scrollBar_esc 3595#ifdef scrollBar_esc
3186 { scrollBar_esc, PrivMode_scrollBar }, 3596 { scrollBar_esc, PrivMode_scrollBar },
3187#endif 3597#endif
3188 { 25, PrivMode_VisibleCursor },
3189 { 35, PrivMode_ShiftKeys }, 3598 { 35, PrivMode_ShiftKeys }, // rxvt extension
3190 { 40, PrivMode_132OK }, 3599 { 40, PrivMode_132OK },
3600 // 41 xterm more fixes NYI
3601 // 45 margin bell NYI
3602 // 46 start logging
3191 { 47, PrivMode_Screen }, 3603 { 47, PrivMode_Screen },
3192 { 66, PrivMode_aplKP }, 3604 { 66, PrivMode_aplKP },
3193#ifndef NO_BACKSPACE_KEY 3605#ifndef NO_BACKSPACE_KEY
3194 { 67, PrivMode_BackSpace }, 3606 { 67, PrivMode_BackSpace },
3195#endif 3607#endif
3196 { 1000, PrivMode_MouseX11 }, 3608 { 1000, PrivMode_MouseX11 },
3609 { 1002, PrivMode_MouseBtnEvent },
3610 { 1003, PrivMode_MouseAnyEvent },
3197 { 1010, PrivMode_TtyOutputInh }, 3611 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3198 { 1011, PrivMode_Keypress }, 3612 { 1011, PrivMode_Keypress }, // rxvt extension
3613 // 1035 enable modifiers for alt, numlock NYI
3614 // 1036 send ESC for meta keys NYI
3615 // 1037 send DEL for keypad delete NYI
3199 { 1047, PrivMode_Screen }, 3616 { 1047, PrivMode_Screen },
3617 // 1048 save and restore cursor
3200 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3618 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3619 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3201 }; 3620 };
3202 3621
3203 if (nargs == 0) 3622 if (nargs == 0)
3204 return; 3623 return;
3205 3624
… …
3220 state = privcases (mode, argtopriv[j].bit); 3639 state = privcases (mode, argtopriv[j].bit);
3221 break; 3640 break;
3222 } 3641 }
3223 3642
3224 /* extra handling for values with state unkept */ 3643 /* extra handling for values with state unkept */
3225 if (state == -1)
3226 switch (arg[i]) 3644 switch (arg[i])
3227 { 3645 {
3646#if ENABLE_STYLES
3647 case 1021:
3648 set_option (Opt_intensityStyles, mode);
3649
3650 scr_touch (true);
3651 break;
3652#endif
3228 case 1048: /* alternative cursor save */ 3653 case 1048: /* alternative cursor save */
3654 case 1049:
3655 if (option (Opt_secondaryScreen))
3229 if (mode == 0) 3656 if (mode == 0)
3230 scr_cursor (RESTORE); 3657 scr_cursor (RESTORE);
3231 else if (mode == 1) 3658 else if (mode == 1)
3232 scr_cursor (SAVE); 3659 scr_cursor (SAVE);
3233 /* FALLTHROUGH */
3234 default:
3235 continue; /* for (;i;) */
3236 }
3237
3238 /* extra handling for values with valid 0 or 1 state */
3239 switch (arg[i])
3240 {
3241 /* case 1: - application cursor keys */
3242 case 2: /* VT52 mode */
3243 /* oddball mode. should be set regardless of set/reset
3244 * parameter. Return from VT52 mode with an ESC < from
3245 * within VT52 mode
3246 */
3247 PrivMode (1, PrivMode_vt52);
3248 break; 3660 break;
3661 }
3662
3663 if (state >= 0)
3664 /* extra handling for values with valid 0 or 1 state */
3665 switch (arg[i])
3666 {
3667 /* case 1: - application cursor keys */
3668 case 2: /* VT52 mode */
3669 /* oddball mode. should be set regardless of set/reset
3670 * parameter. Return from VT52 mode with an ESC < from
3671 * within VT52 mode
3672 */
3673 PrivMode (1, PrivMode_vt52);
3674 break;
3249 case 3: /* 80/132 */ 3675 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 3676 if (priv_modes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3677 set_widthheight (((state ? 132 : 80) * fwidth), height);
3252 (unsigned int)TermWin.height);
3253 break; 3678 break;
3254 case 4: /* smooth scrolling */ 3679 case 4: /* smooth scrolling */
3255 if (state)
3256 Options &= ~Opt_jumpScroll;
3257 else
3258 Options |= Opt_jumpScroll; 3680 set_option (Opt_jumpScroll, !state);
3259 break; 3681 break;
3260 case 5: /* reverse video */ 3682 case 5: /* reverse video */
3261 scr_rvideo_mode (state); 3683 scr_rvideo_mode (state);
3262 break; 3684 break;
3263 case 6: /* relative/absolute origins */ 3685 case 6: /* relative/absolute origins */
3264 scr_relative_origin (state); 3686 scr_relative_origin (state);
3265 break; 3687 break;
3266 case 7: /* autowrap */ 3688 case 7: /* autowrap */
3267 scr_autowrap (state); 3689 scr_autowrap (state);
3268 break; 3690 break;
3269 /* case 8: - auto repeat, can't do on a per window basis */ 3691 /* case 8: - auto repeat, can't do on a per window basis */
3270 case 9: /* X10 mouse reporting */ 3692 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
3272 PrivateModes &= ~ (PrivMode_MouseX11); 3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3273 break; 3695 break;
3274#ifdef menuBar_esc
3275 case menuBar_esc:
3276#ifdef MENUBAR
3277 map_menuBar (state);
3278#endif
3279 break;
3280#endif
3281#ifdef scrollBar_esc 3696#ifdef scrollBar_esc
3282 case scrollBar_esc: 3697 case scrollBar_esc:
3283 if (scrollbar_mapping (state)) 3698 if (scrollbar_mapping (state))
3284 { 3699 {
3285 resize_all_windows (0, 0, 0); 3700 resize_all_windows (0, 0, 0);
3286 scr_touch (true); 3701 scr_touch (true);
3287 } 3702 }
3288 break; 3703 break;
3289#endif 3704#endif
3290 case 25: /* visible/invisible cursor */ 3705 case 25: /* visible/invisible cursor */
3291 scr_cursor_visible (state); 3706 scr_cursor_visible (state);
3292 break; 3707 break;
3293 /* case 35: - shift keys */ 3708 /* case 35: - shift keys */
3294 /* case 40: - 80 <--> 132 mode */ 3709 /* case 40: - 80 <--> 132 mode */
3295 case 47: /* secondary screen */ 3710 case 47: /* secondary screen */
3296 scr_change_screen (state); 3711 scr_change_screen (state);
3297 break; 3712 break;
3298 /* case 66: - application key pad */ 3713 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 3714 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 3715 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
3302 PrivateModes &= ~ (PrivMode_MouseX10); 3717 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3303 break; 3718 break;
3304#if 0
3305 case 1001: 3719 case 1002:
3306 break; /* X11 mouse highlighting */ 3720 case 1003:
3307#endif 3721 if (state)
3722 {
3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3725 vt_emask_mouse = PointerMotionMask;
3726 }
3727 else
3728 vt_emask_mouse = NoEventMask;
3729 vt_select_input ();
3730 break;
3308 case 1010: /* scroll to bottom on TTY output inhibit */ 3731 case 1010: /* scroll to bottom on TTY output inhibit */
3309 if (state)
3310 Options &= ~Opt_scrollTtyOutput;
3311 else
3312 Options |= Opt_scrollTtyOutput; 3732 set_option (Opt_scrollTtyOutput, !state);
3313 break; 3733 break;
3314 case 1011: /* scroll to bottom on key press */ 3734 case 1011: /* scroll to bottom on key press */
3315 if (state)
3316 Options |= Opt_scrollTtyKeypress; 3735 set_option (Opt_scrollTtyKeypress, state);
3317 else
3318 Options &= ~Opt_scrollTtyKeypress;
3319 break; 3736 break;
3320 case 1047: /* secondary screen w/ clearing */ 3737 case 1047: /* secondary screen w/ clearing last */
3321 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3738 if (option (Opt_secondaryScreen))
3322 if (current_screen != PRIMARY) 3739 if (current_screen != PRIMARY)
3323 scr_erase_screen (2); 3740 scr_erase_screen (2);
3324 scr_change_screen (state); 3741 scr_change_screen (state);
3325 /* FALLTHROUGH */
3326 default:
3327 break; 3742 break;
3743 case 1049: /* secondary screen w/ clearing first */
3744 scr_change_screen (state);
3745 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY)
3747 scr_erase_screen (2);
3748 break;
3749 default:
3750 break;
3328 } 3751 }
3329 } 3752 }
3330} 3753}
3331/*}}} */ 3754/*}}} */
3332 3755
3333/*{{{ process sgr sequences */ 3756/*{{{ process sgr sequences */
3334void 3757void
3335rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3758rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3336{ 3759{
3337 unsigned int i; 3760 unsigned int i;
3338 short rendset; 3761 short rendset;
3339 int rendstyle; 3762 int rendstyle;
3340 3763
3341 if (nargs == 0) 3764 if (nargs == 0)
3342 { 3765 {
3343 scr_rendition (0, ~RS_None); 3766 scr_rendition (0, ~RS_None);
3344 return; 3767 return;
3345 } 3768 }
3769
3346 for (i = 0; i < nargs; i++) 3770 for (i = 0; i < nargs; i++)
3347 { 3771 {
3348 rendset = -1; 3772 rendset = -1;
3349 switch (arg[i]) 3773 switch (arg[i])
3350 { 3774 {
… …
3352 rendset = 0, rendstyle = ~RS_None; 3776 rendset = 0, rendstyle = ~RS_None;
3353 break; 3777 break;
3354 case 1: 3778 case 1:
3355 rendset = 1, rendstyle = RS_Bold; 3779 rendset = 1, rendstyle = RS_Bold;
3356 break; 3780 break;
3781 //case 2: // low intensity
3782 case 3:
3783 rendset = 1, rendstyle = RS_Italic;
3784 break;
3357 case 4: 3785 case 4:
3358 rendset = 1, rendstyle = RS_Uline; 3786 rendset = 1, rendstyle = RS_Uline;
3359 break; 3787 break;
3360 case 5: 3788 case 5: // slowly blinking
3789 case 6: // rapidly blinking
3361 rendset = 1, rendstyle = RS_Blink; 3790 rendset = 1, rendstyle = RS_Blink;
3362 break; 3791 break;
3792 //case 6: // scoansi light background
3363 case 7: 3793 case 7:
3364 rendset = 1, rendstyle = RS_RVid; 3794 rendset = 1, rendstyle = RS_RVid;
3365 break; 3795 break;
3366 case 22: 3796 case 8:
3797 // invisible. NYI
3798 break;
3799 //case 9: // crossed out
3800 //case 10: // scoansi acs off, primary font
3801 //case 11: // scoansi acs on, first alt font
3802 //case 12: // scoansi acs on, |0x80, second alt font
3803 //...
3804 //case 19: // ninth alt font
3805 //case 20: // gothic
3806 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3367 rendset = 0, rendstyle = RS_Bold; 3807 rendset = 0, rendstyle = RS_Bold;
3808 break;
3809 case 22: // normal intensity
3810 rendset = 0, rendstyle = RS_Bold;
3811 break;
3812 case 23: // disable italic
3813 rendset = 0, rendstyle = RS_Italic;
3368 break; 3814 break;
3369 case 24: 3815 case 24:
3370 rendset = 0, rendstyle = RS_Uline; 3816 rendset = 0, rendstyle = RS_Uline;
3371 break; 3817 break;
3372 case 25: 3818 case 25:
3373 rendset = 0, rendstyle = RS_Blink; 3819 rendset = 0, rendstyle = RS_Blink;
3374 break; 3820 break;
3821 case 26: // variable spacing (iso 8613)
3822 rendset = 0, rendstyle = RS_Blink;
3823 break;
3375 case 27: 3824 case 27:
3376 rendset = 0, rendstyle = RS_RVid; 3825 rendset = 0, rendstyle = RS_RVid;
3377 break; 3826 break;
3827 //case 28: // visible. NYI
3828 //case 29: // not crossed-out
3378 } 3829 }
3830
3379 if (rendset != -1) 3831 if (rendset != -1)
3380 { 3832 {
3381 scr_rendition (rendset, rendstyle); 3833 scr_rendition (rendset, rendstyle);
3382 continue; /* for (;i;) */ 3834 continue; /* for (;i;) */
3383 } 3835 }
… …
3390 case 33: 3842 case 33:
3391 case 34: 3843 case 34:
3392 case 35: 3844 case 35:
3393 case 36: 3845 case 36:
3394 case 37: 3846 case 37:
3395 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3847 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3396 Color_fg);
3397 break; 3848 break;
3398#ifdef TTY_256COLOR 3849 case 38: // set fg color, ISO 8613-6
3399 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 3850 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 3851 {
3402 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3852 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3403 Color_fg);
3404 i += 2; 3853 i += 2;
3405 } 3854 }
3406 break; 3855 break;
3407#endif
3408 case 39: /* default fg */ 3856 case 39: /* default fg */
3409 scr_color (Color_fg, Color_fg); 3857 scr_color (Color_fg, Color_fg);
3410 break; 3858 break;
3411 3859
3412 case 40: 3860 case 40:
… …
3415 case 43: 3863 case 43:
3416 case 44: 3864 case 44:
3417 case 45: 3865 case 45:
3418 case 46: 3866 case 46:
3419 case 47: 3867 case 47:
3420 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3868 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3421 Color_bg);
3422 break; 3869 break;
3423#ifdef TTY_256COLOR 3870 case 48: // set bg color, ISO 8613-6
3424 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 3871 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 3872 {
3427 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3873 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3428 Color_bg);
3429 i += 2; 3874 i += 2;
3430 } 3875 }
3431 break; 3876 break;
3432#endif
3433 case 49: /* default bg */ 3877 case 49: /* default bg */
3434 scr_color (Color_bg, Color_bg); 3878 scr_color (Color_bg, Color_bg);
3435 break; 3879 break;
3436 3880
3437#ifndef NO_BRIGHTCOLOR 3881 //case 50: // not variable spacing
3882
3883#if !ENABLE_MINIMAL
3438 case 90: 3884 case 90:
3439 case 91: /* set bright fg color */ 3885 case 91: /* set bright fg color */
3440 case 92: 3886 case 92:
3441 case 93: 3887 case 93:
3442 case 94: 3888 case 94:
3443 case 95: 3889 case 95:
3444 case 96: 3890 case 96:
3445 case 97: 3891 case 97:
3446 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3892 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3447 Color_fg);
3448 break; 3893 break;
3449 case 100: 3894 case 100:
3450 case 101: /* set bright bg color */ 3895 case 101: /* set bright bg color */
3451 case 102: 3896 case 102:
3452 case 103: 3897 case 103:
3453 case 104: 3898 case 104:
3454 case 105: 3899 case 105:
3455 case 106: 3900 case 106:
3456 case 107: 3901 case 107:
3457 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3902 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3458 Color_bg);
3459 break; 3903 break;
3460#endif 3904#endif
3461
3462 } 3905 }
3463 } 3906 }
3464} 3907}
3465/*}}} */ 3908/*}}} */
3466 3909
3467/*{{{ process Rob Nation's own graphics mode sequences */ 3910/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3468void 3911void
3469rxvt_term::process_graphics () 3912rxvt_term::process_graphics ()
3470{ 3913{
3471 unsigned char ch, cmd = cmd_getc (); 3914 unicode_t ch, cmd = cmd_getc ();
3472 3915
3473 if (cmd == 'Q') 3916 if (cmd == 'Q')
3917 {
3474 { /* query graphics */ 3918 /* query graphics */
3475 tt_printf ("\033G0\n"); /* no graphics */ 3919 tt_printf ("\033G0\012"); /* no graphics */
3476 return; 3920 return;
3477 } 3921 }
3478 /* swallow other graphics sequences until terminating ':' */ 3922 /* swallow other graphics sequences until terminating ':' */
3479 do 3923 do
3480 ch = cmd_getc (); 3924 ch = cmd_getc ();
… …
3490 */ 3934 */
3491void 3935void
3492rxvt_term::tt_printf (const char *fmt,...) 3936rxvt_term::tt_printf (const char *fmt,...)
3493{ 3937{
3494 va_list arg_ptr; 3938 va_list arg_ptr;
3495 unsigned char buf[256]; 3939 char buf[256];
3496 3940
3497 va_start (arg_ptr, fmt); 3941 va_start (arg_ptr, fmt);
3498 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3499 va_end (arg_ptr); 3943 va_end (arg_ptr);
3500 tt_write (buf, STRLEN (buf)); 3944 tt_write (buf, strlen (buf));
3501} 3945}
3502 3946
3503/* ---------------------------------------------------------------------- */ 3947/* ---------------------------------------------------------------------- */
3504/* Write data to the pty as typed by the user, pasted with the mouse, 3948/* Write data to the pty as typed by the user, pasted with the mouse,
3505 * or generated by us in response to a query ESC sequence. 3949 * or generated by us in response to a query ESC sequence.
3506 */ 3950 */
3951const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3952
3507void 3953void
3508rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3954rxvt_term::tt_write (const char *data, unsigned int len)
3509{ 3955{
3510 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3956 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3957 return;
3511 3958
3512 if (len) 3959 if (pty->pty < 0)
3960 return;
3961
3962 if (v_buflen == 0)
3963 {
3964 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3965
3966 if ((unsigned int)written == len)
3967 return;
3968
3969 data += written;
3970 len -= written;
3513 { 3971 }
3972
3973 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3974
3975 memcpy (v_buffer + v_buflen, data, len);
3976 v_buflen += len;
3977
3978 pty_ev.set (ev::READ | ev::WRITE);
3979}
3980
3981void rxvt_term::pty_write ()
3982{
3983 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3984
3985 if (written > 0)
3986 {
3987 v_buflen -= written;
3988
3514 if (v_buflen == 0) 3989 if (v_buflen == 0)
3515 { 3990 {
3516 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3517
3518 if ((unsigned int)written == len)
3519 return;
3520
3521 data += written;
3522 len -= written;
3523 }
3524
3525
3526 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3527
3528 memcpy (v_buffer + v_buflen, data, len);
3529 v_buflen += len;
3530 }
3531
3532 for (;;)
3533 {
3534 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3535
3536 if (written > 0)
3537 {
3538 v_buflen -= written;
3539
3540 if (v_buflen == 0)
3541 {
3542 free (v_buffer); 3991 free (v_buffer);
3543 v_buffer = 0; 3992 v_buffer = 0;
3544 v_buflen = 0;
3545 3993
3546 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::READ);
3547 return;
3548 }
3549
3550 memmove (v_buffer, v_buffer + written, v_buflen);
3551 }
3552 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3553 // original code just ignores this...
3554 destroy ();
3555 else
3556 {
3557 pty_ev.set (EVENT_READ | EVENT_WRITE);
3558 return; 3995 return;
3559 } 3996 }
3997
3998 memmove (v_buffer, v_buffer + written, v_buflen);
3560 } 3999 }
4000 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4001 pty_ev.set (ev::READ);
3561} 4002}
3562 4003
3563/*----------------------- end-of-file (C source) -----------------------*/ 4004/*----------------------- end-of-file (C source) -----------------------*/
3564 4005

Diff Legend

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