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.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.193 by root, Sun Feb 13 08:56:27 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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{
… …
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 {
352#ifdef KEYSYM_RESOURCE
353 if (keyboard->dispatch (this, keysym, ev.state))
354 return;
355#endif
356
145 if (TermWin.saveLines) 357 if (TermWin.saveLines)
146 { 358 {
147#ifdef UNSHIFTED_SCROLLKEYS 359#ifdef UNSHIFTED_SCROLLKEYS
148 if (!ctrl && !meta) 360 if (!ctrl && !meta)
149 {
150#else 361#else
151 if (IS_SCROLL_MOD) 362 if (IS_SCROLL_MOD)
363#endif
152 { 364 {
153#endif
154 int lnsppg; 365 int lnsppg;
155 366
156#ifdef PAGING_CONTEXT_LINES 367#ifdef PAGING_CONTEXT_LINES
157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
158#else 369#else
… …
207 if (keysym >= XK_F1 && keysym <= XK_F10) 418 if (keysym >= XK_F1 && keysym <= XK_F10)
208 { 419 {
209 keysym += (XK_F11 - XK_F1); 420 keysym += (XK_F11 - XK_F1);
210 shft = 0; /* turn off Shift */ 421 shft = 0; /* turn off Shift */
211 } 422 }
212 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 423 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
213 { 424 {
214 switch (keysym) 425 switch (keysym)
215 { 426 {
216 /* normal XTerm key bindings */ 427 /* normal XTerm key bindings */
217 case XK_Insert: /* Shift+Insert = paste mouse selection */ 428 case XK_Insert: /* Shift+Insert = paste mouse selection */
218 selection_request (ev.time, 0, 0); 429 selection_request (ev.time, 0, 0);
219 return; 430 return;
431#if TODO
220 /* rxvt extras */ 432 /* rxvt extras */
221 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 433 case XK_KP_Add: /* Shift+KP_Add = bigger font */
222 change_font (FONT_UP); 434 change_font (FONT_UP);
223 return; 435 return;
224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 436 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
225 change_font (FONT_DN); 437 change_font (FONT_DN);
226 return; 438 return;
439#endif
227 } 440 }
228 } 441 }
229 } 442 }
230#ifdef PRINTPIPE 443
231 if (keysym == XK_Print) 444#if ENABLE_FRILLS || ISO_14755
232 { 445 // ISO 14755 support
233 scr_printscreen (ctrl | shft); 446 if (shft && ctrl)
234 return;
235 } 447 {
236#endif 448 int hv;
237 449
238 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 450 if (iso14755buf & ISO_14755_51
239 { 451 && (keysym == XK_space || keysym == XK_KP_Space
240#ifdef KEYSYM_RESOURCE 452 || keysym == XK_Return || keysym == XK_KP_Enter))
241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
242 { 453 {
243 unsigned int l; 454 commit_iso14755 ();
244 const unsigned char *kbuf0; 455 iso14755buf = ISO_14755_51;
245 456# if ISO_14755
246 kbuf0 = (Keysym_map[keysym & 0xFF]); 457 iso14755_51 (0);
247 l = (unsigned int)*kbuf0++;
248
249 /* escape prefix */
250 if (meta
251# ifdef META8_OPTION
252 && meta_char == C0_ESC
253# endif 458# endif
254 ) 459 return;
255 {
256 const unsigned char ch = C0_ESC;
257 tt_write (&ch, 1);
258 } 460 }
259 461 else if ((hv = hex_keyval (ev)) >= 0)
260 tt_write (kbuf0, l); 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
261 return; 468 return;
262 } 469 }
263 else 470 else
471 {
472# if ENABLE_OVERLAY
473 scr_overlay_off ();
264#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 {
265 { 500 {
266 newlen = 1; 501 newlen = 1;
267 switch (keysym) 502 switch (keysym)
268 { 503 {
269#ifndef NO_BACKSPACE_KEY 504#ifndef NO_BACKSPACE_KEY
270 case XK_BackSpace: 505 case XK_BackSpace:
271 if (PrivateModes & PrivMode_HaveBackSpace) 506 if (priv_modes & PrivMode_HaveBackSpace)
272 { 507 {
273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 508 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
274 ^ !!ctrl) ? '\b' : '\177'; 509 ^ !!ctrl) ? '\b' : '\177';
275 kbuf[1] = '\0'; 510 kbuf[1] = '\0';
276 } 511 }
277 else 512 else
278 STRCPY (kbuf, key_backspace); 513 strcpy (kbuf, key_backspace);
279 break; 514 break;
280#endif 515#endif
281#ifndef NO_DELETE_KEY 516#ifndef NO_DELETE_KEY
282 case XK_Delete: 517 case XK_Delete:
283 STRCPY (kbuf, key_delete); 518 strcpy (kbuf, key_delete);
284 break; 519 break;
285#endif 520#endif
286 case XK_Tab: 521 case XK_Tab:
287 if (shft) 522 if (shft)
288 STRCPY (kbuf, "\033[Z"); 523 strcpy (kbuf, "\033[Z");
289 else 524 else
290 { 525 {
291#ifdef CTRL_TAB_MAKES_META 526#ifdef CTRL_TAB_MAKES_META
292 if (ctrl) 527 if (ctrl)
293 meta = 1; 528 meta = 1;
… …
299 newlen = 0; 534 newlen = 0;
300 } 535 }
301 break; 536 break;
302 537
303#ifdef XK_KP_Left 538#ifdef XK_KP_Left
304 case XK_KP_Up: /* \033Ox or standard */ 539 case XK_KP_Up: /* \033Ox or standard */
305 case XK_KP_Down: /* \033Or or standard */ 540 case XK_KP_Down: /* \033Or or standard */
306 case XK_KP_Right: /* \033Ov or standard */ 541 case XK_KP_Right: /* \033Ov or standard */
307 case XK_KP_Left: /* \033Ot or standard */ 542 case XK_KP_Left: /* \033Ot or standard */
308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 543 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
309 { 544 {
310 STRCPY (kbuf, "\033OZ"); 545 strcpy (kbuf, "\033OZ");
311 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 546 kbuf[2] = "txvr"[keysym - XK_KP_Left];
312 break; 547 break;
313 } 548 }
314 else 549 else
315 /* translate to std. cursor key */ 550 /* translate to std. cursor key */
… …
318#endif 553#endif
319 case XK_Up: /* "\033[A" */ 554 case XK_Up: /* "\033[A" */
320 case XK_Down: /* "\033[B" */ 555 case XK_Down: /* "\033[B" */
321 case XK_Right: /* "\033[C" */ 556 case XK_Right: /* "\033[C" */
322 case XK_Left: /* "\033[D" */ 557 case XK_Left: /* "\033[D" */
323 STRCPY (kbuf, "\033[Z"); 558 strcpy (kbuf, "\033[Z");
324 kbuf[2] = "DACB"[keysym - XK_Left]; 559 kbuf[2] = "DACB"[keysym - XK_Left];
325 /* do Shift first */ 560 /* do Shift first */
326 if (shft) 561 if (shft)
327 kbuf[2] = "dacb"[keysym - XK_Left]; 562 kbuf[2] = "dacb"[keysym - XK_Left];
328 else if (ctrl) 563 else if (ctrl)
329 { 564 {
330 kbuf[1] = 'O'; 565 kbuf[1] = 'O';
331 kbuf[2] = "dacb"[keysym - XK_Left]; 566 kbuf[2] = "dacb"[keysym - XK_Left];
332 } 567 }
333 else if (PrivateModes & PrivMode_aplCUR) 568 else if (priv_modes & PrivMode_aplCUR)
334 kbuf[1] = 'O'; 569 kbuf[1] = 'O';
335 break; 570 break;
336 571
337#ifndef UNSHIFTED_SCROLLKEYS 572#ifndef UNSHIFTED_SCROLLKEYS
338# ifdef XK_KP_Prior 573# ifdef XK_KP_Prior
339 case XK_KP_Prior: 574 case XK_KP_Prior:
340 /* allow shift to override */ 575 /* allow shift to override */
341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 576 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
342 { 577 {
343 STRCPY (kbuf, "\033Oy"); 578 strcpy (kbuf, "\033Oy");
344 break; 579 break;
345 } 580 }
346 /* FALLTHROUGH */ 581 /* FALLTHROUGH */
347# endif 582# endif
348 case XK_Prior: 583 case XK_Prior:
349 STRCPY (kbuf, "\033[5~"); 584 strcpy (kbuf, "\033[5~");
350 break; 585 break;
351# ifdef XK_KP_Next 586# ifdef XK_KP_Next
352 case XK_KP_Next: 587 case XK_KP_Next:
353 /* allow shift to override */ 588 /* allow shift to override */
354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
355 { 590 {
356 STRCPY (kbuf, "\033Os"); 591 strcpy (kbuf, "\033Os");
357 break; 592 break;
358 } 593 }
359 /* FALLTHROUGH */ 594 /* FALLTHROUGH */
360# endif 595# endif
361 case XK_Next: 596 case XK_Next:
362 STRCPY (kbuf, "\033[6~"); 597 strcpy (kbuf, "\033[6~");
363 break; 598 break;
364#endif 599#endif
365 case XK_KP_Enter: 600 case XK_KP_Enter:
366 /* allow shift to override */ 601 /* allow shift to override */
367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 602 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
368 { 603 {
369 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';
370 } 616 }
371 else 617 else
372 { 618 {
373 kbuf[0] = '\r'; 619 kbuf[0] = '\015';
374 kbuf[1] = '\0'; 620 kbuf[1] = '\0';
375 } 621 }
376 break; 622 break;
377 623
378#ifdef XK_KP_Begin 624#ifdef XK_KP_Begin
379 case XK_KP_Begin: 625 case XK_KP_Begin:
380 STRCPY (kbuf, "\033Ou"); 626 strcpy (kbuf, "\033Ou");
381 break; 627 break;
382 628
383 case XK_KP_Insert: 629 case XK_KP_Insert:
384 STRCPY (kbuf, "\033Op"); 630 strcpy (kbuf, "\033Op");
385 break; 631 break;
386 632
387 case XK_KP_Delete: 633 case XK_KP_Delete:
388 STRCPY (kbuf, "\033On"); 634 strcpy (kbuf, "\033On");
389 break; 635 break;
390#endif 636#endif
391 case XK_KP_F1: /* "\033OP" */ 637 case XK_KP_F1: /* "\033OP" */
392 case XK_KP_F2: /* "\033OQ" */ 638 case XK_KP_F2: /* "\033OQ" */
393 case XK_KP_F3: /* "\033OR" */ 639 case XK_KP_F3: /* "\033OR" */
394 case XK_KP_F4: /* "\033OS" */ 640 case XK_KP_F4: /* "\033OS" */
395 STRCPY (kbuf, "\033OP"); 641 strcpy (kbuf, "\033OP");
396 kbuf[2] += (keysym - XK_KP_F1); 642 kbuf[2] += (keysym - XK_KP_F1);
397 break; 643 break;
398 644
399 case XK_KP_Multiply: /* "\033Oj" : "*" */ 645 case XK_KP_Multiply: /* "\033Oj" : "*" */
400 case XK_KP_Add: /* "\033Ok" : "+" */ 646 case XK_KP_Add: /* "\033Ok" : "+" */
… …
411 case XK_KP_6: /* "\033Ov" : "6" */ 657 case XK_KP_6: /* "\033Ov" : "6" */
412 case XK_KP_7: /* "\033Ow" : "7" */ 658 case XK_KP_7: /* "\033Ow" : "7" */
413 case XK_KP_8: /* "\033Ox" : "8" */ 659 case XK_KP_8: /* "\033Ox" : "8" */
414 case XK_KP_9: /* "\033Oy" : "9" */ 660 case XK_KP_9: /* "\033Oy" : "9" */
415 /* allow shift to override */ 661 /* allow shift to override */
416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 662 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
417 { 663 {
418 STRCPY (kbuf, "\033Oj"); 664 strcpy (kbuf, "\033Oj");
419 kbuf[2] += (keysym - XK_KP_Multiply); 665 kbuf[2] += (keysym - XK_KP_Multiply);
420 } 666 }
421 else 667 else
422 { 668 {
423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 669 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
424 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
425 } 671 }
426 break; 672 break;
427 673
428 case XK_Find: 674 case XK_Find:
429 STRCPY (kbuf, "\033[1~"); 675 strcpy (kbuf, "\033[1~");
430 break; 676 break;
431 case XK_Insert: 677 case XK_Insert:
432 STRCPY (kbuf, "\033[2~"); 678 strcpy (kbuf, "\033[2~");
433 break; 679 break;
434#ifdef DXK_Remove /* support for DEC remove like key */ 680#ifdef DXK_Remove /* support for DEC remove like key */
435 case DXK_Remove: 681 case DXK_Remove:
436 /* FALLTHROUGH */ 682 /* FALLTHROUGH */
437#endif 683#endif
438 case XK_Execute: 684 case XK_Execute:
439 STRCPY (kbuf, "\033[3~"); 685 strcpy (kbuf, "\033[3~");
440 break; 686 break;
441 case XK_Select: 687 case XK_Select:
442 STRCPY (kbuf, "\033[4~"); 688 strcpy (kbuf, "\033[4~");
443 break; 689 break;
444#ifdef XK_KP_End 690#ifdef XK_KP_End
445 case XK_KP_End: 691 case XK_KP_End:
446 /* allow shift to override */ 692 /* allow shift to override */
447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 693 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
448 { 694 {
449 STRCPY (kbuf, "\033Oq"); 695 strcpy (kbuf, "\033Oq");
450 break; 696 break;
451 } 697 }
452 /* FALLTHROUGH */ 698 /* FALLTHROUGH */
453#endif 699#endif
454 case XK_End: 700 case XK_End:
455 STRCPY (kbuf, KS_END); 701 strcpy (kbuf, KS_END);
456 break; 702 break;
457#ifdef XK_KP_Home 703#ifdef XK_KP_Home
458 case XK_KP_Home: 704 case XK_KP_Home:
459 /* allow shift to override */ 705 /* allow shift to override */
460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
461 { 707 {
462 STRCPY (kbuf, "\033Ow"); 708 strcpy (kbuf, "\033Ow");
463 break; 709 break;
464 } 710 }
465 /* FALLTHROUGH */ 711 /* FALLTHROUGH */
466#endif 712#endif
467 case XK_Home: 713 case XK_Home:
468 STRCPY (kbuf, KS_HOME); 714 strcpy (kbuf, KS_HOME);
469 break; 715 break;
470 716
471#define FKEY(n, fkey) \ 717#define FKEY(n, fkey) \
472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 718 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
473 719
… …
525#undef FKEY 771#undef FKEY
526 default: 772 default:
527 newlen = 0; 773 newlen = 0;
528 break; 774 break;
529 } 775 }
776
530 if (newlen) 777 if (newlen)
531 len = STRLEN (kbuf); 778 len = strlen (kbuf);
532 } 779 }
533 780
534 /* 781 /*
535 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
536 */ 783 */
… …
543 else if (ctrl && keysym == XK_minus) 790 else if (ctrl && keysym == XK_minus)
544 { 791 {
545 len = 1; 792 len = 1;
546 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
547 } 794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
548 else 800 else
549 { 801 {
550#ifdef META8_OPTION 802#ifdef META8_OPTION
551 /* set 8-bit on */ 803 /* set 8-bit on */
552 if (meta && (meta_char == 0x80)) 804 if (meta && (meta_char == 0x80))
… …
564 } 816 }
565 817
566 if (len <= 0) 818 if (len <= 0)
567 return; /* not mapped */ 819 return; /* not mapped */
568 820
569 if (Options & Opt_scrollTtyKeypress) 821 if (options & Opt_scrollTtyKeypress)
570 if (TermWin.view_start) 822 if (TermWin.view_start)
571 { 823 {
572 TermWin.view_start = 0; 824 TermWin.view_start = 0;
573 want_refresh = 1; 825 want_refresh = 1;
574 } 826 }
… …
610#endif /* DEBUG_CMD */ 862#endif /* DEBUG_CMD */
611 tt_write (kbuf, (unsigned int)len); 863 tt_write (kbuf, (unsigned int)len);
612} 864}
613/*}}} */ 865/*}}} */
614 866
615#if (MENUBAR_MAX) 867#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 868/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
617/* attempt to `write' count to the input buffer */ 869/* attempt to `write' count to the input buffer */
618unsigned int 870unsigned int
619rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 871rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
620{ 872{
621 unsigned int n, s; 873 unsigned int n, s;
622 874
623 n = cmdbuf_ptr - cmdbuf_base; 875 n = cmdbuf_ptr - cmdbuf_base;
624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 876 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
625 877
626 if (n > 0 && s < count) 878 if (n > 0 && s < count)
627 { 879 {
628 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 880 memmove (cmdbuf_base, cmdbuf_ptr,
629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 881 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
630 cmdbuf_ptr = cmdbuf_base; 882 cmdbuf_ptr = cmdbuf_base;
631 cmdbuf_endp -= n; 883 cmdbuf_endp -= n;
632 s += n; 884 s += n;
633 } 885 }
634 886
635 if (count > s) 887 if (count > s)
636 { 888 {
637 rxvt_print_error ("data loss: cmd_write too large"); 889 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
638 count = s; 890 count = s;
639 } 891 }
640 892
641 for (; count--;) 893 for (; count--;)
642 *cmdbuf_endp++ = *str++; 894 *cmdbuf_endp++ = *str++;
643 895
644 cmd_parse (); 896 cmd_parse ();
645 897
646 return 0; 898 return 0;
647} 899}
648#endif /* MENUBAR_MAX */ 900#endif
649 901
650void 902void
651rxvt_term::flush () 903rxvt_term::flush ()
652{ 904{
905 flush_ev.stop ();
906
653#ifdef TRANSPARENT 907#ifdef TRANSPARENT
654 if (want_full_refresh) 908 if (want_full_refresh)
655 { 909 {
656 want_full_refresh = 0; 910 want_full_refresh = 0;
657 scr_clear (); 911 scr_clear ();
658 scr_touch (false); 912 scr_touch (false);
659 want_refresh = 1;
660 } 913 }
661#endif 914#endif
662 915
663 if (want_refresh) 916 if (want_refresh)
664 { 917 {
665 scr_refresh (refresh_type); 918 scr_refresh (refresh_type);
666 scrollbar_show (1); 919 scrollbar_show (1);
667#ifdef USE_XIM 920#ifdef USE_XIM
668 IMSendSpot (); 921 IMSendSpot ();
669#endif 922#endif
670
671 } 923 }
672 924
673 display->flush (); 925 display->flush ();
674} 926}
675 927
… …
677rxvt_term::check_cb (check_watcher &w) 929rxvt_term::check_cb (check_watcher &w)
678{ 930{
679 SET_R (this); 931 SET_R (this);
680 SET_LOCALE (locale); 932 SET_LOCALE (locale);
681 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;
682 flush (); 948 flush ();
683} 949}
684 950
685#ifdef CURSOR_BLINK 951#ifdef CURSOR_BLINK
686void 952void
… …
704 w.start (w.at + TEXT_BLINK_INTERVAL); 970 w.start (w.at + TEXT_BLINK_INTERVAL);
705 } 971 }
706} 972}
707#endif 973#endif
708 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
709bool 1022bool
710rxvt_term::pty_fill () 1023rxvt_term::pty_fill ()
711{ 1024{
712 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 }
713 1032
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 1033 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 1034 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 1035 cmdbuf_endp = cmdbuf_ptr + n;
717 1036
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
719 1038
720 if (n > 0) 1039 if (n > 0)
721 { 1040 {
722 cmdbuf_endp += n; 1041 cmdbuf_endp += n;
723 return true; 1042 return true;
… …
732rxvt_term::pty_cb (io_watcher &w, short revents) 1051rxvt_term::pty_cb (io_watcher &w, short revents)
733{ 1052{
734 SET_R (this); 1053 SET_R (this);
735 SET_LOCALE (locale); 1054 SET_LOCALE (locale);
736 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
737 if (revents & EVENT_WRITE) 1062 if (revents & EVENT_WRITE)
738 tt_write (0, 0); 1063 pty_write ();
739 else if (revents & EVENT_READ)
740 {
741 bool flag = true;
742
743 // loop, but don't allow a single term to monopolize us
744 // the number of loops is fully arbitrary, and thus wrong
745 while (flag && pty_fill ())
746 {
747 if (!seen_input)
748 {
749 seen_input = 1;
750 /* once we know the shell is running, send the screen size. Again! */
751 tt_winch ();
752 }
753
754 if (cmd_parse ())
755 break;
756 }
757 }
758} 1064}
759 1065
760bool 1066void
761rxvt_term::cmd_parse () 1067rxvt_term::pointer_unblank ()
762{ 1068{
763 bool flag = false; 1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
764 uint32_t ch = NOCHAR; 1070 recolour_cursor ();
765 1071
766 for (;;) 1072#ifdef POINTER_BLANK
767 { 1073 hidden_pointer = 0;
768 if (ch == NOCHAR)
769 ch = next_char ();
770 1074
771 if (ch == NOCHAR) // TODO: improve 1075 if (options & Opt_pointerBlank)
772 break; 1076 pointer_ev.start (NOW + pointerBlankDelay);
773 1077#endif
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 uint32_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 uint32_t *str = buf;
781
782 *str++ = ch;
783
784 for (;;)
785 {
786 ch = next_char ();
787
788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
789 break;
790 else
791 {
792 *str++ = ch;
793
794 if (ch == '\n')
795 {
796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
801 {
802 refreshnow = true;
803 flag = false;
804 ch = NOCHAR;
805 break;
806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
814 }
815 }
816
817 if (str >= buf + BUFSIZ)
818 {
819 ch = NOCHAR;
820 break;
821 }
822 }
823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
861 }
862
863 return flag;
864}
865
866// read the next character, currently handles UTF-8
867// will probably handle all sorts of other stuff in the future
868uint32_t
869rxvt_term::next_char ()
870{
871 while (cmdbuf_ptr < cmdbuf_endp)
872 {
873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
876 return *cmdbuf_ptr++;
877
878 wchar_t wc;
879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
880
881 if (len == (size_t)-2)
882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
887
888 if (len == (size_t)-1)
889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
890
891 // assume wchar == unicode
892 cmdbuf_ptr += len;
893 return wc;
894 }
895
896 return NOCHAR;
897}
898
899/* rxvt_cmd_getc () - Return next input character */
900/*
901 * Return the next input character after first passing any keyboard input
902 * to the command.
903 */
904uint32_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 uint32_t c = next_char ();
910 if (c != NOCHAR)
911 return c;
912
913 // incomplete sequences should occur rarely, still, a better solution
914 // would be preferred. either setjmp/longjmp or better design.
915 fcntl (cmd_fd, F_SETFL, 0);
916 pty_fill ();
917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
918 }
919} 1078}
920 1079
921#ifdef POINTER_BLANK 1080#ifdef POINTER_BLANK
922void 1081void
923rxvt_term::pointer_unblank ()
924{
925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
926 recolour_cursor ();
927
928 hidden_pointer = 0;
929
930 if (Options & Opt_pointerBlank)
931 pointer_ev.start (NOW + pointerBlankDelay);
932}
933
934void
935rxvt_term::pointer_blank () 1082rxvt_term::pointer_blank ()
936{ 1083{
937 if (! (Options & Opt_pointerBlank)) 1084 if (! (options & Opt_pointerBlank))
938 return; 1085 return;
939 1086
940 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
941 XFlush (display->display); 1088 XFlush (display->display);
942 1089
943 hidden_pointer = 1; 1090 hidden_pointer = 1;
944} 1091}
945 1092
… …
962 x = ev.x; 1109 x = ev.x;
963 y = ev.y; 1110 y = ev.y;
964 pixel_position (&x, &y); 1111 pixel_position (&x, &y);
965 1112
966 if (MEvent.button == AnyButton) 1113 if (MEvent.button == AnyButton)
967 {
968 button_number = 3; 1114 button_number = 3;
969 }
970 else 1115 else
971 { 1116 {
972 button_number = MEvent.button - Button1; 1117 button_number = MEvent.button - Button1;
973 /* add 0x3D for wheel events, like xterm does */ 1118 /* add 0x3D for wheel events, like xterm does */
974 if (button_number >= 3) 1119 if (button_number >= 3)
975 button_number += (64 - 3); 1120 button_number += (64 - 3);
976 } 1121 }
977 1122
978 if (PrivateModes & PrivMode_MouseX10) 1123 if (priv_modes & PrivMode_MouseX10)
979 { 1124 {
980 /* 1125 /*
981 * do not report ButtonRelease 1126 * do not report ButtonRelease
982 * no state info allowed 1127 * no state info allowed
983 */ 1128 */
… …
998 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1143 + ((MEvent.state & ModMetaMask) ? 8 : 0)
999 + ((MEvent.state & ControlMask) ? 16 : 0); 1144 + ((MEvent.state & ControlMask) ? 16 : 0);
1000#ifdef MOUSE_REPORT_DOUBLECLICK 1145#ifdef MOUSE_REPORT_DOUBLECLICK
1001 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1146 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1002#endif 1147#endif
1003
1004 } 1148 }
1005 1149
1006#ifdef DEBUG_MOUSEREPORT 1150#if DEBUG_MOUSEREPORT
1007 fprintf (stderr, "Mouse ["); 1151 fprintf (stderr, "Mouse [");
1008 if (key_state & 16) 1152 if (key_state & 16)
1009 fputc ('C', stderr); 1153 fputc ('C', stderr);
1010 if (key_state & 4) 1154 if (key_state & 4)
1011 fputc ('S', stderr); 1155 fputc ('S', stderr);
… …
1015 fputc ('2', stderr); 1159 fputc ('2', stderr);
1016 fprintf (stderr, "]: <%d>, %d/%d\n", 1160 fprintf (stderr, "]: <%d>, %d/%d\n",
1017 button_number, 1161 button_number,
1018 x + 1, 1162 x + 1,
1019 y + 1); 1163 y + 1);
1020#else 1164#endif
1165
1021 tt_printf ("\033[M%c%c%c", 1166 tt_printf ("\033[M%c%c%c",
1022 (32 + button_number + key_state), 1167 (32 + button_number + key_state),
1023 (32 + x + 1), 1168 (32 + x + 1),
1024 (32 + y + 1)); 1169 (32 + y + 1));
1025#endif
1026} 1170}
1027 1171
1028#ifdef USING_W11LIB 1172#ifdef USING_W11LIB
1029void 1173void
1030rxvt_W11_process_x_event (XEvent *ev) 1174rxvt_W11_process_x_event (XEvent *ev)
… …
1037 1181
1038/*{{{ process an X event */ 1182/*{{{ process an X event */
1039void 1183void
1040rxvt_term::x_cb (XEvent &ev) 1184rxvt_term::x_cb (XEvent &ev)
1041{ 1185{
1186 dDisp;
1187
1042 SET_R (this); 1188 SET_R (this);
1043 SET_LOCALE (locale); 1189 SET_LOCALE (locale);
1044 1190
1045#if defined(CURSOR_BLINK) 1191#if defined(CURSOR_BLINK)
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1047 { 1193 {
1048 if (hidden_cursor) 1194 if (hidden_cursor)
1049 { 1195 {
1050 hidden_cursor = 0; 1196 hidden_cursor = 0;
1051 want_refresh = 1; 1197 want_refresh = 1;
… …
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1055 } 1201 }
1056#endif 1202#endif
1057 1203
1058#if defined(POINTER_BLANK) 1204#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1060 { 1206 {
1061 if (ev.type == MotionNotify 1207 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress 1208 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease) 1209 || ev.type == ButtonRelease)
1064 if (hidden_pointer) 1210 if (hidden_pointer)
… …
1067 if (ev.type == KeyPress && hidden_pointer == 0) 1213 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank (); 1214 pointer_blank ();
1069 } 1215 }
1070#endif 1216#endif
1071 1217
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return;
1075#endif
1076
1077 Window unused_root, unused_child; 1218 Window unused_root, unused_child;
1078 int unused_root_x, unused_root_y; 1219 int unused_root_x, unused_root_y;
1079 unsigned int unused_mask; 1220 unsigned int unused_mask;
1080
1081#ifdef DEBUG_X
1082 const char *const eventnames[] =
1083 { /* mason - this matches my system */
1084 "",
1085 "",
1086 "KeyPress",
1087 "KeyRelease",
1088 "ButtonPress",
1089 "ButtonRelease",
1090 "MotionNotify",
1091 "EnterNotify",
1092 "LeaveNotify",
1093 "FocusIn",
1094 "FocusOut",
1095 "KeymapNotify",
1096 "Expose",
1097 "GraphicsExpose",
1098 "NoExpose",
1099 "VisibilityNotify",
1100 "CreateNotify",
1101 "DestroyNotify",
1102 "UnmapNotify",
1103 "MapNotify",
1104 "MapRequest",
1105 "ReparentNotify",
1106 "ConfigureNotify",
1107 "ConfigureRequest",
1108 "GravityNotify",
1109 "ResizeRequest",
1110 "CirculateNotify",
1111 "CirculateRequest",
1112 "PropertyNotify",
1113 "SelectionClear",
1114 "SelectionRequest",
1115 "SelectionNotify",
1116 "ColormapNotify",
1117 "ClientMessage",
1118 "MappingNotify"
1119 };
1120#endif
1121
1122#ifdef DEBUG_X
1123 struct timeval tp;
1124 struct tm *ltt;
1125 (void)gettimeofday (&tp, NULL);
1126 ltt = localtime (& (tp.tv_sec));
1127 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1128#endif
1129 1221
1130 switch (ev.type) 1222 switch (ev.type)
1131 { 1223 {
1132 case KeyPress: 1224 case KeyPress:
1225#if ISO_14755
1226 if (!(iso14755buf & ISO_14755_52))
1227#endif
1133 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;
1134 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
1135 1293
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1294#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease:
1138 {
1139 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)
1140 mouse_slip_wheel_speed = 0; 1298 mouse_slip_wheel_speed = 0;
1141 else 1299#endif
1142 {
1143 KeySym ks;
1144
1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1146 if (ks == XK_Control_L || ks == XK_Control_R)
1147 mouse_slip_wheel_speed = 0;
1148 }
1149 break; 1300 break;
1150 } 1301 }
1151#endif
1152 1302
1153 case ButtonPress: 1303 case ButtonPress:
1154 button_press (ev.xbutton); 1304 button_press (ev.xbutton);
1155 break; 1305 break;
1156 1306
… …
1168 && (ev.xclient.data.l[0] == DndFile 1318 && (ev.xclient.data.l[0] == DndFile
1169 || ev.xclient.data.l[0] == DndDir 1319 || ev.xclient.data.l[0] == DndDir
1170 || ev.xclient.data.l[0] == DndLink)) 1320 || ev.xclient.data.l[0] == DndLink))
1171 { 1321 {
1172 /* Get Dnd data */ 1322 /* Get Dnd data */
1173 Atom ActualType; 1323 Atom ActualType;
1174 int ActualFormat; 1324 int ActualFormat;
1175 unsigned char *data; 1325 unsigned char *data;
1176 unsigned long Size, RemainingBytes; 1326 unsigned long Size, RemainingBytes;
1177 1327
1178 XGetWindowProperty (display->display, display->root, 1328 XGetWindowProperty (disp, display->root,
1179 xa[XA_DNDSELECTION], 1329 xa[XA_DNDSELECTION],
1180 0L, 1000000L, 1330 0L, 1000000L,
1181 False, AnyPropertyType, 1331 False, AnyPropertyType,
1182 &ActualType, &ActualFormat, 1332 &ActualType, &ActualFormat,
1183 &Size, &RemainingBytes, 1333 &Size, &RemainingBytes,
1184 &data); 1334 &data);
1185 XChangeProperty (display->display, display->root, 1335 set_string_property (XA_CUT_BUFFER0, data);
1186 XA_CUT_BUFFER0, XA_STRING, 1336 XFree (data);
1187 8, PropModeReplace,
1188 data, STRLEN (data));
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1337 selection_paste (display->root, XA_CUT_BUFFER0, true);
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1338 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1191 } 1339 }
1192#endif /* OFFIX_DND */ 1340#endif /* OFFIX_DND */
1193 break; 1341 break;
1194 1342
1195 case MappingNotify: 1343 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping)); 1344 XRefreshKeyboardMapping (&ev.xmapping);
1197 break; 1345 break;
1198 1346
1199 /* 1347 /*
1200 * XXX: this is not the _current_ arrangement 1348 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1349 * Here's my conclusion:
… …
1226 { 1374 {
1227 TermWin.focus = 1; 1375 TermWin.focus = 1;
1228 want_refresh = 1; 1376 want_refresh = 1;
1229#ifdef USE_XIM 1377#ifdef USE_XIM
1230 if (Input_Context != NULL) 1378 if (Input_Context != NULL)
1379 {
1380 IMSetStatusPosition ();
1231 XSetICFocus (Input_Context); 1381 XSetICFocus (Input_Context);
1382 }
1232#endif 1383#endif
1233#ifdef CURSOR_BLINK 1384#ifdef CURSOR_BLINK
1234 if (Options & Opt_cursorBlink) 1385 if (options & Opt_cursorBlink)
1235 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 }
1236#endif 1394#endif
1237 1395
1238 } 1396 }
1239 break; 1397 break;
1240 1398
1241 case FocusOut: 1399 case FocusOut:
1242 if (TermWin.focus) 1400 if (TermWin.focus)
1243 { 1401 {
1244 TermWin.focus = 0; 1402 TermWin.focus = 0;
1245 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
1246#ifdef USE_XIM 1411#ifdef USE_XIM
1247 if (Input_Context != NULL) 1412 if (Input_Context != NULL)
1248 XUnsetICFocus (Input_Context); 1413 XUnsetICFocus (Input_Context);
1249#endif 1414#endif
1250#ifdef CURSOR_BLINK 1415#ifdef CURSOR_BLINK
1251 if (Options & Opt_cursorBlink) 1416 if (options & Opt_cursorBlink)
1252 cursor_blink_ev.stop (); 1417 cursor_blink_ev.stop ();
1253 hidden_cursor = 0; 1418 hidden_cursor = 0;
1254#endif 1419#endif
1255 1420#ifdef OFF_FOCUS_FADING
1421 if (rs[Rs_fade])
1422 {
1423 pix_colors = pix_colors_unfocused;
1424 scr_recolour ();
1425 }
1426#endif
1256 } 1427 }
1257 break; 1428 break;
1258 1429
1259 case ConfigureNotify: 1430 case ConfigureNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0]) 1431 if (ev.xconfigure.window == TermWin.parent[0])
… …
1265 { /* Wrap lots of configures into one */ 1436 { /* Wrap lots of configures into one */
1266 width = ev.xconfigure.width; 1437 width = ev.xconfigure.width;
1267 height = ev.xconfigure.height; 1438 height = ev.xconfigure.height;
1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1269 } 1440 }
1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1271 1442
1272 if (szHint.width != width || szHint.height != height) 1443 if (szHint.width != width || szHint.height != height)
1273 { 1444 {
1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1445 seen_resize = 1;
1275 resize_all_windows (width, height, 1); 1446 resize_all_windows (width, height, 1);
1276 } 1447 }
1277#ifdef DEBUG_SIZE 1448
1278 else
1279 {
1280 D_SIZE ((stderr, "Size: Not resizing"));
1281 }
1282#endif
1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1284 if (Options & Opt_transparent) 1450 if (options & Opt_transparent)
1285 {
1286 check_our_parents (); 1451 check_our_parents ();
1287 if (am_transparent)
1288 want_full_refresh = 1;
1289 }
1290#endif 1452#endif
1291
1292 } 1453 }
1293 break; 1454 break;
1294 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
1295 case SelectionClear: 1463 case SelectionClear:
1296 display->set_selection_owner (0); 1464 selection_clear ();
1297 break; 1465 break;
1298 1466
1299 case SelectionNotify: 1467 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1468 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1470 break;
1304 1471
1305 case SelectionRequest: 1472 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1307 break; 1474 break;
… …
1328 1495
1329 case GraphicsExpose: 1496 case GraphicsExpose:
1330 case Expose: 1497 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1498 if (ev.xany.window == TermWin.vt)
1332 { 1499 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1500 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1501 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1502 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1337 // 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))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1510
1341 // ev.xexpose.width, TermWin.height, False); 1511 scr_refresh (refresh_type);
1342#endif
1343 want_refresh = 1;
1344 } 1512 }
1345 else 1513 else
1346 { 1514 {
1347 XEvent unused_event; 1515 XEvent unused_event;
1348 1516
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1517 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1350 Expose, 1518 ;
1351 &unused_event)) ; 1519 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1520 ;
1353 GraphicsExpose, 1521
1354 &unused_event)) ;
1355 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1356 { 1523 {
1357 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1358 scrollbar_show (0); 1525 scrollbar_show (0);
1359 } 1526 }
1360#ifdef MENUBAR 1527#ifdef MENUBAR
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1362 menubar_expose (); 1529 menubar_expose ();
1363#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
1364 } 1536 }
1365 break; 1537 break;
1366 1538
1367 case MotionNotify: 1539 case MotionNotify:
1368#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
… …
1374 { 1546 {
1375 menubar_control (ev.xbutton); 1547 menubar_control (ev.xbutton);
1376 break; 1548 break;
1377 } 1549 }
1378#endif 1550#endif
1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1380 break; 1552 break;
1381 1553
1382 if (ev.xany.window == TermWin.vt) 1554 if (ev.xany.window == TermWin.vt)
1383 { 1555 {
1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1556 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1557 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1387 ; 1559 ;
1388 1560
1389 XQueryPointer (display->display, TermWin.vt, 1561 XQueryPointer (disp, TermWin.vt,
1390 &unused_root, &unused_child, 1562 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1563 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1564 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1565 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1566#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1567 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1568 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1569 {
1398#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
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1579 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1580 ev.xbutton.state & Button3Mask ? 2 : 0);
1581
1401#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1404 { 1585 {
1405 int dist; 1586 int dist;
1406 1587
1407 pending_scroll_selection=1;
1408
1409 /* don't clobber the current delay if we are 1588 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1589 * already in the middle of scrolling.
1411 */ 1590 */
1412 if (scroll_selection_delay<=0) 1591 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1593
1415 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1417 */ 1596 */
1418 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1600
1423 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y < TermWin.int_bwidth)
1425 { 1603 {
1426 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1428 } 1606 }
1429 else 1607 else
1430 { 1608 {
1431 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y -
1433 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1434 } 1611 }
1612
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1437 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1439 } 1618 }
1440 else 1619 else
1441 { 1620 {
1442 /* we are within the text window, so we 1621 /* we are within the text window, so we
1443 * shouldn't be scrolling 1622 * shouldn't be scrolling
1444 */ 1623 */
1445 pending_scroll_selection = 0; 1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop();
1446 } 1626 }
1447#endif 1627#endif
1448#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1449
1450 } 1629 }
1451#endif 1630#endif
1452
1453 } 1631 }
1454 } 1632 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1634 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1458 MotionNotify, &ev)) ; 1636 MotionNotify, &ev))
1637 ;
1638
1459 XQueryPointer (display->display, scrollBar.win, 1639 XQueryPointer (disp, scrollBar.win,
1460 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1642 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1643 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1645 scrollbar_size ());
1466 scr_refresh (refresh_type); 1646 scr_refresh (refresh_type);
1467 refresh_limit = 0; 1647 refresh_limit = 0;
… …
1469 } 1649 }
1470 break; 1650 break;
1471 } 1651 }
1472} 1652}
1473 1653
1654#if TRANSPARENT
1474void 1655void
1475rxvt_term::rootwin_cb (XEvent &ev) 1656rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1657{
1477 SET_R (this); 1658 SET_R (this);
1478 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1479 1660
1480 switch (ev.type) 1661 switch (ev.type)
1481 { 1662 {
1482 case PropertyNotify: 1663 case PropertyNotify:
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1484 {
1485 if (ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487 break;
1488 }
1489#ifdef TRANSPARENT
1490 else
1491 {
1492 /* 1664 /*
1493 * 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,
1494 * 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.
1495 */ 1667 */
1496 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498
1499 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1668 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1500 return; 1670 return;
1501 }
1502 1671
1503 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1504 case ReparentNotify: 1673 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1508 break; 1676 break;
1509#endif
1510 } 1677 }
1511} 1678}
1679#endif
1512 1680
1513void 1681void
1514rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1515{ 1683{
1516 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1517 1685
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1519 if (!bypass_keystate) 1687 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1521 /* 1690 /*
1522 * VT window processing of button press 1691 * VT window processing of button press
1523 */ 1692 */
1524 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1525 { 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
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1705
1527 if (reportmode) 1706 if (reportmode)
1528 { 1707 {
1529 /* mouse report from vt window */ 1708 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1709 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1710 MEvent.state = ev.state;
… …
1560 } 1739 }
1561 else 1740 else
1562 { 1741 {
1563 if (ev.button != MEvent.button) 1742 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1743 MEvent.clicks = 0;
1744
1565 switch (ev.button) 1745 switch (ev.button)
1566 { 1746 {
1567 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
1568 /* allow shift+left click to extend selection */ 1756 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1757 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1570 { 1758 {
1571 if (MEvent.button == Button1 && clickintime) 1759 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1760 selection_rotate (ev.x, ev.y);
1573 else 1761 else
1574 selection_extend (ev.x, ev.y, 1); 1762 selection_extend (ev.x, ev.y, 1);
… …
1589 case Button3: 1777 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1778 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1779 selection_rotate (ev.x, ev.y);
1592 else 1780 else
1593 selection_extend (ev.x, ev.y, 1); 1781 selection_extend (ev.x, ev.y, 1);
1782
1594 MEvent.button = Button3; 1783 MEvent.button = Button3;
1595 break; 1784 break;
1596 } 1785 }
1597 } 1786 }
1787
1598 MEvent.time = ev.time; 1788 MEvent.time = ev.time;
1599 return; 1789 return;
1600 } 1790 }
1601 1791
1602 /* 1792 /*
… …
1668 upordown = 1; /* down */ 1858 upordown = 1; /* down */
1669 } 1859 }
1670 if (upordown) 1860 if (upordown)
1671 { 1861 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1862#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1863 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 1864#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 1865 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 1866 {
1677 if (upordown < 0) 1867 if (upordown < 0)
1678 scrollBar.setUp (); 1868 scrollBar.setUp ();
… …
1694 break; 1884 break;
1695 case R_SB_ALIGN_BOTTOM: 1885 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 1886 csrO = scrollBar.bot - scrollBar.top;
1697 break; 1887 break;
1698 } 1888 }
1889
1699 if (scrollBar.style == R_SB_XTERM 1890 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 1891 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 1892 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 1893 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 1894
1704 scrollBar.setMotion (); 1895 scrollBar.setMotion ();
1705 break; 1896 break;
1706 1897
1707 case Button1: 1898 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1899 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1732 scr_page ((ev.button == Button1 ? DN : UP), 1923 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 1924 (TermWin.nrow
1734 * scrollbar_position (ev.y) 1925 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 1926 / scrollbar_size ()));
1736 } 1927 }
1928
1737 break; 1929 break;
1738 } 1930 }
1739 } 1931 }
1740 return; 1932 return;
1741 } 1933 }
… …
1753{ 1945{
1754 int reportmode = 0; 1946 int reportmode = 0;
1755 1947
1756 csrO = 0; /* reset csr Offset */ 1948 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 1949 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1950 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 1951
1760 if (scrollbar_isUpDn ()) 1952 if (scrollbar_isUpDn ())
1761 { 1953 {
1762 scrollBar.setIdle (); 1954 scrollBar.setIdle ();
1763 scrollbar_show (0); 1955 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1956#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH; 1957 refresh_type &= ~SMOOTH_REFRESH;
1766#endif 1958#endif
1767
1768 } 1959 }
1960
1769#ifdef SELECTION_SCROLLING 1961#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 1962 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop();
1771#endif 1964#endif
1965
1772 if (ev.window == TermWin.vt) 1966 if (ev.window == TermWin.vt)
1773 { 1967 {
1968#if ISO_14755
1969 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return;
1972#endif
1774 if (reportmode) 1973 if (reportmode)
1775 { 1974 {
1776 /* mouse report from vt window */ 1975 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 1976 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 1977 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 1991 MEvent.button = AnyButton;
1793 mouse_report (ev); 1992 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 1993#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 1994 return;
1796 } 1995 }
1996
1797 /* 1997 /*
1798 * dumb hack to compensate for the failure of click-and-drag 1998 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 1999 * when overriding mouse reporting
1800 */ 2000 */
1801 if (PrivateModes & PrivMode_mouse_report 2001 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2002 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2003 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2004 selection_extend (ev.x, ev.y, 0);
1805 2005
1806 switch (ev.button) 2006 switch (ev.button)
… …
1817 case Button5: 2017 case Button5:
1818 { 2018 {
1819 int i; 2019 int i;
1820 page_dirn v; 2020 page_dirn v;
1821 2021
1822 v = (ev.button == Button4) ? UP : DN; 2022 v = ev.button == Button4 ? UP : DN;
2023
1823 if (ev.state & ShiftMask) 2024 if (ev.state & ShiftMask)
1824 i = 1; 2025 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2026 else if (options & Opt_mouseWheelScrollPage)
1826 i = TermWin.nrow - 1; 2027 i = TermWin.nrow - 1;
1827 else 2028 else
1828 i = 5; 2029 i = 5;
2030
1829# ifdef MOUSE_SLIP_WHEELING 2031# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2032 if (ev.state & ControlMask)
1831 { 2033 {
1832 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)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040
2041 slip_wheel_ev.start ();
1834 } 2042 }
2043 else
2044 {
1835# endif 2045# endif
1836# ifdef JUMP_MOUSE_WHEEL 2046# ifdef JUMP_MOUSE_WHEEL
1837 scr_page (v, i);
1838 scr_refresh (SMOOTH_REFRESH);
1839 scrollbar_show (1);
1840# else
1841 while (i--)
1842 {
1843 scr_page (v, 1); 2047 scr_page (v, i);
1844 scr_refresh (SMOOTH_REFRESH); 2048 scr_refresh (SMOOTH_REFRESH);
1845 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
1846 } 2059 }
1847# endif 2060#endif
1848
1849 } 2061 }
1850 break; 2062 break;
1851#endif 2063#endif
1852
1853 } 2064 }
1854 } 2065 }
1855#ifdef MENUBAR 2066#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window)) 2067 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev); 2068 menubar_control (ev);
1858#endif 2069#endif
1859} 2070}
1860 2071
1861
1862#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
1863/* 2304/*
1864 * Check our parents are still who we think they are. 2305 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2306 * Do transparency updates if required
1866 */ 2307 */
1867int 2308int
1868rxvt_term::check_our_parents () 2309rxvt_term::check_our_parents ()
1869{ 2310{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2311 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2312 unsigned long nitems, bytes_after;
1872 Atom atype; 2313 Atom atype;
1873 unsigned char *prop = NULL; 2314 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2315 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2316 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2317 XWindowAttributes wattr, wrootattr;
2318 dDisp;
1877 2319
1878 pchanged = 0; 2320 pchanged = 0;
1879 2321
1880 if (! (Options & Opt_transparent)) 2322 if (!(options & Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2323 return pchanged; /* Don't try any more */
1882 2324
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2325 XGetWindowAttributes (disp, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2326 rootdepth = wrootattr.depth;
1885 2327
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2329
1887 if (rootdepth != wattr.depth) 2330 if (rootdepth != wattr.depth)
1888 { 2331 {
1889 if (am_transparent) 2332 if (am_transparent)
1890 { 2333 {
1891 pchanged = 1; 2334 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2336 am_transparent = am_pixmap_trans = 0;
1895 } 2337 }
2338
1896 return pchanged; /* Don't try any more */ 2339 return pchanged; /* Don't try any more */
1897 } 2340 }
1898 2341
1899 /* 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. */
1900 XSync (display->display, False); 2343 XSync (disp, False);
1901 2344
1902 /* 2345 /*
1903 * Make the frame window set by the window manager have 2346 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2347 * the root background. Some window managers put multiple nested frame
1905 * 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.
1906 */ 2349 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2350 i = (xa[XA_XROOTPMAP_ID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2351 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2352 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2353 &nitems, &bytes_after, &prop) == Success);
2354
1911 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 )
1912 have_pixmap = 0; 2366 have_pixmap = 0;
1913 else 2367 else
1914 { 2368 {
1915 have_pixmap = 1; 2369 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2370 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2371 XFree (prop);
1918 } 2372 }
2373
1919 if (have_pixmap) 2374 if (have_pixmap)
1920 { 2375 {
1921 /* 2376 /*
1922 * Copy display->root pixmap transparency 2377 * Copy display->root pixmap transparency
1923 */ 2378 */
… …
1926 Window cr; 2381 Window cr;
1927 XImage *image; 2382 XImage *image;
1928 GC gc; 2383 GC gc;
1929 XGCValues gcvalue; 2384 XGCValues gcvalue;
1930 2385
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2387 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2388 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2389 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2390 nx = ny = 0;
1936 2391
1937 if (sx < 0) 2392 if (sx < 0)
… …
1948 sy = 0; 2403 sy = 0;
1949 } 2404 }
1950 2405
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2408
2409 XSync (disp, False);
1953 allowedxerror = -1; 2410 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2412
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2413 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2414 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2415 allowedxerror = 0;
2416
1959 if (image == NULL) 2417 if (image == NULL)
1960 { 2418 {
1961 if (am_transparent && am_pixmap_trans) 2419 if (am_transparent && am_pixmap_trans)
1962 { 2420 {
1963 pchanged = 1; 2421 pchanged = 1;
1964 if (TermWin.pixmap != None) 2422 if (TermWin.pixmap != None)
1965 { 2423 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2424 XFreePixmap (disp, TermWin.pixmap);
1967 TermWin.pixmap = None; 2425 TermWin.pixmap = None;
1968 } 2426 }
1969 } 2427 }
2428
1970 am_pixmap_trans = 0; 2429 am_pixmap_trans = 0;
1971 } 2430 }
1972 else 2431 else
1973 { 2432 {
1974 if (TermWin.pixmap != None) 2433 if (TermWin.pixmap != None)
1975 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
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2449 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2452 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2453 XFreeGC (disp, gc);
1985 XDestroyImage (image); 2454 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
1987 TermWin.pixmap); 2456 XClearWindow (disp, TermWin.parent[0]);
2457
1988 if (!am_transparent || !am_pixmap_trans) 2458 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2459 pchanged = 1;
2460
1990 am_transparent = am_pixmap_trans = 1; 2461 am_transparent = am_pixmap_trans = 1;
1991 } 2462 }
1992 } 2463 }
1993 2464
1994 if (!am_pixmap_trans) 2465 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2467 else
1995 { 2468 {
1996 unsigned int n; 2469 unsigned int n;
1997 /* 2470 /*
1998 * InheritPixmap transparency 2471 * InheritPixmap transparency
1999 */ 2472 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2474 {
2004 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (disp, TermWin.parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
2007 XFree (list); 2478 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2479
2009 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
2010 { 2481 {
2011 if (oldp != None) 2482 if (oldp != None)
2012 pchanged = 1; 2483 pchanged = 1;
2484
2013 break; 2485 break;
2014 } 2486 }
2487
2015 if (oldp != TermWin.parent[i]) 2488 if (oldp != TermWin.parent[i])
2016 pchanged = 1; 2489 pchanged = 1;
2017 } 2490 }
2018 2491
2019 n = 0; 2492 n = 0;
2020 2493
2021 if (pchanged) 2494 if (pchanged)
2022 { 2495 {
2023 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
2024 { 2497 {
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 { 2500 {
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2030 break; 2502 break;
2031 } 2503 }
2032 } 2504 }
2033 } 2505 }
2034 2506
2035 if (n > (int) (sizeof (TermWin.parent) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2508 {
2038 D_X ((stderr, "InheritPixmap Turning off")); 2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt,
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2511 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
2045 } 2513 }
2046 else 2514 else
2047 { 2515 {
2516#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
2050# ifdef HAVE_NANOSLEEP
2051 struct timespec rqt;
2052
2053 rqt.tv_sec = 1;
2054 rqt.tv_nsec = 0;
2055 nanosleep (&rqt, NULL);
2056# else
2057 sleep (1); 2519 sleep (1);
2058# endif 2520#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2062 ParentRelative); 2524 XClearWindow (disp, TermWin.parent[n]);
2525 }
2526
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2064 ParentRelative);
2065 am_transparent = 1; 2528 am_transparent = 1;
2066 } 2529 }
2067 2530
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
2070 } 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
2071 return pchanged; 2549 return pchanged;
2072} 2550}
2073#endif 2551#endif
2074 2552
2075/*}}} */ 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}
2076 2740
2077/*{{{ print pipe */ 2741/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2742/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2743#ifdef PRINTPIPE
2080FILE * 2744FILE *
2081rxvt_term::popen_printer () 2745rxvt_term::popen_printer ()
2082{ 2746{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2747 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2748
2085 if (stream == NULL) 2749 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2750 rxvt_warn ("can't open printer pipe, not printing.\n");
2751
2087 return stream; 2752 return stream;
2088} 2753}
2089 2754
2090int 2755int
2091rxvt_term::pclose_printer (FILE *stream) 2756rxvt_term::pclose_printer (FILE *stream)
2092{ 2757{
2093 fflush (stream); 2758 fflush (stream);
2094 /* pclose () reported not to work on SunOS 4.1.3 */
2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2096 /* pclose works provided SIGCHLD handler uses waitpid */
2097 return pclose (stream); /* return fclose (stream); */
2098# else
2099 return pclose (stream); 2759 return pclose (stream);
2100# endif
2101} 2760}
2102 2761
2103/* 2762/*
2104 * simulate attached vt100 printer 2763 * simulate attached vt100 printer
2105 */ 2764 */
2106void 2765void
2107rxvt_term::process_print_pipe () 2766rxvt_term::process_print_pipe ()
2108{ 2767{
2109 int done; 2768 int done;
2110 FILE *fd; 2769 FILE *fd;
2111 2770
2112 if ((fd = popen_printer ()) == NULL) 2771 if ((fd = popen_printer ()) == NULL)
2113 return; 2772 return;
2114 2773
2115 /* 2774 /*
2116 * 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
2117 * is received. 2776 * is received.
2118 */ 2777 */
2119 for (done = 0; !done;) 2778 for (done = 0; !done;)
2120 { 2779 {
2121 unsigned char buf[8]; 2780 unsigned char buf[8];
2122 unsigned char ch; 2781 unicode_t ch;
2123 unsigned int i, len; 2782 unsigned int i, len;
2124 2783
2125 if ((ch = cmd_getc ()) != C0_ESC) 2784 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2785 {
2127 if (putc (ch, fd) == EOF) 2786 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2787 break; /* done = 1 */
… …
2143 { 2802 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2803 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2804 break; /* done = 1 */
2146 } 2805 }
2147 } 2806 }
2807
2148 for (i = 0; i < len; i++) 2808 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2809 if (putc (buf[i], fd) == EOF)
2150 { 2810 {
2151 done = 1; 2811 done = 1;
2152 break; 2812 break;
2153 } 2813 }
2154 } 2814 }
2155 } 2815 }
2816
2156 pclose_printer (fd); 2817 pclose_printer (fd);
2157} 2818}
2158#endif /* PRINTPIPE */ 2819#endif /* PRINTPIPE */
2159/*}}} */ 2820/*}}} */
2160 2821
2161/* *INDENT-OFF* */ 2822/* *INDENT-OFF* */
2162enum { 2823enum {
2163 C1_40 = 0x40, 2824 C1_40 = 0x40,
2164 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,
2165 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,
2166 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,
2167 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,
2168}; 2829};
2169/* *INDENT-ON* */ 2830/* *INDENT-ON* */
2170 2831
2171/*{{{ process non-printing single characters */ 2832/*{{{ process non-printing single characters */
2172void 2833void
2173rxvt_term::process_nonprinting (unsigned char ch) 2834rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2835{
2175 switch (ch) 2836 switch (ch)
2176 { 2837 {
2838 case C0_ESC:
2839 process_escape_seq ();
2840 break;
2177 case C0_ENQ: /* terminal Status */ 2841 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2842 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2843 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2844 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2845 else
2183 tt_write ((unsigned char *)VT100_ANS, 2846 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2847 (unsigned int)strlen (VT100_ANS));
2185 break; 2848 break;
2186 case C0_BEL: /* bell */ 2849 case C0_BEL: /* bell */
2187 scr_bell (); 2850 scr_bell ();
2188 break; 2851 break;
2189 case C0_BS: /* backspace */ 2852 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2867 scr_charset_choose (1);
2205 break; 2868 break;
2206 case C0_SI: /* shift in - acs */ 2869 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2870 scr_charset_choose (0);
2208 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
2209 } 2885 }
2210} 2886}
2211/*}}} */ 2887/*}}} */
2212 2888
2213 2889
2214/*{{{ process VT52 escape sequences */ 2890/*{{{ process VT52 escape sequences */
2215void 2891void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 2892rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 2893{
2218 int row, col; 2894 int row, col;
2219 2895
2220 switch (ch) 2896 switch (ch)
2221 { 2897 {
… …
2273 2949
2274/*{{{ process escape sequences */ 2950/*{{{ process escape sequences */
2275void 2951void
2276rxvt_term::process_escape_seq () 2952rxvt_term::process_escape_seq ()
2277{ 2953{
2278 unsigned char ch = cmd_getc (); 2954 unicode_t ch = cmd_getc ();
2279 2955
2280 if (PrivateModes & PrivMode_vt52) 2956 if (priv_modes & PrivMode_vt52)
2281 { 2957 {
2282 process_escape_vt52 (ch); 2958 process_escape_vt52 (ch);
2283 return; 2959 return;
2284 } 2960 }
2285 2961
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 2976 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 2977 break;
2302 case '+': 2978 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 2979 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 2980 break;
2305#ifndef NO_FRILLS 2981#if ENABLE_FRILLS
2306 case '6': 2982 case '6':
2307 scr_backindex (); 2983 scr_backindex ();
2308 break; 2984 break;
2309#endif 2985#endif
2310 case '7': 2986 case '7':
2311 scr_cursor (SAVE); 2987 scr_cursor (SAVE);
2312 break; 2988 break;
2313 case '8': 2989 case '8':
2314 scr_cursor (RESTORE); 2990 scr_cursor (RESTORE);
2315 break; 2991 break;
2316#ifndef NO_FRILLS 2992#if ENABLE_FRILLS
2317 case '9': 2993 case '9':
2318 scr_forwardindex (); 2994 scr_forwardindex ();
2319 break; 2995 break;
2320#endif 2996#endif
2321 case '=': 2997 case '=':
… …
2331 break; 3007 break;
2332 3008
2333 /* 8.3.87: NEXT LINE */ 3009 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 3010 case C1_NEL: /* ESC E */
2335 { 3011 {
2336 uint32_t nlcr[] = { '\n', '\r' }; 3012 unicode_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 3013 scr_add_lines (nlcr, 1, 2);
2338 } 3014 }
2339 break; 3015 break;
2340 3016
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 3017 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2352 case C1_RI: /* ESC M */ 3028 case C1_RI: /* ESC M */
2353 scr_index (DN); 3029 scr_index (DN);
2354 break; 3030 break;
2355 3031
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 3032 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 3033 /*case C1_SS2: scr_single_shift (2); break; */
2358 3034
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 3035 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 3036 /*case C1_SS3: scr_single_shift (3); break; */
2361 3037
2362 /* 8.3.27: DEVICE CONTROL STRING */ 3038 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 3039 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 3040 process_dcs_seq ();
2365 break; 3041 break;
… …
2380 process_osc_seq (); 3056 process_osc_seq ();
2381 break; 3057 break;
2382 3058
2383 /* 8.3.106: RESET TO INITIAL STATE */ 3059 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 3060 case 'c':
3061 mbstate.reset ();
2385 scr_poweron (); 3062 scr_poweron ();
2386 scrollbar_show (1); 3063 scrollbar_show (1);
2387 break; 3064 break;
2388 3065
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3066 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 3078
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3079/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 3080/* *INDENT-OFF* */
2404enum { 3081enum {
2405 CSI_ICH = 0x40, 3082 CSI_ICH = 0x40,
2406 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,
2407 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 ,
2408 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,
2409 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,
2410 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,
2411 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,
… …
2426 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, */
2427 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, [, \, ], ^, _, */
2428 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, */
2429 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, */
2430 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, */
2431 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, {, |, }, ~, */
2432 }; 3109 };
2433/* *INDENT-ON* */ 3110/* *INDENT-ON* */
2434 3111
2435void 3112void
2436rxvt_term::process_csi_seq () 3113rxvt_term::process_csi_seq ()
2437{ 3114{
2438 unsigned char ch, priv, i; 3115 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 3116 unsigned int nargs, p;
2440 int n, ndef; 3117 int n, ndef;
2441 int arg[ESC_ARGS]; 3118 int arg[ESC_ARGS];
2442 3119
2443 for (nargs = ESC_ARGS; nargs > 0;) 3120 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 3121 arg[--nargs] = 0;
2445 3122
2446 priv = 0; 3123 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 3125 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 3126 { /* '<' '=' '>' '?' */
2450 priv = ch; 3127 priv = ch;
2451 ch = cmd_getc (); 3128 ch = cmd_getc ();
2452 } 3129 }
3130
2453 /* read any numerical arguments */ 3131 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 3132 for (n = -1; ch < CSI_ICH; )
2455 { 3133 {
2456 if (isdigit (ch)) 3134 if (isdigit (ch))
2457 { 3135 {
… …
2464 { 3142 {
2465 if (nargs < ESC_ARGS) 3143 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 3144 arg[nargs++] = n;
2467 n = -1; 3145 n = -1;
2468 } 3146 }
2469 else if (ch == '\b') 3147 else if (IS_CONTROL (ch))
2470 {
2471 scr_backspace ();
2472 }
2473 else if (ch == C0_ESC)
2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch); 3148 process_nonprinting (ch);
2481 } 3149
2482 ch = cmd_getc (); 3150 ch = cmd_getc ();
2483 } 3151 }
2484 3152
2485 if (ch > CSI_7F) 3153 if (ch > CSI_7F)
2486 return; 3154 return;
… …
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2629 break; 3297 break;
2630 3298
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 3300 tt_write ((const unsigned char *)VT100_ANS,
2633 (unsigned int) (sizeof (VT100_ANS) - 1)); 3301 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 3302 break;
2635 3303
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3304 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 3305 process_sgr_mode (nargs, arg);
2638 break; 3306 break;
… …
2644 tt_printf ("\033[0n"); 3312 tt_printf ("\033[0n");
2645 break; 3313 break;
2646 case 6: /* CPR requested */ 3314 case 6: /* CPR requested */
2647 scr_report_position (); 3315 scr_report_position ();
2648 break; 3316 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3317 case 7: /* unofficial extension */
3318 if (options & Opt_insecure)
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3319 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 3320 break;
2653#endif
2654 case 8: /* unofficial extension */ 3321 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3323 break;
2657 } 3324 }
2658 break; 3325 break;
2659 3326
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3327 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3360 break;
2694 3361
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3362 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3363 if (arg[0] == 4)
2697 scr_insert_mode (0); 3364 scr_insert_mode (0);
3365 else if (arg[0] == 20)
3366 priv_modes &= ~PrivMode_LFNL;
2698 break; 3367 break;
2699 3368
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3369 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3370 if (arg[0] == 4)
2702 scr_insert_mode (1); 3371 scr_insert_mode (1);
3372 else if (arg[0] == 20)
3373 priv_modes |= PrivMode_LFNL;
2703 break; 3374 break;
2704 3375
2705 /* 3376 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3377 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3378 */
… …
2719 break; 3390 break;
2720 case CSI_75: 3391 case CSI_75:
2721 scr_cursor (RESTORE); 3392 scr_cursor (RESTORE);
2722 break; 3393 break;
2723 3394
2724#ifndef NO_FRILLS 3395#if ENABLE_FRILLS
2725 case CSI_74: 3396 case CSI_74:
2726 process_window_ops (arg, nargs); 3397 process_window_ops (arg, nargs);
2727 break; 3398 break;
2728#endif 3399#endif
2729 3400
2730 case CSI_78: /* DECREQTPARM */ 3401 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3402 if (arg[0] == 0 || arg[0] == 1)
2732 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);
2733 /* FALLTHROUGH */ 3404 break;
2734 3405
2735 default: 3406 default:
2736 break; 3407 break;
2737 } 3408 }
2738} 3409}
2739/*}}} */ 3410/*}}} */
2740 3411
2741#ifndef NO_FRILLS 3412#if ENABLE_FRILLS
2742/* ARGSUSED */ 3413/* ARGSUSED */
2743void 3414void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3415rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3416{
2746 int x, y; 3417 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3418 XWindowAttributes wattr;
2751 Window wdummy; 3419 Window wdummy;
3420 dDisp;
2752 3421
2753 if (nargs == 0) 3422 if (nargs == 0)
2754 return; 3423 return;
3424
2755 switch (args[0]) 3425 switch (args[0])
2756 { 3426 {
2757 /* 3427 /*
2758 * commands 3428 * commands
2759 */ 3429 */
2760 case 1: /* deiconify window */ 3430 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3431 XMapWindow (disp, TermWin.parent[0]);
2762 break; 3432 break;
2763 case 2: /* iconify window */ 3433 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3434 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3435 break;
2767 case 3: /* set position (pixels) */ 3436 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2769 break; 3438 break;
2770 case 4: /* set size (pixels) */ 3439 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3441 break;
2773 case 5: /* raise window */ 3442 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3443 XRaiseWindow (disp, TermWin.parent[0]);
2775 break; 3444 break;
2776 case 6: /* lower window */ 3445 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3446 XLowerWindow (disp, TermWin.parent[0]);
2778 break; 3447 break;
2779 case 7: /* refresh window */ 3448 case 7: /* refresh window */
2780 scr_touch (true); 3449 scr_touch (true);
2781 break; 3450 break;
2782 case 8: /* set size (chars) */ 3451 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3452 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3453 (unsigned int) (args[1] * TermWin.fheight));
2785 break; 3454 break;
3455
3456 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3457 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3458 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3459 set_widthheight ((unsigned int)TermWin.width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3460 (unsigned int) (args[1] * TermWin.fheight));
2790 break; 3461 break;
3462
3463
2791 /* 3464 /*
2792 * reports - some output format copied from XTerm 3465 * reports - some output format copied from XTerm
2793 */ 3466 */
2794 case 11: /* report window state */ 3467 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3470 break;
2798 case 13: /* report window position */ 3471 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3474 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3475 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3476 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3477 break;
2805 case 14: /* report window size (pixels) */ 3478 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3481 break;
2809 case 18: /* report window size (chars) */ 3482 case 18: /* report text area size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2811 break; 3484 break;
2812#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;
2813 case 20: /* report icon label */ 3488 case 20: /* report icon label */
3489 {
3490 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3491 XGetIconName (disp, TermWin.parent[0], &s);
2815 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 }
2816 break; 3495 break;
2817 case 21: /* report window title */ 3496 case 21: /* report window title */
3497 {
3498 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3499 XFetchName (disp, TermWin.parent[0], &s);
2819 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 }
2820 break; 3503 break;
2821#endif
2822
2823 } 3504 }
2824} 3505}
2825#endif 3506#endif
2826 3507
2827/*----------------------------------------------------------------------*/ 3508/*----------------------------------------------------------------------*/
2828/* 3509/*
2829 * get input up until STRING TERMINATOR (or BEL) 3510 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3511 * ends_how is terminator used. returned input must be free()'d
2831 */ 3512 */
2832unsigned char * 3513unsigned char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3514rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3515{
2835 int seen_esc = 0; /* seen escape? */ 3516 unicode_t ch;
3517 bool seen_esc = false;
2836 unsigned int n = 0; 3518 unsigned int n = 0;
2837 unsigned char *s; 3519 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3520
2840 for (; (ch = cmd_getc ());) 3521 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3522 {
2842 if (ch == C0_BEL 3523 if (seen_esc)
2843 || ch == CHAR_ST 3524 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3525 if (ch == 0x5c) /* 7bit ST */
2845 break; 3526 break;
3527 else
3528 return NULL;
3529 }
2846 if (ch == C0_ESC) 3530 else if (ch == C0_ESC)
2847 { 3531 {
2848 seen_esc = 1; 3532 seen_esc = true;
2849 continue; 3533 continue;
2850 } 3534 }
2851 else if (ch == '\t') 3535 else if (ch == C0_BEL || ch == CHAR_ST)
2852 ch = ' '; /* translate '\t' to space */ 3536 break;
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3537 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3538 return NULL; /* other control character - exit */
3539
3540 seen_esc = false;
3541
2855 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
2856 string[n++] = ch; 3549 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3550 }
3551
2859 string[n++] = '\0'; 3552 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3553
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3554 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3555
2864 return s; 3556 return (unsigned char *)rxvt_wcstombs (string);
2865} 3557}
2866 3558
2867/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
2868/* 3560/*
2869 * 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)'
2870 */ 3562 */
2871void 3563void
2872rxvt_term::process_dcs_seq () 3564rxvt_term::process_dcs_seq ()
2873{ 3565{
2874 unsigned char eh, *s; 3566 unsigned char *s;
3567 unicode_t eh;
3568
2875 /* 3569 /*
2876 * Not handled yet 3570 * Not handled yet
2877 */ 3571 */
2878 s = get_to_st (&eh); 3572 s = get_to_st (eh);
2879 if (s) 3573 if (s)
2880 free (s); 3574 free (s);
3575
2881 return; 3576 return;
2882} 3577}
2883 3578
2884/*----------------------------------------------------------------------*/ 3579/*----------------------------------------------------------------------*/
2885/* 3580/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3581 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3582 */
2888void 3583void
2889rxvt_term::process_osc_seq () 3584rxvt_term::process_osc_seq ()
2890{ 3585{
2891 unsigned char ch, eh, *s; 3586 unicode_t ch, eh;
2892 int arg; 3587 int arg;
2893 3588
2894 ch = cmd_getc (); 3589 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3590 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3591 arg = arg * 10 + (ch - '0');
2897 3592
2898 if (ch == ';') 3593 if (ch == ';')
2899 { 3594 {
2900 s = get_to_st (&eh); 3595 unsigned char *s = get_to_st (eh);
3596
2901 if (s) 3597 if (s)
2902 { 3598 {
2903 /*
2904 * rxvt_menubar_dispatch () violates the constness of the string,
2905 * so do it here
2906 */
2907 if (arg == XTerm_Menu)
2908#if 0 /* XXX: currently disabled due to security concerns */
2909 menubar_dispatch ((char *)s);
2910#else
2911 (void)0;
2912#endif
2913 else
2914 xterm_seq (arg, (char *)s, eh); 3599 process_xterm_seq (arg, (char *)s, eh);
2915 free (s); 3600 free (s);
2916 } 3601 }
2917 } 3602 }
2918} 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
2919/* 3618/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title 3620 * 0 = change iconName/title
2922 * 1 = change iconName 3621 * 1 = change iconName
2923 * 2 = change title 3622 * 2 = change title
2924 * 4 = change color 3623 * 4 = change color
3624 * 10 = change fg color
3625 * 11 = change bg color
2925 * 12 = change text color 3626 * 12 = change text color
2926 * 13 = change mouse foreground color 3627 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour 3628 * 17 = change highlight character colour
2928 * 18 = change bold character color 3629 * 18 = change bold character color
2929 * 19 = change underlined character color 3630 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented) 3631 * 46 = change logfile (not implemented)
2931 * 50 = change font 3632 * 50 = change font
2932 * 3633 *
2933 * rxvt extensions: 3634 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap 3635 * 20 = bg pixmap
2936 * 39 = change default fg color 3636 * 39 = change default fg color
2937 * 49 = change default bg color 3637 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen 3638 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale 3639 * 701 = change locale
2940 * 702 = find font 3640 * 702 = find font
3641 * 703 = menu
2941 */ 3642 */
2942void 3643void
2943rxvt_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)
2944{ 3645{
2945 int changed = 0; 3646 int changed = 0;
2946 int color; 3647 int color;
2947 char *buf, *name; 3648 char *buf, *name;
3649 bool query = str[0] == '?' && !str[1];
3650 int saveop = op;
3651 dDisp;
2948 3652
2949 assert (str != NULL); 3653 assert (str != NULL);
2950 switch (op) 3654 switch (op)
2951 { 3655 {
2952 case XTerm_name: 3656 case XTerm_name:
2953 set_title (str); 3657 set_title (str);
2954 /* FALLTHROUGH */ 3658 /* FALLTHROUGH */
2955 case XTerm_iconName: 3659 case XTerm_iconName:
2956 set_iconName (str); 3660 set_icon_name (str);
2957 break; 3661 break;
2958 case XTerm_title: 3662 case XTerm_title:
2959 set_title (str); 3663 set_title (str);
2960 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
2961 case XTerm_Color: 3704 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3705 for (buf = (char *)str; buf && *buf;)
2963 { 3706 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3707 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3708 break;
3709
2966 *name++ = '\0'; 3710 *name++ = '\0';
2967 color = atoi (buf); 3711 color = atoi (buf);
3712
2968 if (color < 0 || color >= TOTAL_COLORS) 3713 if (color < 0 || color >= TOTAL_COLORS)
2969 break; 3714 break;
3715
2970 if ((buf = STRCHR (name, ';')) != NULL) 3716 if ((buf = strchr (name, ';')) != NULL)
2971 *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
2972 set_window_color (color + minCOLOR, name); 3726 set_window_color (color + minCOLOR, name);
2973 } 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);
2974 break; 3734 break;
2975#ifndef NO_CURSORCOLOR 3735#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3736 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3737 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3738 break;
2979#endif 3739#endif
2980 case XTerm_Color_pointer: 3740 case XTerm_Color_pointer_fg:
2981 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);
2982 break; 3745 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3746#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD: 3747 case XTerm_Color_BD:
2985 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);
2986 break; 3752 break;
2987 case XTerm_Color_UL: 3753 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str); 3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2989 break; 3755 break;
2990 case XTerm_Color_RV: 3756 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3758 break;
2993#endif 3759#endif
2994 3760#if TRANSPARENT && TINTING
2995 case XTerm_Menu: 3761 case XTerm_Color_tint:
2996 /* 3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
2997 * rxvt_menubar_dispatch () violates the constness of the string, 3763 check_our_parents ();
2998 * so DON'T do it here 3764 if (am_transparent)
2999 */ 3765 want_full_refresh = want_refresh = 1;
3000 break; 3766 break;
3767#endif
3768
3001 case XTerm_Pixmap: 3769 case XTerm_Pixmap:
3002 if (*str != ';') 3770 if (*str != ';')
3003 { 3771 {
3004#if XPM_BACKGROUND 3772#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3773 scale_pixmap (""); /* reset to default scaling */
3006 set_bgPixmap (str); /* change pixmap */ 3774 set_bgPixmap (str); /* change pixmap */
3007#endif 3775#endif
3008 scr_touch (true); 3776 scr_touch (true);
3009 } 3777 }
3010 while ((str = STRCHR (str, ';')) != NULL) 3778 while ((str = strchr (str, ';')) != NULL)
3011 { 3779 {
3012 str++; 3780 str++;
3013#if XPM_BACKGROUND 3781#if XPM_BACKGROUND
3014 changed += scale_pixmap (str); 3782 changed += scale_pixmap (str);
3015#endif 3783#endif
3016
3017 } 3784 }
3785
3018 if (changed) 3786 if (changed)
3019 { 3787 {
3020#ifdef XPM_BACKGROUND 3788#ifdef XPM_BACKGROUND
3021 resize_pixmap (); 3789 resize_pixmap ();
3022#endif 3790#endif
… …
3028 set_window_color (Color_fg, str); 3796 set_window_color (Color_fg, str);
3029 break; 3797 break;
3030 case XTerm_restoreBG: 3798 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str); 3799 set_window_color (Color_bg, str);
3032 break; 3800 break;
3801
3033 case XTerm_logfile: 3802 case XTerm_logfile:
3803 // TODO, when secure mode?
3034 break; 3804 break;
3805
3035 case XTerm_font: 3806 case XTerm_font:
3036 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 }
3037 break; 3827 break;
3038#ifndef NO_FRILLS 3828
3829#if ENABLE_FRILLS
3039 case XTerm_locale: 3830 case XTerm_locale:
3040 if (str[0] == '?' && !str[1]) 3831 if (query)
3041 tt_printf ("%-.250s\n", locale); 3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3042 else 3833 else
3043 { 3834 {
3044 set_locale (str); 3835 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8);
3045# ifdef USE_XIM 3837# ifdef USE_XIM
3046 im_cb (); 3838 im_cb ();
3047# endif 3839# endif
3048 } 3840 }
3049 break; 3841 break;
3842#endif
3843
3844#ifdef MENUBAR
3050 case XTerm_findfont: 3845 case XTerm_Menu:
3051 { 3846 if (options & Opt_insecure)
3052 int fid = TermWin.fontset->find_font (atoi (str)); 3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break; 3848 break;
3056#endif 3849#endif
3057#if 0 3850#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3851 case XTerm_dumpscreen: /* no error notices */
3059 { 3852 {
3060 int fd; 3853 int fd;
3061 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)
3062 { 3855 {
3063 scr_dump (fd); 3856 scr_dump (fd);
3064 close (fd); 3857 close (fd);
3065 } 3858 }
3066 } 3859 }
3067 break; 3860 break;
3068#endif 3861#endif
3069
3070 } 3862 }
3071} 3863}
3072/*----------------------------------------------------------------------*/ 3864/*----------------------------------------------------------------------*/
3073 3865
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3866/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3874 * so no need for fancy checking
3083 */ 3875 */
3084int 3876int
3085rxvt_term::privcases (int mode, unsigned long bit) 3877rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3878{
3087 int state; 3879 int state;
3088 3880
3089 if (mode == 's') 3881 if (mode == 's')
3090 { 3882 {
3091 SavedModes |= (PrivateModes & bit); 3883 SavedModes |= (priv_modes & bit);
3092 return -1; 3884 return -1;
3093 } 3885 }
3094 else 3886 else
3095 { 3887 {
3096 if (mode == 'r') 3888 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3889 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 3890 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3891 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 3892 PrivMode (state, bit);
3101 } 3893 }
3894
3102 return state; 3895 return state;
3103} 3896}
3104 3897
3105/* we're not using priv _yet_ */ 3898/* we're not using priv _yet_ */
3106void 3899void
3107rxvt_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)
3108{ 3901{
3109 unsigned int i, j; 3902 unsigned int i, j;
3110 int state; 3903 int state;
3904
3111 static const struct 3905 static const struct
3112 { 3906 {
3113 const int argval; 3907 const int argval;
3114 const unsigned long bit; 3908 const unsigned long bit;
3115 } 3909 }
3910
3116 argtopriv[] = { 3911 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 3912 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 3913 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 3914 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 3915 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 3916 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 3917 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 3918 { 7, PrivMode_Autowrap },
3919 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 3920 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 3921#ifdef menuBar_esc
3126 { menuBar_esc, PrivMode_menuBar }, 3922 { menuBar_esc, PrivMode_menuBar },
3127#endif 3923#endif
3924 // 18, 19 printing-related
3925 { 25, PrivMode_VisibleCursor },
3128#ifdef scrollBar_esc 3926#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 3927 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 3928#endif
3131 { 25, PrivMode_VisibleCursor },
3132 { 35, PrivMode_ShiftKeys }, 3929 { 35, PrivMode_ShiftKeys }, // rxvt extension
3133 { 40, PrivMode_132OK }, 3930 { 40, PrivMode_132OK },
3931 // 41 xterm more fixes NYI
3932 // 45 margin bell NYI
3933 // 46 start logging
3134 { 47, PrivMode_Screen }, 3934 { 47, PrivMode_Screen },
3135 { 66, PrivMode_aplKP }, 3935 { 66, PrivMode_aplKP },
3136#ifndef NO_BACKSPACE_KEY 3936#ifndef NO_BACKSPACE_KEY
3137 { 67, PrivMode_BackSpace }, 3937 { 67, PrivMode_BackSpace },
3138#endif 3938#endif
3139 { 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
3140 { 1010, PrivMode_TtyOutputInh }, 3943 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3141 { 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
3142 { 1047, PrivMode_Screen }, 3948 { 1047, PrivMode_Screen },
3949 // 1048 save and restore cursor
3143 { 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
3144 }; 3952 };
3145 3953
3146 if (nargs == 0) 3954 if (nargs == 0)
3147 return; 3955 return;
3148 3956
… …
3163 state = privcases (mode, argtopriv[j].bit); 3971 state = privcases (mode, argtopriv[j].bit);
3164 break; 3972 break;
3165 } 3973 }
3166 3974
3167 /* extra handling for values with state unkept */ 3975 /* extra handling for values with state unkept */
3168 if (state == -1)
3169 switch (arg[i]) 3976 switch (arg[i])
3170 { 3977 {
3171 case 1048: /* alternative cursor save */ 3978 case 1048: /* alternative cursor save */
3979 case 1049:
3980 if (options & Opt_secondaryScreen)
3172 if (mode == 0) 3981 if (mode == 0)
3173 scr_cursor (RESTORE); 3982 scr_cursor (RESTORE);
3174 else if (mode == 1) 3983 else if (mode == 1)
3175 scr_cursor (SAVE); 3984 scr_cursor (SAVE);
3176 /* FALLTHROUGH */
3177 default:
3178 continue; /* for (;i;) */
3179 }
3180
3181 /* extra handling for values with valid 0 or 1 state */
3182 switch (arg[i])
3183 {
3184 /* case 1: - application cursor keys */
3185 case 2: /* VT52 mode */
3186 /* oddball mode. should be set regardless of set/reset
3187 * parameter. Return from VT52 mode with an ESC < from
3188 * within VT52 mode
3189 */
3190 PrivMode (1, PrivMode_vt52);
3191 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;
3192 case 3: /* 80/132 */ 4000 case 3: /* 80/132 */
3193 if (PrivateModes & PrivMode_132OK) 4001 if (priv_modes & PrivMode_132OK)
3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3195 break; 4003 break;
3196 case 4: /* smooth scrolling */ 4004 case 4: /* smooth scrolling */
3197 if (state) 4005 if (state)
3198 Options &= ~Opt_jumpScroll; 4006 options &= ~Opt_jumpScroll;
3199 else 4007 else
3200 Options |= Opt_jumpScroll; 4008 options |= Opt_jumpScroll;
3201 break; 4009 break;
3202 case 5: /* reverse video */ 4010 case 5: /* reverse video */
3203 scr_rvideo_mode (state); 4011 scr_rvideo_mode (state);
3204 break; 4012 break;
3205 case 6: /* relative/absolute origins */ 4013 case 6: /* relative/absolute origins */
3206 scr_relative_origin (state); 4014 scr_relative_origin (state);
3207 break; 4015 break;
3208 case 7: /* autowrap */ 4016 case 7: /* autowrap */
3209 scr_autowrap (state); 4017 scr_autowrap (state);
3210 break; 4018 break;
3211 /* 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 */
3212 case 9: /* X10 mouse reporting */ 4020 case 9: /* X10 mouse reporting */
3213 if (state) /* orthogonal */ 4021 if (state) /* orthogonal */
3214 PrivateModes &= ~ (PrivMode_MouseX11); 4022 priv_modes &= ~PrivMode_MouseX11;
3215 break; 4023 break;
3216#ifdef menuBar_esc 4024#ifdef menuBar_esc
3217 case menuBar_esc: 4025 case menuBar_esc:
3218#ifdef MENUBAR 4026#ifdef MENUBAR
3219 map_menuBar (state); 4027 map_menuBar (state);
3220#endif 4028#endif
3221 break; 4029 break;
3222#endif 4030#endif
3223#ifdef scrollBar_esc 4031#ifdef scrollBar_esc
3224 case scrollBar_esc: 4032 case scrollBar_esc:
3225 if (scrollbar_mapping (state)) 4033 if (scrollbar_mapping (state))
3226 { 4034 {
3227 resize_all_windows (0, 0, 0); 4035 resize_all_windows (0, 0, 0);
3228 scr_touch (true); 4036 scr_touch (true);
3229 } 4037 }
3230 break; 4038 break;
3231#endif 4039#endif
3232 case 25: /* visible/invisible cursor */ 4040 case 25: /* visible/invisible cursor */
3233 scr_cursor_visible (state); 4041 scr_cursor_visible (state);
3234 break; 4042 break;
3235 /* case 35: - shift keys */ 4043 /* case 35: - shift keys */
3236 /* case 40: - 80 <--> 132 mode */ 4044 /* case 40: - 80 <--> 132 mode */
3237 case 47: /* secondary screen */ 4045 case 47: /* secondary screen */
3238 scr_change_screen (state); 4046 scr_change_screen (state);
3239 break; 4047 break;
3240 /* case 66: - application key pad */ 4048 /* case 66: - application key pad */
3241 /* case 67: - backspace key */ 4049 /* case 67: - backspace key */
3242 case 1000: /* X11 mouse reporting */ 4050 case 1000: /* X11 mouse reporting */
3243 if (state) /* orthogonal */ 4051 if (state) /* orthogonal */
3244 PrivateModes &= ~ (PrivMode_MouseX10); 4052 priv_modes &= ~PrivMode_MouseX10;
3245 break; 4053 break;
3246#if 0 4054#if 0
3247 case 1001: 4055 case 1001:
3248 break; /* X11 mouse highlighting */ 4056 break; /* X11 mouse highlighting */
3249#endif 4057#endif
3250 case 1010: /* scroll to bottom on TTY output inhibit */ 4058 case 1010: /* scroll to bottom on TTY output inhibit */
3251 if (state) 4059 if (state)
3252 Options &= ~Opt_scrollTtyOutput; 4060 options &= ~Opt_scrollTtyOutput;
3253 else 4061 else
3254 Options |= Opt_scrollTtyOutput; 4062 options |= Opt_scrollTtyOutput;
3255 break; 4063 break;
3256 case 1011: /* scroll to bottom on key press */ 4064 case 1011: /* scroll to bottom on key press */
3257 if (state) 4065 if (state)
3258 Options |= Opt_scrollTtyKeypress; 4066 options |= Opt_scrollTtyKeypress;
3259 else 4067 else
3260 Options &= ~Opt_scrollTtyKeypress; 4068 options &= ~Opt_scrollTtyKeypress;
3261 break; 4069 break;
3262 case 1047: /* secondary screen w/ clearing */ 4070 case 1047: /* secondary screen w/ clearing last */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4071 if (options & Opt_secondaryScreen)
3264 if (current_screen != PRIMARY) 4072 if (current_screen != PRIMARY)
3265 scr_erase_screen (2); 4073 scr_erase_screen (2);
3266 scr_change_screen (state); 4074 scr_change_screen (state);
3267 /* FALLTHROUGH */
3268 default:
3269 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;
3270 } 4084 }
3271 } 4085 }
3272} 4086}
3273/*}}} */ 4087/*}}} */
3274 4088
3275/*{{{ process sgr sequences */ 4089/*{{{ process sgr sequences */
3276void 4090void
3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4091rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3278{ 4092{
3279 unsigned int i; 4093 unsigned int i;
3280 short rendset; 4094 short rendset;
3281 int rendstyle; 4095 int rendstyle;
3282 4096
3283 if (nargs == 0) 4097 if (nargs == 0)
3284 { 4098 {
3285 scr_rendition (0, ~RS_None); 4099 scr_rendition (0, ~RS_None);
3286 return; 4100 return;
3287 } 4101 }
4102
3288 for (i = 0; i < nargs; i++) 4103 for (i = 0; i < nargs; i++)
3289 { 4104 {
3290 rendset = -1; 4105 rendset = -1;
3291 switch (arg[i]) 4106 switch (arg[i])
3292 { 4107 {
… …
3294 rendset = 0, rendstyle = ~RS_None; 4109 rendset = 0, rendstyle = ~RS_None;
3295 break; 4110 break;
3296 case 1: 4111 case 1:
3297 rendset = 1, rendstyle = RS_Bold; 4112 rendset = 1, rendstyle = RS_Bold;
3298 break; 4113 break;
4114 //case 2: // low intensity
4115 case 3:
4116 rendset = 1, rendstyle = RS_Italic;
4117 break;
3299 case 4: 4118 case 4:
3300 rendset = 1, rendstyle = RS_Uline; 4119 rendset = 1, rendstyle = RS_Uline;
3301 break; 4120 break;
3302 case 5: 4121 case 5: // slowly blinking
4122 case 6: // rapidly blinking
3303 rendset = 1, rendstyle = RS_Blink; 4123 rendset = 1, rendstyle = RS_Blink;
3304 break; 4124 break;
4125 //case 6: // scoansi light background
3305 case 7: 4126 case 7:
3306 rendset = 1, rendstyle = RS_RVid; 4127 rendset = 1, rendstyle = RS_RVid;
3307 break; 4128 break;
3308 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)
3309 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;
3310 break; 4147 break;
3311 case 24: 4148 case 24:
3312 rendset = 0, rendstyle = RS_Uline; 4149 rendset = 0, rendstyle = RS_Uline;
3313 break; 4150 break;
3314 case 25: 4151 case 25:
3315 rendset = 0, rendstyle = RS_Blink; 4152 rendset = 0, rendstyle = RS_Blink;
3316 break; 4153 break;
4154 case 26: // variable spacing (iso 8613)
4155 rendset = 0, rendstyle = RS_Blink;
4156 break;
3317 case 27: 4157 case 27:
3318 rendset = 0, rendstyle = RS_RVid; 4158 rendset = 0, rendstyle = RS_RVid;
3319 break; 4159 break;
4160 //case 28: // visible. NYI
4161 //case 29: // not crossed-out
3320 } 4162 }
4163
3321 if (rendset != -1) 4164 if (rendset != -1)
3322 { 4165 {
3323 scr_rendition (rendset, rendstyle); 4166 scr_rendition (rendset, rendstyle);
3324 continue; /* for (;i;) */ 4167 continue; /* for (;i;) */
3325 } 4168 }
… …
3332 case 33: 4175 case 33:
3333 case 34: 4176 case 34:
3334 case 35: 4177 case 35:
3335 case 36: 4178 case 36:
3336 case 37: 4179 case 37:
3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4180 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3338 Color_fg);
3339 break; 4181 break;
3340#ifdef TTY_256COLOR 4182 case 38: // set fg color, ISO 8613-6
3341 case 38:
3342 if (nargs > i + 2 && arg[i + 1] == 5) 4183 if (nargs > i + 2 && arg[i + 1] == 5)
3343 { 4184 {
3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4185 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3345 Color_fg);
3346 i += 2; 4186 i += 2;
3347 } 4187 }
3348 break; 4188 break;
3349#endif
3350 case 39: /* default fg */ 4189 case 39: /* default fg */
3351 scr_color (Color_fg, Color_fg); 4190 scr_color (Color_fg, Color_fg);
3352 break; 4191 break;
3353 4192
3354 case 40: 4193 case 40:
… …
3357 case 43: 4196 case 43:
3358 case 44: 4197 case 44:
3359 case 45: 4198 case 45:
3360 case 46: 4199 case 46:
3361 case 47: 4200 case 47:
3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4201 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3363 Color_bg);
3364 break; 4202 break;
3365#ifdef TTY_256COLOR 4203 case 48: // set bg color, ISO 8613-6
3366 case 48:
3367 if (nargs > i + 2 && arg[i + 1] == 5) 4204 if (nargs > i + 2 && arg[i + 1] == 5)
3368 { 4205 {
3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4206 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3370 Color_bg);
3371 i += 2; 4207 i += 2;
3372 } 4208 }
3373 break; 4209 break;
3374#endif
3375 case 49: /* default bg */ 4210 case 49: /* default bg */
3376 scr_color (Color_bg, Color_bg); 4211 scr_color (Color_bg, Color_bg);
3377 break; 4212 break;
4213
4214 //case 50: // not variable spacing
3378 4215
3379#ifndef NO_BRIGHTCOLOR 4216#ifndef NO_BRIGHTCOLOR
3380 case 90: 4217 case 90:
3381 case 91: /* set bright fg color */ 4218 case 91: /* set bright fg color */
3382 case 92: 4219 case 92:
3383 case 93: 4220 case 93:
3384 case 94: 4221 case 94:
3385 case 95: 4222 case 95:
3386 case 96: 4223 case 96:
3387 case 97: 4224 case 97:
3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4225 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3389 Color_fg);
3390 break; 4226 break;
3391 case 100: 4227 case 100:
3392 case 101: /* set bright bg color */ 4228 case 101: /* set bright bg color */
3393 case 102: 4229 case 102:
3394 case 103: 4230 case 103:
3395 case 104: 4231 case 104:
3396 case 105: 4232 case 105:
3397 case 106: 4233 case 106:
3398 case 107: 4234 case 107:
3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3400 Color_bg);
3401 break; 4236 break;
3402#endif 4237#endif
3403 4238
3404 } 4239 }
3405 } 4240 }
3406} 4241}
3407/*}}} */ 4242/*}}} */
3408 4243
3409/*{{{ process Rob Nation's own graphics mode sequences */ 4244/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3410void 4245void
3411rxvt_term::process_graphics () 4246rxvt_term::process_graphics ()
3412{ 4247{
3413 unsigned char ch, cmd = cmd_getc (); 4248 unicode_t ch, cmd = cmd_getc ();
3414 4249
3415 if (cmd == 'Q') 4250 if (cmd == 'Q')
3416 { /* query graphics */ 4251 { /* query graphics */
3417 tt_printf ("\033G0\n"); /* no graphics */ 4252 tt_printf ("\033G0\012"); /* no graphics */
3418 return; 4253 return;
3419 } 4254 }
3420 /* swallow other graphics sequences until terminating ':' */ 4255 /* swallow other graphics sequences until terminating ':' */
3421 do 4256 do
3422 ch = cmd_getc (); 4257 ch = cmd_getc ();
… …
3437 unsigned char buf[256]; 4272 unsigned char buf[256];
3438 4273
3439 va_start (arg_ptr, fmt); 4274 va_start (arg_ptr, fmt);
3440 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4275 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3441 va_end (arg_ptr); 4276 va_end (arg_ptr);
3442 tt_write (buf, STRLEN (buf)); 4277 tt_write (buf, strlen (buf));
3443} 4278}
3444 4279
3445/* ---------------------------------------------------------------------- */ 4280/* ---------------------------------------------------------------------- */
3446/* 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,
3447 * or generated by us in response to a query ESC sequence. 4282 * or generated by us in response to a query ESC sequence.
3448 */ 4283 */
4284const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285
3449void 4286void
3450rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4287rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3451{ 4288{
3452 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));
3453 4292
3454 if (len) 4293 if ((unsigned int)written == len)
4294 return;
4295
4296 data += written;
4297 len -= written;
3455 { 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
3456 if (v_buflen == 0) 4316 if (v_buflen == 0)
3457 { 4317 {
3458 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3459
3460 if ((unsigned int)written == len)
3461 return;
3462
3463 data += written;
3464 len -= written;
3465 }
3466
3467
3468 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3469
3470 memcpy (v_buffer + v_buflen, data, len);
3471 v_buflen += len;
3472 }
3473
3474 for (;;)
3475 {
3476 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3477
3478 if (written > 0)
3479 {
3480 v_buflen -= written;
3481
3482 if (v_buflen == 0)
3483 {
3484 free (v_buffer); 4318 free (v_buffer);
3485 v_buffer = 0; 4319 v_buffer = 0;
3486 v_buflen = 0; 4320 v_buflen = 0;
3487 4321
3488 pty_ev.set (EVENT_READ); 4322 pty_ev.set (EVENT_READ);
3489 return;
3490 }
3491
3492 memmove (v_buffer, v_buffer + written, v_buflen);
3493 }
3494 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3495 // original code just ignores this...
3496 destroy ();
3497 else
3498 {
3499 pty_ev.set (EVENT_READ | EVENT_WRITE);
3500 return; 4323 return;
3501 } 4324 }
4325
4326 memmove (v_buffer, v_buffer + written, v_buflen);
3502 } 4327 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this...
4330 destroy ();
3503} 4331}
3504 4332
3505/*----------------------- end-of-file (C source) -----------------------*/ 4333/*----------------------- end-of-file (C source) -----------------------*/
3506 4334

Diff Legend

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