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.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC

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

Diff Legend

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