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

Diff Legend

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