ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.55 by pcg, Sun Feb 22 20:08:18 2004 UTC vs.
Revision 1.387 by ayin, Sun Dec 30 23:45:42 2007 UTC

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

Diff Legend

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