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

Diff Legend

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