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

Diff Legend

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