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.163 by root, Wed Aug 25 03:47:20 2004 UTC

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

Diff Legend

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