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.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.407 by ayin, Fri Feb 15 10:56:29 2008 UTC

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

Diff Legend

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