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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.177 by root, Mon Dec 13 07:18:52 2004 UTC

… …
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#include <wchar.h>
54#include <signal.h>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
56 57
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 59
59// exception thrown when the command parser runs out of input data 60// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 61class out_of_input { } out_of_input;
62
63#if ENABLE_FRILLS || ISO_14755
64
65#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1)
67#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
68#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
69#define ISO_14755_MASK 0x0fffffffUL
70
71#if ISO_14755
72static unsigned short iso14755_symtab[] = {
73 // keysym, unicode
74 XK_Left, 0x2190,
75 XK_KP_Left, 0x2190,
76 XK_Up, 0x2191,
77 XK_KP_Up, 0x2191,
78 XK_Right, 0x2192,
79 XK_KP_Right, 0x2192,
80 XK_Down, 0x2193,
81 XK_KP_Down, 0x2193,
82 XK_Linefeed, 0x21b4,
83 XK_Return, 0x21b5,
84 XK_KP_Enter, 0x21b5,
85
86 XK_Prior, 0x21de,
87 XK_Next, 0x21df,
88 XK_Tab, 0x21e5,
89 XK_ISO_Left_Tab, 0x21e6,
90 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7,
92
93 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0,
101 XK_Home, 0x21f1,
102 XK_End, 0x21f2,
103
104 XK_Execute, 0x2318,
105 XK_Begin, 0x2320,
106 XK_Delete, 0x2326,
107 XK_Clear, 0x2327,
108 XK_BackSpace, 0x232b,
109 XK_Insert, 0x2380,
110 XK_Control_L, 0x2388,
111 XK_Control_R, 0x2388,
112 XK_Pause, 0x2389,
113 XK_Break, 0x238a,
114 XK_Escape, 0x238b,
115 XK_Undo, 0x238c,
116 XK_Print, 0x2399,
117
118 XK_space, 0x2423,
119 XK_KP_Space, 0x2422,
120 0,
121};
122
123void
124rxvt_term::iso14755_54 (int x, int y)
125{
126 x = Pixel2Col (x);
127 y = Pixel2Row (y);
128
129 if (x < 0 || x >= TermWin.ncol
130 || y < 0 || y >= TermWin.nrow)
131 return;
132
133 for (;;)
134 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
136
137 if (t != NOCHAR || !x)
138 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54;
142 break;
143 }
144
145 x--;
146 }
147
148}
149#endif
150
151#if ENABLE_OVERLAY
152void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{
155 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2;
158 int len;
159
160#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch))
162 {
163 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr);
166 }
167 else
168#endif
169 {
170 ch2 = ch;
171
172 alloc = 0;
173 chr = &ch2;
174 len = 1;
175 }
176
177 int width = strlen (f->name);
178
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182
183 for (int y = 0; y < len; y++)
184 {
185 char buf[9];
186
187 ch = *chr++;
188
189 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '=');
192#if !UNICODE3
193 if (ch >= 0x10000)
194 ch = 0xfffd;
195#endif
196 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r);
198 }
199
200 scr_overlay_set (0, len, f->name);
201
202#if ENABLE_COMBINING
203 if (alloc)
204 delete [] alloc;
205#endif
206}
207#endif
208
209void
210rxvt_term::commit_iso14755 ()
211{
212 wchar_t ch[2];
213
214 ch[0] = iso14755buf & ISO_14755_MASK;
215 ch[1] = 0;
216
217 if (iso14755buf & ISO_14755_51)
218 {
219 char mb[16];
220 int len;
221
222 // allow verbatim 0-bytes and control-bytes to be entered
223 if (ch[0] >= 0x20)
224 len = wcstombs (mb, ch, 16);
225 else
226 {
227 mb[0] = ch[0];
228 len = 1;
229 }
230
231 if (len > 0)
232 tt_write ((unsigned char *)mb, len);
233 else
234 scr_bell ();
235 }
236
237 iso14755buf = 0;
238}
239
240int
241rxvt_term::hex_keyval (XKeyEvent &ev)
242{
243 // check wether this event corresponds to a hex digit
244 // if the modifiers had not been pressed.
245 for (int index = 0; index < 8; index++)
246 {
247 KeySym k = XLookupKeysym (&ev, index);
248
249 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
250 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
251 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
252 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
253 }
254
255 return -1;
256}
257#endif
61 258
62/*{{{ Convert the keypress event into a string */ 259/*{{{ Convert the keypress event into a string */
63void 260void
64rxvt_term::lookup_key (XKeyEvent &ev) 261rxvt_term::lookup_key (XKeyEvent &ev)
65{ 262{
… …
151 { 348 {
152 if (TermWin.saveLines) 349 if (TermWin.saveLines)
153 { 350 {
154#ifdef UNSHIFTED_SCROLLKEYS 351#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 352 if (!ctrl && !meta)
156 {
157#else 353#else
158 if (IS_SCROLL_MOD) 354 if (IS_SCROLL_MOD)
355#endif
159 { 356 {
160#endif
161 int lnsppg; 357 int lnsppg;
162 358
163#ifdef PAGING_CONTEXT_LINES 359#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 361#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 411 {
216 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
218 } 414 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 416 {
221 switch (keysym) 417 switch (keysym)
222 { 418 {
223 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
226 return; 422 return;
423#if TODO
227 /* rxvt extras */ 424 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 426 change_font (FONT_UP);
230 return; 427 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 429 change_font (FONT_DN);
233 return; 430 return;
431#endif
234 } 432 }
235 } 433 }
236 } 434 }
435
436#if ENABLE_FRILLS || ISO_14755
437 // ISO 14755 support
438 if (shft && ctrl)
439 {
440 int hv;
441
442 if (iso14755buf & ISO_14755_51
443 && (keysym == XK_space || keysym == XK_KP_Space
444 || keysym == XK_Return || keysym == XK_KP_Enter))
445 {
446 commit_iso14755 ();
447 iso14755buf = ISO_14755_51;
448# if ISO_14755
449 iso14755_51 (0);
450# endif
451 return;
452 }
453 else if ((hv = hex_keyval (ev)) >= 0)
454 {
455 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
456 | hv | ISO_14755_51;
457# if ISO_14755
458 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif
460 return;
461 }
462 else
463 {
464# if ENABLE_OVERLAY
465 scr_overlay_off ();
466# endif
467 iso14755buf = 0;
468 }
469 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED))
473 {
474 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif
479 }
480#endif
481
237#ifdef PRINTPIPE 482#ifdef PRINTPIPE
238 if (keysym == XK_Print) 483 if (keysym == XK_Print)
239 { 484 {
240 scr_printscreen (ctrl | shft); 485 scr_printscreen (ctrl | shft);
241 return; 486 return;
… …
273 newlen = 1; 518 newlen = 1;
274 switch (keysym) 519 switch (keysym)
275 { 520 {
276#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 522 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
279 { 524 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
283 } 528 }
284 else 529 else
285 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
286 break; 531 break;
287#endif 532#endif
288#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
289 case XK_Delete: 534 case XK_Delete:
290 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
291 break; 536 break;
292#endif 537#endif
293 case XK_Tab: 538 case XK_Tab:
294 if (shft) 539 if (shft)
295 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
296 else 541 else
297 { 542 {
298#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 544 if (ctrl)
300 meta = 1; 545 meta = 1;
… …
306 newlen = 0; 551 newlen = 0;
307 } 552 }
308 break; 553 break;
309 554
310#ifdef XK_KP_Left 555#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 561 {
317 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 564 break;
320 } 565 }
321 else 566 else
322 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
325#endif 570#endif
326 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 577 /* do Shift first */
333 if (shft) 578 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 580 else if (ctrl)
336 { 581 {
337 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 584 }
340 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
342 break; 587 break;
343 588
344#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
346 case XK_KP_Prior: 591 case XK_KP_Prior:
347 /* allow shift to override */ 592 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 594 {
350 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
351 break; 596 break;
352 } 597 }
353 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
354# endif 599# endif
355 case XK_Prior: 600 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
357 break; 602 break;
358# ifdef XK_KP_Next 603# ifdef XK_KP_Next
359 case XK_KP_Next: 604 case XK_KP_Next:
360 /* allow shift to override */ 605 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 607 {
363 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
364 break; 609 break;
365 } 610 }
366 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
367# endif 612# endif
368 case XK_Next: 613 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
370 break; 615 break;
371#endif 616#endif
372 case XK_KP_Enter: 617 case XK_KP_Enter:
373 /* allow shift to override */ 618 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 620 {
376 STRCPY (kbuf, "\033OM"); 621 strcpy (kbuf, "\033OM");
622 break;
623 }
624
625 /* FALLTHROUGH */
626
627 case XK_Return:
628 if (priv_modes & PrivMode_LFNL)
629 {
630 kbuf[0] = '\015';
631 kbuf[1] = '\012';
632 kbuf[2] = '\0';
377 } 633 }
378 else 634 else
379 { 635 {
380 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
382 } 638 }
383 break; 639 break;
384 640
385#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
386 case XK_KP_Begin: 642 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
388 break; 644 break;
389 645
390 case XK_KP_Insert: 646 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
392 break; 648 break;
393 649
394 case XK_KP_Delete: 650 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
396 break; 652 break;
397#endif 653#endif
398 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
404 break; 660 break;
405 661
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 678 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 680 {
425 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 683 }
428 else 684 else
429 { 685 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
432 } 688 }
433 break; 689 break;
434 690
435 case XK_Find: 691 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
437 break; 693 break;
438 case XK_Insert: 694 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
440 break; 696 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 698 case DXK_Remove:
443 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
444#endif 700#endif
445 case XK_Execute: 701 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
447 break; 703 break;
448 case XK_Select: 704 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
450 break; 706 break;
451#ifdef XK_KP_End 707#ifdef XK_KP_End
452 case XK_KP_End: 708 case XK_KP_End:
453 /* allow shift to override */ 709 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 711 {
456 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
457 break; 713 break;
458 } 714 }
459 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
460#endif 716#endif
461 case XK_End: 717 case XK_End:
462 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
463 break; 719 break;
464#ifdef XK_KP_Home 720#ifdef XK_KP_Home
465 case XK_KP_Home: 721 case XK_KP_Home:
466 /* allow shift to override */ 722 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 724 {
469 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
470 break; 726 break;
471 } 727 }
472 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
473#endif 729#endif
474 case XK_Home: 730 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
476 break; 732 break;
477 733
478#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 736
… …
533 default: 789 default:
534 newlen = 0; 790 newlen = 0;
535 break; 791 break;
536 } 792 }
537 if (newlen) 793 if (newlen)
538 len = STRLEN (kbuf); 794 len = strlen (kbuf);
539 } 795 }
540 796
541 /* 797 /*
542 * Pass meta for all function keys, if 'meta' option set 798 * Pass meta for all function keys, if 'meta' option set
543 */ 799 */
… …
571 } 827 }
572 828
573 if (len <= 0) 829 if (len <= 0)
574 return; /* not mapped */ 830 return; /* not mapped */
575 831
576 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 833 if (TermWin.view_start)
578 { 834 {
579 TermWin.view_start = 0; 835 TermWin.view_start = 0;
580 want_refresh = 1; 836 want_refresh = 1;
581 } 837 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 886 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 888
633 if (n > 0 && s < count) 889 if (n > 0 && s < count)
634 { 890 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
639 s += n; 895 s += n;
640 } 896 }
… …
655#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
656 912
657void 913void
658rxvt_term::flush () 914rxvt_term::flush ()
659{ 915{
916 flush_ev.stop ();
917
660#ifdef TRANSPARENT 918#ifdef TRANSPARENT
661 if (want_full_refresh) 919 if (want_full_refresh)
662 { 920 {
663 want_full_refresh = 0; 921 want_full_refresh = 0;
664 scr_clear (); 922 scr_clear ();
665 scr_touch (false); 923 scr_touch (false);
666 want_refresh = 1;
667 } 924 }
668#endif 925#endif
669 926
670 if (want_refresh) 927 if (want_refresh)
671 { 928 {
… …
675 IMSendSpot (); 932 IMSendSpot ();
676#endif 933#endif
677 } 934 }
678 935
679 display->flush (); 936 display->flush ();
680
681 flush_ev.stop ();
682} 937}
683 938
684void 939void
685rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
686{ 941{
687 SET_R (this); 942 SET_R (this);
688 SET_LOCALE (locale); 943 SET_LOCALE (locale);
689 944
690 display->flush (); 945 display->flush ();
691 946
692 if (!flush_ev.active) 947 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 948 flush_ev.start (NOW + 0.01);
694} 949}
695 950
696void 951void
697rxvt_term::flush_cb (time_watcher &w) 952rxvt_term::flush_cb (time_watcher &w)
… …
784 1039
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
788 1043
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
790 1045
791 if (n > 0) 1046 if (n > 0)
792 { 1047 {
793 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
794 return true; 1049 return true;
… …
803rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1059{
805 SET_R (this); 1060 SET_R (this);
806 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
807 1062
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1063 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1064 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1065 while (pty_fill ())
813 if (cmd_parse ()) 1066 if (cmd_parse ())
814 break; 1067 break;
1068
1069 if (revents & EVENT_WRITE)
1070 pty_write ();
815} 1071}
816 1072
817void 1073void
818rxvt_term::pointer_unblank () 1074rxvt_term::pointer_unblank ()
819{ 1075{
… …
821 recolour_cursor (); 1077 recolour_cursor ();
822 1078
823#ifdef POINTER_BLANK 1079#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1080 hidden_pointer = 0;
825 1081
826 if (Options & Opt_pointerBlank) 1082 if (options & Opt_pointerBlank)
827 pointer_ev.start (NOW + pointerBlankDelay); 1083 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1084#endif
829} 1085}
830 1086
831#ifdef POINTER_BLANK 1087#ifdef POINTER_BLANK
832void 1088void
833rxvt_term::pointer_blank () 1089rxvt_term::pointer_blank ()
834{ 1090{
835 if (! (Options & Opt_pointerBlank)) 1091 if (! (options & Opt_pointerBlank))
836 return; 1092 return;
837 1093
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1094 XDefineCursor (display->display, TermWin.vt, blank_cursor);
839 XFlush (display->display); 1095 XFlush (display->display);
840 1096
… …
860 x = ev.x; 1116 x = ev.x;
861 y = ev.y; 1117 y = ev.y;
862 pixel_position (&x, &y); 1118 pixel_position (&x, &y);
863 1119
864 if (MEvent.button == AnyButton) 1120 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1121 button_number = 3;
867 }
868 else 1122 else
869 { 1123 {
870 button_number = MEvent.button - Button1; 1124 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1125 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1126 if (button_number >= 3)
873 button_number += (64 - 3); 1127 button_number += (64 - 3);
874 } 1128 }
875 1129
876 if (PrivateModes & PrivMode_MouseX10) 1130 if (priv_modes & PrivMode_MouseX10)
877 { 1131 {
878 /* 1132 /*
879 * do not report ButtonRelease 1133 * do not report ButtonRelease
880 * no state info allowed 1134 * no state info allowed
881 */ 1135 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1150 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1151 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1152#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1153 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1154#endif
901
902 } 1155 }
903 1156
904#ifdef DEBUG_MOUSEREPORT 1157#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1158 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1159 if (key_state & 16)
907 fputc ('C', stderr); 1160 fputc ('C', stderr);
908 if (key_state & 4) 1161 if (key_state & 4)
909 fputc ('S', stderr); 1162 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1166 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1167 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1168 button_number,
916 x + 1, 1169 x + 1,
917 y + 1); 1170 y + 1);
918#else 1171#endif
1172
919 tt_printf ("\033[M%c%c%c", 1173 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1174 (32 + button_number + key_state),
921 (32 + x + 1), 1175 (32 + x + 1),
922 (32 + y + 1)); 1176 (32 + y + 1));
923#endif
924} 1177}
925 1178
926#ifdef USING_W11LIB 1179#ifdef USING_W11LIB
927void 1180void
928rxvt_W11_process_x_event (XEvent *ev) 1181rxvt_W11_process_x_event (XEvent *ev)
… …
939{ 1192{
940 SET_R (this); 1193 SET_R (this);
941 SET_LOCALE (locale); 1194 SET_LOCALE (locale);
942 1195
943#if defined(CURSOR_BLINK) 1196#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
945 { 1198 {
946 if (hidden_cursor) 1199 if (hidden_cursor)
947 { 1200 {
948 hidden_cursor = 0; 1201 hidden_cursor = 0;
949 want_refresh = 1; 1202 want_refresh = 1;
… …
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 } 1206 }
954#endif 1207#endif
955 1208
956#if defined(POINTER_BLANK) 1209#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 { 1211 {
959 if (ev.type == MotionNotify 1212 if (ev.type == MotionNotify
960 || ev.type == ButtonPress 1213 || ev.type == ButtonPress
961 || ev.type == ButtonRelease) 1214 || ev.type == ButtonRelease)
962 if (hidden_pointer) 1215 if (hidden_pointer)
… …
965 if (ev.type == KeyPress && hidden_pointer == 0) 1218 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank (); 1219 pointer_blank ();
967 } 1220 }
968#endif 1221#endif
969 1222
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
975 Window unused_root, unused_child; 1223 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1224 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1225 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 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));
1026#endif
1027 1226
1028 switch (ev.type) 1227 switch (ev.type)
1029 { 1228 {
1030 case KeyPress: 1229 case KeyPress:
1230#if ISO_14755
1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
1031 lookup_key (ev.xkey); 1233 lookup_key (ev.xkey);
1234
1235 break;
1236
1237 case KeyRelease:
1238 {
1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1240 KeySym ks;
1241
1242 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1243#endif
1244
1245#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 support
1247 if (iso14755buf)
1248 if (iso14755buf & ISO_14755_52)
1249 {
1250# if ENABLE_OVERLAY
1251 scr_overlay_off ();
1252# endif
1253# if ISO_14755
1254 // iso14755 part 5.2 handling: release time
1255 // first: controls
1256 if ((ev.xkey.state & ControlMask)
1257 && ((ks >= 0x40 && ks <= 0x5f)
1258 || (ks >= 0x61 && ks <= 0x7f)))
1259 {
1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1261 commit_iso14755 ();
1262 return; // case-break;
1263 }
1264
1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1266 if (i[0] == ks)
1267 {
1268 iso14755buf = ISO_14755_51 | i[1];
1269 commit_iso14755 ();
1270 return; // case-break;
1271 }
1272
1273 scr_bell ();
1274# endif
1275 iso14755buf = 0;
1032 break; 1276 break;
1277 }
1278 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1279 {
1280# if ENABLE_OVERLAY
1281 scr_overlay_off ();
1282# endif
1283 if (iso14755buf & ISO_14755_51)
1284 commit_iso14755 ();
1285#if ISO_14755
1286 else if (iso14755buf & ISO_14755_STARTED)
1287 {
1288 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1289
1290 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1291 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1292 }
1293# endif
1294 else
1295 iso14755buf = 0;
1296 }
1297#endif
1033 1298
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1300 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1301 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R) 1302 else if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1303 mouse_slip_wheel_speed = 0;
1046 } 1304#endif
1047 break; 1305 break;
1048 } 1306 }
1049#endif
1050 1307
1051 case ButtonPress: 1308 case ButtonPress:
1052 button_press (ev.xbutton); 1309 button_press (ev.xbutton);
1053 break; 1310 break;
1054 1311
… …
1078 0L, 1000000L, 1335 0L, 1000000L,
1079 False, AnyPropertyType, 1336 False, AnyPropertyType,
1080 &ActualType, &ActualFormat, 1337 &ActualType, &ActualFormat,
1081 &Size, &RemainingBytes, 1338 &Size, &RemainingBytes,
1082 &data); 1339 &data);
1083 XChangeProperty (display->display, display->root, 1340 set_string_property (XA_CUT_BUFFER0, data);
1084 XA_CUT_BUFFER0, XA_STRING,
1085 8, PropModeReplace,
1086 data, STRLEN (data));
1087 XFree (data); 1341 XFree (data);
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1342 selection_paste (display->root, XA_CUT_BUFFER0, true);
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1090 } 1344 }
1091#endif /* OFFIX_DND */ 1345#endif /* OFFIX_DND */
1092 break; 1346 break;
1093 1347
… …
1125 { 1379 {
1126 TermWin.focus = 1; 1380 TermWin.focus = 1;
1127 want_refresh = 1; 1381 want_refresh = 1;
1128#ifdef USE_XIM 1382#ifdef USE_XIM
1129 if (Input_Context != NULL) 1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1130 XSetICFocus (Input_Context); 1386 XSetICFocus (Input_Context);
1387 }
1131#endif 1388#endif
1132#ifdef CURSOR_BLINK 1389#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink) 1390 if (options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif 1392#endif
1136#ifdef OFF_FOCUS_FADING 1393#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade]) 1394 if (rs[Rs_fade])
1138 { 1395 {
1139 PixColors = PixColorsFocused; 1396 pix_colors = pix_colors_focused;
1140 set_colorfgbg ();
1141 scr_clear (); 1397 scr_recolour ();
1142 scr_touch (true);
1143 } 1398 }
1144#endif 1399#endif
1145 1400
1146 } 1401 }
1147 break; 1402 break;
… …
1149 case FocusOut: 1404 case FocusOut:
1150 if (TermWin.focus) 1405 if (TermWin.focus)
1151 { 1406 {
1152 TermWin.focus = 0; 1407 TermWin.focus = 0;
1153 want_refresh = 1; 1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1154#ifdef USE_XIM 1416#ifdef USE_XIM
1155 if (Input_Context != NULL) 1417 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context); 1418 XUnsetICFocus (Input_Context);
1157#endif 1419#endif
1158#ifdef CURSOR_BLINK 1420#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink) 1421 if (options & Opt_cursorBlink)
1160 cursor_blink_ev.stop (); 1422 cursor_blink_ev.stop ();
1161 hidden_cursor = 0; 1423 hidden_cursor = 0;
1162#endif 1424#endif
1163#ifdef OFF_FOCUS_FADING 1425#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade]) 1426 if (rs[Rs_fade])
1165 { 1427 {
1166 PixColors = PixColorsUnFocused; 1428 pix_colors = pix_colors_unfocused;
1167 set_colorfgbg ();
1168 scr_clear (); 1429 scr_recolour ();
1169 scr_touch (true);
1170 } 1430 }
1171#endif 1431#endif
1172
1173 } 1432 }
1174 break; 1433 break;
1175 1434
1176 case ConfigureNotify: 1435 case ConfigureNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1436 if (ev.xconfigure.window == TermWin.parent[0])
… …
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 } 1445 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188 1447
1189 if (szHint.width != width || szHint.height != height) 1448 if (szHint.width != width || szHint.height != height)
1449 {
1450 seen_resize = 1;
1190 resize_all_windows (width, height, 1); 1451 resize_all_windows (width, height, 1);
1452 }
1191 1453
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent) 1455 if (options & Opt_transparent)
1194 {
1195 check_our_parents (); 1456 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif 1457#endif
1200 } 1458 }
1459 break;
1460
1461 case PropertyNotify:
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465
1201 break; 1466 break;
1202 1467
1203 case SelectionClear: 1468 case SelectionClear:
1204 selection_clear (); 1469 selection_clear ();
1205 break; 1470 break;
1206 1471
1207 case SelectionNotify: 1472 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1475 break;
1212 1476
1213 case SelectionRequest: 1477 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1215 break; 1479 break;
… …
1287 { 1551 {
1288 menubar_control (ev.xbutton); 1552 menubar_control (ev.xbutton);
1289 break; 1553 break;
1290 } 1554 }
1291#endif 1555#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1293 break; 1557 break;
1294 1558
1295 if (ev.xany.window == TermWin.vt) 1559 if (ev.xany.window == TermWin.vt)
1296 { 1560 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1561 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1562 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1300 ; 1564 ;
1301 1565
1302 XQueryPointer (display->display, TermWin.vt, 1566 XQueryPointer (display->display, TermWin.vt,
1303 &unused_root, &unused_child, 1567 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1568 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1569 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1570 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1571#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1572 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1573 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1574 {
1311#endif 1575#endif
1576#if ISO_14755
1577 // 5.4
1578 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1579 {
1580 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1581 break;
1582 }
1583#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1584 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1585 ev.xbutton.state & Button3Mask ? 2 : 0);
1586
1314#ifdef SELECTION_SCROLLING 1587#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1588 if (ev.xbutton.y < TermWin.int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1317 { 1590 {
1318 int dist; 1591 int dist;
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1597 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1598
1326 /* save the event params so we can highlight 1599 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1600 * the selection in the pending-scroll loop
1328 */ 1601 */
1329 selection_save_x=ev.xbutton.x; 1602 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1603 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1605
1334 /* calc number of lines to scroll */ 1606 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1607 if (ev.xbutton.y < TermWin.int_bwidth)
1336 { 1608 {
1337 scroll_selection_dir = UP; 1609 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1610 dist = TermWin.int_bwidth - ev.xbutton.y;
1339 } 1611 }
1340 else 1612 else
1341 { 1613 {
1342 scroll_selection_dir = DN; 1614 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y -
1344 (TermWin.int_bwidth + TermWin.height); 1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1345 } 1616 }
1617
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1618 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1619 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1;
1348 MIN_IT (scroll_selection_lines, 1621 MIN_IT (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1622 SELECTION_SCROLL_MAX_LINES);
1350 } 1623 }
1351 else 1624 else
1352 { 1625 {
1353 /* we are within the text window, so we 1626 /* we are within the text window, so we
1354 * shouldn't be scrolling 1627 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1629 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1358 } 1631 }
1359#endif 1632#endif
1360#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1361
1362 } 1634 }
1363#endif 1635#endif
1364
1365 } 1636 }
1366 } 1637 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1639 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1370 MotionNotify, &ev)) ; 1641 MotionNotify, &ev))
1642 ;
1643
1371 XQueryPointer (display->display, scrollBar.win, 1644 XQueryPointer (display->display, scrollBar.win,
1372 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1647 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1648 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1650 scrollbar_size ());
1378 scr_refresh (refresh_type); 1651 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1652 refresh_limit = 0;
… …
1381 } 1654 }
1382 break; 1655 break;
1383 } 1656 }
1384} 1657}
1385 1658
1659#if TRANSPARENT
1386void 1660void
1387rxvt_term::rootwin_cb (XEvent &ev) 1661rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1662{
1389 SET_R (this); 1663 SET_R (this);
1390 SET_LOCALE (locale); 1664 SET_LOCALE (locale);
1391 1665
1392 switch (ev.type) 1666 switch (ev.type)
1393 { 1667 {
1394 case PropertyNotify: 1668 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1669 /*
1405 * if user used some Esetroot compatible prog to set the root bg, 1670 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on. 1671 * use the property to determine the pixmap. We use it later on.
1407 */ 1672 */
1408 if (xa[XA_XROOTPMAPID] == 0) 1673 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410 1675
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1412 return; 1677 return;
1413 }
1414 1678
1415 /* FALLTHROUGH */ 1679 /* FALLTHROUGH */
1416 case ReparentNotify: 1680 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1682 want_refresh = want_full_refresh = 1;
1419 break; 1683 break;
1420#endif
1421 } 1684 }
1422} 1685}
1686#endif
1423 1687
1424void 1688void
1425rxvt_term::button_press (XButtonEvent &ev) 1689rxvt_term::button_press (XButtonEvent &ev)
1426{ 1690{
1427 int reportmode = 0, clickintime; 1691 int reportmode = 0, clickintime;
1428 1692
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1430 if (!bypass_keystate) 1694 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1695 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696
1432 /* 1697 /*
1433 * VT window processing of button press 1698 * VT window processing of button press
1434 */ 1699 */
1435 if (ev.window == TermWin.vt) 1700 if (ev.window == TermWin.vt)
1436 { 1701 {
1702#if ISO_14755
1703 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 {
1706 iso14755_54 (ev.x, ev.y);
1707 return;
1708 }
1709#endif
1710
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1711 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1712
1438 if (reportmode) 1713 if (reportmode)
1439 { 1714 {
1440 /* mouse report from vt window */ 1715 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1716 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1717 MEvent.state = ev.state;
… …
1471 } 1746 }
1472 else 1747 else
1473 { 1748 {
1474 if (ev.button != MEvent.button) 1749 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1750 MEvent.clicks = 0;
1751
1476 switch (ev.button) 1752 switch (ev.button)
1477 { 1753 {
1478 case Button1: 1754 case Button1:
1755 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */
1757#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask);
1759#else
1760 selection.rect = false;
1761#endif
1762
1479 /* allow shift+left click to extend selection */ 1763 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1481 { 1765 {
1482 if (MEvent.button == Button1 && clickintime) 1766 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1767 selection_rotate (ev.x, ev.y);
1484 else 1768 else
1485 selection_extend (ev.x, ev.y, 1); 1769 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1784 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1785 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1786 selection_rotate (ev.x, ev.y);
1503 else 1787 else
1504 selection_extend (ev.x, ev.y, 1); 1788 selection_extend (ev.x, ev.y, 1);
1789
1505 MEvent.button = Button3; 1790 MEvent.button = Button3;
1506 break; 1791 break;
1507 } 1792 }
1508 } 1793 }
1794
1509 MEvent.time = ev.time; 1795 MEvent.time = ev.time;
1510 return; 1796 return;
1511 } 1797 }
1512 1798
1513 /* 1799 /*
… …
1605 break; 1891 break;
1606 case R_SB_ALIGN_BOTTOM: 1892 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 1893 csrO = scrollBar.bot - scrollBar.top;
1608 break; 1894 break;
1609 } 1895 }
1896
1610 if (scrollBar.style == R_SB_XTERM 1897 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 1898 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 1899 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 1900 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 1901
1615 scrollBar.setMotion (); 1902 scrollBar.setMotion ();
1616 break; 1903 break;
1617 1904
1618 case Button1: 1905 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1906 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1643 scr_page ((ev.button == Button1 ? DN : UP), 1930 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 1931 (TermWin.nrow
1645 * scrollbar_position (ev.y) 1932 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 1933 / scrollbar_size ()));
1647 } 1934 }
1935
1648 break; 1936 break;
1649 } 1937 }
1650 } 1938 }
1651 return; 1939 return;
1652 } 1940 }
… …
1664{ 1952{
1665 int reportmode = 0; 1953 int reportmode = 0;
1666 1954
1667 csrO = 0; /* reset csr Offset */ 1955 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 1956 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1957 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 1958
1671 if (scrollbar_isUpDn ()) 1959 if (scrollbar_isUpDn ())
1672 { 1960 {
1673 scrollBar.setIdle (); 1961 scrollBar.setIdle ();
1674 scrollbar_show (0); 1962 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH; 1964 refresh_type &= ~SMOOTH_REFRESH;
1677#endif 1965#endif
1678
1679 } 1966 }
1967
1680#ifdef SELECTION_SCROLLING 1968#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 1969 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 1970 sel_scroll_ev.stop();
1683#endif 1971#endif
1972
1684 if (ev.window == TermWin.vt) 1973 if (ev.window == TermWin.vt)
1685 { 1974 {
1975#if ISO_14755
1976 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return;
1979#endif
1686 if (reportmode) 1980 if (reportmode)
1687 { 1981 {
1688 /* mouse report from vt window */ 1982 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 1983 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 1984 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 1998 MEvent.button = AnyButton;
1705 mouse_report (ev); 1999 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2000#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2001 return;
1708 } 2002 }
2003
1709 /* 2004 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2005 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2006 * when overriding mouse reporting
1712 */ 2007 */
1713 if (PrivateModes & PrivMode_mouse_report 2008 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2009 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2010 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2011 selection_extend (ev.x, ev.y, 0);
1717 2012
1718 switch (ev.button) 2013 switch (ev.button)
… …
1733 2028
1734 v = ev.button == Button4 ? UP : DN; 2029 v = ev.button == Button4 ? UP : DN;
1735 2030
1736 if (ev.state & ShiftMask) 2031 if (ev.state & ShiftMask)
1737 i = 1; 2032 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2033 else if (options & Opt_mouseWheelScrollPage)
1739 i = TermWin.nrow - 1; 2034 i = TermWin.nrow - 1;
1740 else 2035 else
1741 i = 5; 2036 i = 5;
1742 2037
1743# ifdef MOUSE_SLIP_WHEELING 2038# ifdef MOUSE_SLIP_WHEELING
… …
2028 Pixmap rootpixmap = None; 2323 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2324 XWindowAttributes wattr, wrootattr;
2030 2325
2031 pchanged = 0; 2326 pchanged = 0;
2032 2327
2033 if (!(Options & Opt_transparent)) 2328 if (!(options & Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2329 return pchanged; /* Don't try any more */
2035 2330
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2331 XGetWindowAttributes (display->display, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2332 rootdepth = wrootattr.depth;
2038 2333
… …
2041 if (rootdepth != wattr.depth) 2336 if (rootdepth != wattr.depth)
2042 { 2337 {
2043 if (am_transparent) 2338 if (am_transparent)
2044 { 2339 {
2045 pchanged = 1; 2340 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2342 am_transparent = am_pixmap_trans = 0;
2048 } 2343 }
2049 2344
2050 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
2051 } 2346 }
… …
2114 sy = 0; 2409 sy = 0;
2115 } 2410 }
2116 2411
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414
2415 XSync (display->display, False);
2119 allowedxerror = -1; 2416 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2418
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2420 /* XXX: may need a delay here? */
… …
2146 if (ISSET_PIXCOLOR (Color_tint)) 2443 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2444 {
2148 unsigned short rm, gm, bm; 2445 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2446 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2447
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2448 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2152 2449
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2450 ShadeXImage (display, image, shade, rm, gm, bm);
2154 } 2451 }
2155#endif 2452#endif
2156 2453
… …
2169 2466
2170 am_transparent = am_pixmap_trans = 1; 2467 am_transparent = am_pixmap_trans = 1;
2171 } 2468 }
2172 } 2469 }
2173 2470
2174 if (!am_pixmap_trans) 2471 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2473 else
2175 { 2474 {
2176 unsigned int n; 2475 unsigned int n;
2177 /* 2476 /*
2178 * InheritPixmap transparency 2477 * InheritPixmap transparency
2179 */ 2478 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2182 { 2480 {
2183 oldp = TermWin.parent[i]; 2481 oldp = TermWin.parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2482 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n); 2483 &TermWin.parent[i], &list, &n);
2186 XFree (list); 2484 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2485
2189 if (TermWin.parent[i] == display->root) 2486 if (TermWin.parent[i] == display->root)
2190 { 2487 {
2191 if (oldp != None) 2488 if (oldp != None)
2192 pchanged = 1; 2489 pchanged = 1;
… …
2203 if (pchanged) 2500 if (pchanged)
2204 { 2501 {
2205 for (; n < (unsigned int)i; n++) 2502 for (; n < (unsigned int)i; n++)
2206 { 2503 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2506 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2212 break; 2508 break;
2213 } 2509 }
2214 } 2510 }
2215 } 2511 }
2216 2512
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2218 { 2514 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2517 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2518 /* XXX: also turn off Opt_transparent? */
2224 } 2519 }
2225 else 2520 else
2226 { 2521 {
2227#if WAIT_FOR_WM 2522#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing 2523 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */ 2524 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1); 2525 sleep (1);
2231#endif 2526#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2527 for (n = 0; n < (unsigned int)i; n++)
2234 { 2528 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2530 XClearWindow (display->display, TermWin.parent[n]);
2237 } 2531 }
… …
2242 2536
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2538 TermWin.parent[i] = None;
2245 } 2539 }
2246 2540
2247 // this is experimental
2248 if (scrollBar.win) 2541 if (scrollBar.win)
2249 { 2542 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2544 scrollBar.setIdle ();
2253 scrollbar_show (0); 2545 scrollbar_show (0);
2546 }
2547
2548 if (am_transparent)
2549 {
2550 want_refresh = want_full_refresh = 1;
2551 if (am_pixmap_trans)
2552 flush ();
2254 } 2553 }
2255 2554
2256 return pchanged; 2555 return pchanged;
2257} 2556}
2258#endif 2557#endif
… …
2277 if (ch == NOCHAR) // TODO: improve 2576 if (ch == NOCHAR) // TODO: improve
2278 break; 2577 break;
2279 2578
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 { 2580 {
2581 if (!seen_input)
2582 {
2583 seen_input = 1;
2584 // many badly-written programs (e.g. jed) contain a race condition:
2585 // they first read the screensize and then install a SIGWINCH handler.
2586 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized.
2591 if (seen_resize)
2592 kill (-cmd_pid, SIGWINCH);
2593 }
2594
2282 /* Read a text string from the input buffer */ 2595 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2596 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2597 bool refreshnow = false;
2285 int nlines = 0; 2598 int nlines = 0;
2286 unicode_t *str = buf; 2599 unicode_t *str = buf;
2287 2600
2288 *str++ = ch;
2289
2290 for (;;) 2601 for (;;)
2291 { 2602 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2604 break;
2297 2605
2298 *str++ = ch; 2606 *str++ = ch;
2299 2607
2300 if (ch == C0_LF) 2608 if (ch == C0_LF)
2301 { 2609 {
2302 nlines++; 2610 nlines++;
2303 refresh_count++; 2611 refresh_count++;
2304 2612
2305 if (! (Options & Opt_jumpScroll) 2613 if (!(options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 { 2615 {
2308 refreshnow = true; 2616 refreshnow = true;
2309 ch = NOCHAR; 2617 ch = NOCHAR;
2310 break; 2618 break;
2311 } 2619 }
2312 2620
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2622 if (nlines >= TermWin.nrow - 1)
2315 { 2623 {
2316 scr_add_lines (buf, nlines, str - buf); 2624 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0; 2625 nlines = 0;
2318 str = buf; 2626 str = buf;
… …
2322 if (str >= buf + UBUFSIZ) 2630 if (str >= buf + UBUFSIZ)
2323 { 2631 {
2324 ch = NOCHAR; 2632 ch = NOCHAR;
2325 break; 2633 break;
2326 } 2634 }
2635
2636 seq_begin = cmdbuf_ptr;
2637 ch = next_char ();
2327 } 2638 }
2328 2639
2329 scr_add_lines (buf, nlines, str - buf); 2640 scr_add_lines (buf, nlines, str - buf);
2330 2641
2331 /* 2642 /*
… …
2334 * the number of pages between refreshes is refresh_limit, which 2645 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2646 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2647 */
2337 if (refreshnow) 2648 if (refreshnow)
2338 { 2649 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2651 refresh_limit++;
2341 else 2652 else
2342 { 2653 {
2343 flag = true; 2654 flag = true;
2344 scr_refresh (refresh_type); 2655 scr_refresh (refresh_type);
… …
2534 process_escape_seq (); 2845 process_escape_seq ();
2535 break; 2846 break;
2536 case C0_ENQ: /* terminal Status */ 2847 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2848 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2540 else 2851 else
2541 tt_write ((unsigned char *)VT100_ANS, 2852 tt_write ((unsigned char *)VT100_ANS,
2542 (unsigned int)STRLEN (VT100_ANS)); 2853 (unsigned int)strlen (VT100_ANS));
2543 break; 2854 break;
2544 case C0_BEL: /* bell */ 2855 case C0_BEL: /* bell */
2545 scr_bell (); 2856 scr_bell ();
2546 break; 2857 break;
2547 case C0_BS: /* backspace */ 2858 case C0_BS: /* backspace */
… …
2646void 2957void
2647rxvt_term::process_escape_seq () 2958rxvt_term::process_escape_seq ()
2648{ 2959{
2649 unicode_t ch = cmd_getc (); 2960 unicode_t ch = cmd_getc ();
2650 2961
2651 if (PrivateModes & PrivMode_vt52) 2962 if (priv_modes & PrivMode_vt52)
2652 { 2963 {
2653 process_escape_vt52 (ch); 2964 process_escape_vt52 (ch);
2654 return; 2965 return;
2655 } 2966 }
2656 2967
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 2982 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 2983 break;
2673 case '+': 2984 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 2985 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 2986 break;
2676#ifndef NO_FRILLS 2987#if ENABLE_FRILLS
2677 case '6': 2988 case '6':
2678 scr_backindex (); 2989 scr_backindex ();
2679 break; 2990 break;
2680#endif 2991#endif
2681 case '7': 2992 case '7':
2682 scr_cursor (SAVE); 2993 scr_cursor (SAVE);
2683 break; 2994 break;
2684 case '8': 2995 case '8':
2685 scr_cursor (RESTORE); 2996 scr_cursor (RESTORE);
2686 break; 2997 break;
2687#ifndef NO_FRILLS 2998#if ENABLE_FRILLS
2688 case '9': 2999 case '9':
2689 scr_forwardindex (); 3000 scr_forwardindex ();
2690 break; 3001 break;
2691#endif 3002#endif
2692 case '=': 3003 case '=':
… …
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2992 break; 3303 break;
2993 3304
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3306 tt_write ((const unsigned char *)VT100_ANS,
2996 (unsigned int) (sizeof (VT100_ANS) - 1)); 3307 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3308 break;
2998 3309
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3311 process_sgr_mode (nargs, arg);
3001 break; 3312 break;
… …
3008 break; 3319 break;
3009 case 6: /* CPR requested */ 3320 case 6: /* CPR requested */
3010 scr_report_position (); 3321 scr_report_position ();
3011 break; 3322 break;
3012 case 7: /* unofficial extension */ 3323 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3324 if (options & Opt_insecure)
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3325 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3326 break;
3016 case 8: /* unofficial extension */ 3327 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3329 break;
3019 } 3330 }
… …
3055 break; 3366 break;
3056 3367
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3368 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3369 if (arg[0] == 4)
3059 scr_insert_mode (0); 3370 scr_insert_mode (0);
3371 else if (arg[0] == 20)
3372 priv_modes &= ~PrivMode_LFNL;
3060 break; 3373 break;
3061 3374
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3375 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3376 if (arg[0] == 4)
3064 scr_insert_mode (1); 3377 scr_insert_mode (1);
3378 else if (arg[0] == 20)
3379 priv_modes |= PrivMode_LFNL;
3065 break; 3380 break;
3066 3381
3067 /* 3382 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3383 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3384 */
… …
3081 break; 3396 break;
3082 case CSI_75: 3397 case CSI_75:
3083 scr_cursor (RESTORE); 3398 scr_cursor (RESTORE);
3084 break; 3399 break;
3085 3400
3086#ifndef NO_FRILLS 3401#if ENABLE_FRILLS
3087 case CSI_74: 3402 case CSI_74:
3088 process_window_ops (arg, nargs); 3403 process_window_ops (arg, nargs);
3089 break; 3404 break;
3090#endif 3405#endif
3091 3406
… …
3098 break; 3413 break;
3099 } 3414 }
3100} 3415}
3101/*}}} */ 3416/*}}} */
3102 3417
3103#ifndef NO_FRILLS 3418#if ENABLE_FRILLS
3104/* ARGSUSED */ 3419/* ARGSUSED */
3105void 3420void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3421rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3422{
3108 int x, y; 3423 int x, y;
… …
3175 break; 3490 break;
3176 case 19: /* report window size (chars) */ 3491 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3178 break; 3493 break;
3179 case 20: /* report icon label */ 3494 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3495 {
3182 char *s; 3496 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3497 XGetIconName (display->display, TermWin.parent[0], &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s);
3185 } 3500 }
3186 break; 3501 break;
3187 case 21: /* report window title */ 3502 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3503 {
3190 char *s; 3504 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3505 XFetchName (display->display, TermWin.parent[0], &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s);
3193 } 3508 }
3194 break; 3509 break;
3195 } 3510 }
3196} 3511}
3197#endif 3512#endif
3198 3513
… …
3202 * ends_how is terminator used. returned input must be free()'d 3517 * ends_how is terminator used. returned input must be free()'d
3203 */ 3518 */
3204unsigned char * 3519unsigned char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3520rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3521{
3207 unicode_t prev = 0, ch; 3522 unicode_t ch;
3523 bool seen_esc = false;
3208 unsigned int n = 0; 3524 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3525 wchar_t string[STRING_MAX];
3211 3526
3212 while ((ch = cmd_getc ()) != NOCHAR) 3527 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3528 {
3214 if (prev == C0_ESC) 3529 if (seen_esc)
3215 { 3530 {
3216 if (ch == 0x5c) /* 7bit ST */ 3531 if (ch == 0x5c) /* 7bit ST */
3217 break; 3532 break;
3218 else 3533 else
3219 return NULL; 3534 return NULL;
3220 } 3535 }
3536 else if (ch == C0_ESC)
3537 {
3538 seen_esc = true;
3539 continue;
3540 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3541 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3542 break;
3223 else if (ch < 0x20) 3543 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3544 return NULL; /* other control character - exit */
3545
3546 seen_esc = false;
3225 3547
3226 if (n >= sizeof (string) - 1) 3548 if (n >= sizeof (string) - 1)
3227 // stop at some sane length 3549 // stop at some sane length
3228 return NULL; 3550 return NULL;
3229 3551
3230 if (ch == C0_SYN) 3552 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3553 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3554 else
3236 string[n++] = prev = ch; 3555 string[n++] = ch;
3237 } 3556 }
3238 3557
3239 string[n++] = '\0'; 3558 string[n++] = '\0';
3240 3559
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3560 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3561
3246 return s; 3562 return (unsigned char *)rxvt_wcstombs (string);
3247} 3563}
3248 3564
3249/*----------------------------------------------------------------------*/ 3565/*----------------------------------------------------------------------*/
3250/* 3566/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3295void 3611void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{ 3613{
3298 if (str[0] == '?' && !str[1]) 3614 if (str[0] == '?' && !str[1])
3299 { 3615 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b; 3616 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b); 3617 pix_colors_focused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3618 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
3306 } 3619 }
3307 else 3620 else
3308 set_window_color (color, str); 3621 set_window_color (color, str);
3309} 3622}
3310 3623
… …
3338{ 3651{
3339 int changed = 0; 3652 int changed = 0;
3340 int color; 3653 int color;
3341 char *buf, *name; 3654 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3655 bool query = str[0] == '?' && !str[1];
3656 int saveop = op;
3343 3657
3344 assert (str != NULL); 3658 assert (str != NULL);
3345 switch (op) 3659 switch (op)
3346 { 3660 {
3347 case XTerm_name: 3661 case XTerm_name:
… …
3354 set_title (str); 3668 set_title (str);
3355 break; 3669 break;
3356 case XTerm_property: 3670 case XTerm_property:
3357 if (str[0] == '?') 3671 if (str[0] == '?')
3358 { 3672 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3673 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3674 Atom actual_type;
3361 int actual_format; 3675 int actual_format;
3362 unsigned long nitems; 3676 unsigned long nitems;
3363 unsigned long bytes_after; 3677 unsigned long bytes_after;
3364 unsigned char *value = 0; 3678 unsigned char *value = 0;
… …
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3696 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3697
3384 if (eq) 3698 if (eq)
3385 { 3699 {
3386 *eq = 0; 3700 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3701 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3702 }
3392 else 3703 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3704 XDeleteProperty (display->display, TermWin.parent[0],
3394 display->atom (str)); 3705 display->atom (str));
3395 } 3706 }
3396 break; 3707 break;
3397 3708
3398 case XTerm_Color: 3709 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3710 for (buf = (char *)str; buf && *buf;)
3400 { 3711 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3712 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3713 break;
3403 3714
3404 *name++ = '\0'; 3715 *name++ = '\0';
3405 color = atoi (buf); 3716 color = atoi (buf);
3406 3717
3407 if (color < 0 || color >= TOTAL_COLORS) 3718 if (color < 0 || color >= TOTAL_COLORS)
3408 break; 3719 break;
3409 3720
3410 if ((buf = STRCHR (name, ';')) != NULL) 3721 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3722 *buf++ = '\0';
3412 3723
3413 if (name[0] == '?' && !name[1]) 3724 if (name[0] == '?' && !name[1])
3414 { 3725 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b; 3726 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3727 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 } 3729 }
3422 else 3730 else
3423 set_window_color (color + minCOLOR, name); 3731 set_window_color (color + minCOLOR, name);
3424 } 3732 }
3425 break; 3733 break;
… …
3442 break; 3750 break;
3443#ifndef NO_BOLD_UNDERLINE_REVERSE 3751#ifndef NO_BOLD_UNDERLINE_REVERSE
3444 case XTerm_Color_BD: 3752 case XTerm_Color_BD:
3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3446 break; 3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3447 case XTerm_Color_UL: 3758 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break; 3760 break;
3450 case XTerm_Color_RV: 3761 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break;
3764#endif
3765#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3768 check_our_parents ();
3769 if (am_transparent)
3770 want_full_refresh = want_refresh = 1;
3452 break; 3771 break;
3453#endif 3772#endif
3454 3773
3455 case XTerm_Pixmap: 3774 case XTerm_Pixmap:
3456 if (*str != ';') 3775 if (*str != ';')
… …
3459 scale_pixmap (""); /* reset to default scaling */ 3778 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3779 set_bgPixmap (str); /* change pixmap */
3461#endif 3780#endif
3462 scr_touch (true); 3781 scr_touch (true);
3463 } 3782 }
3464 while ((str = STRCHR (str, ';')) != NULL) 3783 while ((str = strchr (str, ';')) != NULL)
3465 { 3784 {
3466 str++; 3785 str++;
3467#if XPM_BACKGROUND 3786#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3787 changed += scale_pixmap (str);
3469#endif 3788#endif
… …
3488 case XTerm_logfile: 3807 case XTerm_logfile:
3489 // TODO, when secure mode? 3808 // TODO, when secure mode?
3490 break; 3809 break;
3491 3810
3492 case XTerm_font: 3811 case XTerm_font:
3812 op = URxvt_font;
3813 case URxvt_font:
3814#if ENABLE_STYLES
3815 case URxvt_boldFont:
3816 case URxvt_italicFont:
3817 case URxvt_boldItalicFont:
3818#endif
3493 if (query) 3819 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3823 resp);
3824 else
3494 { 3825 {
3495 if (Options & Opt_insecure) 3826 const char *&res = rs[Rs_font + (op - URxvt_font)];
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3827
3497 TermWin.fontset->fontdesc 3828 res = strdup (str);
3498 ? TermWin.fontset->fontdesc 3829 allocated.push_back ((void *)res);
3499 : "", 3830 set_fonts ();
3500 resp);
3501 } 3831 }
3502 else
3503 change_font (str);
3504 break; 3832 break;
3505 3833
3506#ifndef NO_FRILLS 3834#if ENABLE_FRILLS
3507 case XTerm_locale: 3835 case XTerm_locale:
3508 if (query) 3836 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3512 }
3513 else 3838 else
3514 { 3839 {
3515 set_locale (str); 3840 set_locale (str);
3516# ifdef USE_XIM 3841# ifdef USE_XIM
3517 im_cb (); 3842 im_cb ();
3518# endif 3843# endif
3519 } 3844 }
3520 break; 3845 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif 3846#endif
3531 3847
3532#ifdef MENUBAR 3848#ifdef MENUBAR
3533 case XTerm_Menu: 3849 case XTerm_Menu:
3534 if (Options & Opt_insecure) 3850 if (options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break; 3852 break;
3537#endif 3853#endif
3538#if 0 3854#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3855 case XTerm_dumpscreen: /* no error notices */
… …
3566{ 3882{
3567 int state; 3883 int state;
3568 3884
3569 if (mode == 's') 3885 if (mode == 's')
3570 { 3886 {
3571 SavedModes |= (PrivateModes & bit); 3887 SavedModes |= (priv_modes & bit);
3572 return -1; 3888 return -1;
3573 } 3889 }
3574 else 3890 else
3575 { 3891 {
3576 if (mode == 'r') 3892 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3893 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3894 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3895 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3896 PrivMode (state, bit);
3581 } 3897 }
3582 3898
3583 return state; 3899 return state;
3584} 3900}
… …
3602 { 3, PrivMode_132 }, 3918 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 3919 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 3920 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 3921 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 3922 { 7, PrivMode_Autowrap },
3923 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 3924 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 3925#ifdef menuBar_esc
3609 { menuBar_esc, PrivMode_menuBar }, 3926 { menuBar_esc, PrivMode_menuBar },
3610#endif 3927#endif
3928 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor },
3611#ifdef scrollBar_esc 3930#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3931 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3932#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3933 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 3934 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 3935 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 3936 // 45 margin bell NYI
3621 // 46 start logging 3937 // 46 start logging
… …
3662 3978
3663 /* extra handling for values with state unkept */ 3979 /* extra handling for values with state unkept */
3664 switch (arg[i]) 3980 switch (arg[i])
3665 { 3981 {
3666 case 1048: /* alternative cursor save */ 3982 case 1048: /* alternative cursor save */
3983 case 1049:
3667 if (Options & Opt_secondaryScreen) 3984 if (options & Opt_secondaryScreen)
3668 if (mode == 0) 3985 if (mode == 0)
3669 scr_cursor (RESTORE); 3986 scr_cursor (RESTORE);
3670 else if (mode == 1) 3987 else if (mode == 1)
3671 scr_cursor (SAVE); 3988 scr_cursor (SAVE);
3672 break; 3989 break;
… …
3683 * within VT52 mode 4000 * within VT52 mode
3684 */ 4001 */
3685 PrivMode (1, PrivMode_vt52); 4002 PrivMode (1, PrivMode_vt52);
3686 break; 4003 break;
3687 case 3: /* 80/132 */ 4004 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4005 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3690 break; 4007 break;
3691 case 4: /* smooth scrolling */ 4008 case 4: /* smooth scrolling */
3692 if (state) 4009 if (state)
3693 Options &= ~Opt_jumpScroll; 4010 options &= ~Opt_jumpScroll;
3694 else 4011 else
3695 Options |= Opt_jumpScroll; 4012 options |= Opt_jumpScroll;
3696 break; 4013 break;
3697 case 5: /* reverse video */ 4014 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4015 scr_rvideo_mode (state);
3699 break; 4016 break;
3700 case 6: /* relative/absolute origins */ 4017 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4021 scr_autowrap (state);
3705 break; 4022 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4023 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4024 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4025 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4026 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4027 break;
3711#ifdef menuBar_esc 4028#ifdef menuBar_esc
3712 case menuBar_esc: 4029 case menuBar_esc:
3713#ifdef MENUBAR 4030#ifdef MENUBAR
3714 map_menuBar (state); 4031 map_menuBar (state);
… …
3734 break; 4051 break;
3735 /* case 66: - application key pad */ 4052 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4053 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4054 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4055 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4056 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4057 break;
3741#if 0 4058#if 0
3742 case 1001: 4059 case 1001:
3743 break; /* X11 mouse highlighting */ 4060 break; /* X11 mouse highlighting */
3744#endif 4061#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4062 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state) 4063 if (state)
3747 Options &= ~Opt_scrollTtyOutput; 4064 options &= ~Opt_scrollTtyOutput;
3748 else 4065 else
3749 Options |= Opt_scrollTtyOutput; 4066 options |= Opt_scrollTtyOutput;
3750 break; 4067 break;
3751 case 1011: /* scroll to bottom on key press */ 4068 case 1011: /* scroll to bottom on key press */
3752 if (state) 4069 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4070 options |= Opt_scrollTtyKeypress;
3754 else 4071 else
3755 Options &= ~Opt_scrollTtyKeypress; 4072 options &= ~Opt_scrollTtyKeypress;
3756 break; 4073 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4074 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4075 if (options & Opt_secondaryScreen)
3759 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4077 scr_erase_screen (2);
3761 scr_change_screen (state); 4078 scr_change_screen (state);
3762 break; 4079 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4080 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4081 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4082 if (options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY) 4083 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4084 scr_erase_screen (2);
3768 break; 4085 break;
3769 default: 4086 default:
3770 break; 4087 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4113 rendset = 0, rendstyle = ~RS_None;
3797 break; 4114 break;
3798 case 1: 4115 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4116 rendset = 1, rendstyle = RS_Bold;
3800 break; 4117 break;
3801 //case 2: // faint or second colour 4118 //case 2: // low intensity
4119 case 3:
4120 rendset = 1, rendstyle = RS_Italic;
4121 break;
3802 case 4: 4122 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4123 rendset = 1, rendstyle = RS_Uline;
3804 break; 4124 break;
3805 case 5: // slowly blinking 4125 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4126 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4138 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4139 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4140 //...
3821 //case 19: // ninth alt font 4141 //case 19: // ninth alt font
3822 //case 20: // gothic 4142 //case 20: // gothic
3823 case 21: // disable bold, faint 4143 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4144 rendset = 0, rendstyle = RS_Bold;
3825 break; 4145 break;
3826 case 22: 4146 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4147 rendset = 0, rendstyle = RS_Bold;
3828 break; 4148 break;
3829 //case 23: disable italic 4149 case 23: // disable italic
4150 rendset = 0, rendstyle = RS_Italic;
4151 break;
3830 case 24: 4152 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4153 rendset = 0, rendstyle = RS_Uline;
3832 break; 4154 break;
3833 case 25: 4155 case 25:
4156 rendset = 0, rendstyle = RS_Blink;
4157 break;
4158 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4159 rendset = 0, rendstyle = RS_Blink;
3835 break; 4160 break;
3836 case 27: 4161 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4162 rendset = 0, rendstyle = RS_RVid;
3838 break; 4163 break;
… …
3856 case 35: 4181 case 35:
3857 case 36: 4182 case 36:
3858 case 37: 4183 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4184 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4185 break;
3861#ifdef TTY_256COLOR 4186 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4187 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4188 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4189 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4190 i += 2;
3867 } 4191 }
3868 break; 4192 break;
3869#endif
3870 case 39: /* default fg */ 4193 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4194 scr_color (Color_fg, Color_fg);
3872 break; 4195 break;
3873 4196
3874 case 40: 4197 case 40:
… …
3879 case 45: 4202 case 45:
3880 case 46: 4203 case 46:
3881 case 47: 4204 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4205 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4206 break;
3884#ifdef TTY_256COLOR 4207 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4208 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4209 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4210 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4211 i += 2;
3890 } 4212 }
3891 break; 4213 break;
3892#endif
3893 case 49: /* default bg */ 4214 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4215 scr_color (Color_bg, Color_bg);
3895 break; 4216 break;
4217
4218 //case 50: // not variable spacing
3896 4219
3897#ifndef NO_BRIGHTCOLOR 4220#ifndef NO_BRIGHTCOLOR
3898 case 90: 4221 case 90:
3899 case 91: /* set bright fg color */ 4222 case 91: /* set bright fg color */
3900 case 92: 4223 case 92:
3901 case 93: 4224 case 93:
3902 case 94: 4225 case 94:
3903 case 95: 4226 case 95:
3904 case 96: 4227 case 96:
3905 case 97: 4228 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4229 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4230 break;
3909 case 100: 4231 case 100:
3910 case 101: /* set bright bg color */ 4232 case 101: /* set bright bg color */
3911 case 102: 4233 case 102:
3912 case 103: 4234 case 103:
3913 case 104: 4235 case 104:
3914 case 105: 4236 case 105:
3915 case 106: 4237 case 106:
3916 case 107: 4238 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4240 break;
3920#endif 4241#endif
3921 4242
3922 } 4243 }
3923 } 4244 }
… …
3930{ 4251{
3931 unicode_t ch, cmd = cmd_getc (); 4252 unicode_t ch, cmd = cmd_getc ();
3932 4253
3933 if (cmd == 'Q') 4254 if (cmd == 'Q')
3934 { /* query graphics */ 4255 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4256 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4257 return;
3937 } 4258 }
3938 /* swallow other graphics sequences until terminating ':' */ 4259 /* swallow other graphics sequences until terminating ':' */
3939 do 4260 do
3940 ch = cmd_getc (); 4261 ch = cmd_getc ();
… …
3955 unsigned char buf[256]; 4276 unsigned char buf[256];
3956 4277
3957 va_start (arg_ptr, fmt); 4278 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4280 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4281 tt_write (buf, strlen (buf));
3961} 4282}
3962 4283
3963/* ---------------------------------------------------------------------- */ 4284/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4285/* Write data to the pty as typed by the user, pasted with the mouse,
3965 * or generated by us in response to a query ESC sequence. 4286 * or generated by us in response to a query ESC sequence.
3966 */ 4287 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289
3967void 4290void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{ 4292{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4293 if (v_buflen == 0)
4294 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3971 4296
3972 if (len) 4297 if ((unsigned int)written == len)
4298 return;
4299
4300 data += written;
4301 len -= written;
3973 { 4302 }
4303
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4305
4306 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len;
4308
4309 pty_ev.set (EVENT_READ | EVENT_WRITE);
4310}
4311
4312void rxvt_term::pty_write ()
4313{
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
3974 if (v_buflen == 0) 4320 if (v_buflen == 0)
3975 { 4321 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4322 free (v_buffer);
4003 v_buffer = 0; 4323 v_buffer = 0;
4004 v_buflen = 0; 4324 v_buflen = 0;
4005 4325
4006 pty_ev.set (EVENT_READ); 4326 pty_ev.set (EVENT_READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4327 return;
4019 } 4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
4021} 4335}
4022 4336
4023/*----------------------- end-of-file (C source) -----------------------*/ 4337/*----------------------- end-of-file (C source) -----------------------*/
4024 4338

Diff Legend

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