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

Diff Legend

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