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

Diff Legend

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