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

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

Diff Legend

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