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

Diff Legend

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