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.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.398 by root, Sat Jan 26 12:12:37 2008 UTC

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

Diff Legend

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