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

Diff Legend

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