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.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.195 by root, Thu Feb 17 12:06:21 2005 UTC

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

Diff Legend

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