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

Diff Legend

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