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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.59 by pcg, Wed Feb 25 15:39:48 2004 UTC vs.
Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC

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

Diff Legend

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