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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.53 by pcg, Sun Feb 22 12:34:53 2004 UTC vs.
Revision 1.298 by root, Tue Jan 31 18:36:35 2006 UTC

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

Diff Legend

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