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

Diff Legend

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