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.59 by pcg, Wed Feb 25 15:39:48 2004 UTC vs.
Revision 1.400 by ayin, Mon Jan 28 12:54:47 2008 UTC

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

Diff Legend

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