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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.163 by root, Wed Aug 25 03:47:20 2004 UTC

… …
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 58
59// exception thrown when the command parser runs out of input data 59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 60class out_of_input { } out_of_input;
61 61
62#if ENABLE_FRILLS || ISO_14755
63
64#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1)
66#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
67#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
68#define ISO_14755_MASK 0x0fffffffUL
69
70#if ISO_14755
71static unsigned short iso14755_symtab[] = {
72 // keysym, unicode
73 XK_Left, 0x2190,
74 XK_KP_Left, 0x2190,
75 XK_Up, 0x2191,
76 XK_KP_Up, 0x2191,
77 XK_Right, 0x2192,
78 XK_KP_Right, 0x2192,
79 XK_Down, 0x2193,
80 XK_KP_Down, 0x2193,
81 XK_Linefeed, 0x21b4,
82 XK_Return, 0x21b5,
83 XK_KP_Enter, 0x21b5,
84
85 XK_Prior, 0x21de,
86 XK_Next, 0x21df,
87 XK_Tab, 0x21e5,
88 XK_ISO_Left_Tab, 0x21e6,
89 XK_Shift_L, 0x21e7,
90 XK_Shift_R, 0x21e7,
91
92 XK_Shift_Lock, 0x21eb,
93 XK_ISO_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_Caps_Lock, 0x21ec,
96 XK_Num_Lock, 0x21ed,
97 XK_ISO_Level3_Shift, 0x21ee,
98 XK_ISO_Level3_Lock, 0x21ef,
99 XK_ISO_Group_Lock, 0x21f0,
100 XK_Home, 0x21f1,
101 XK_End, 0x21f2,
102
103 XK_Execute, 0x2318,
104 XK_Begin, 0x2320,
105 XK_Delete, 0x2326,
106 XK_Clear, 0x2327,
107 XK_BackSpace, 0x232b,
108 XK_Insert, 0x2380,
109 XK_Control_L, 0x2388,
110 XK_Control_R, 0x2388,
111 XK_Pause, 0x2389,
112 XK_Break, 0x238a,
113 XK_Escape, 0x238b,
114 XK_Undo, 0x238c,
115 XK_Print, 0x2399,
116
117 XK_space, 0x2423,
118 XK_KP_Space, 0x2422,
119 0,
120};
121
122void
123rxvt_term::iso14755_54 (int x, int y)
124{
125 x = Pixel2Col (x);
126 y = Pixel2Row (y);
127
128 if (x < 0 || x >= TermWin.ncol
129 || y < 0 || y >= TermWin.nrow)
130 return;
131
132 for (;;)
133 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
135
136 if (t != NOCHAR || !x)
137 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
139 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140 iso14755buf = ISO_14755_54;
141 break;
142 }
143
144 x--;
145 }
146
147}
148#endif
149
150#if ENABLE_OVERLAY
151void
152rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
153{
154 rxvt_fontset *fs = FONTSET (r);
155 rxvt_font *f = (*fs)[fs->find_font (ch)];
156 wchar_t *chr, *alloc, ch2;
157 int len;
158
159#if ENABLE_COMBINING
160 if (IS_COMPOSE (ch))
161 {
162 len = rxvt_composite.expand (ch, 0);
163 alloc = chr = new wchar_t[len];
164 rxvt_composite.expand (ch, chr);
165 }
166 else
167#endif
168 {
169 ch2 = ch;
170
171 alloc = 0;
172 chr = &ch2;
173 len = 1;
174 }
175
176 int width = strlen (f->name);
177
178 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
179
180 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181
182 for (int y = 0; y < len; y++)
183 {
184 char buf[9];
185
186 ch = *chr++;
187
188 sprintf (buf, "%8x", ch);
189 scr_overlay_set (0, y, buf);
190 scr_overlay_set (9, y, '=');
191#if !UNICODE3
192 if (ch >= 0x10000)
193 ch = 0xfffd;
194#endif
195 scr_overlay_set (11, y, ch, r);
196 scr_overlay_set (12, y, NOCHAR, r);
197 }
198
199 scr_overlay_set (0, len, f->name);
200
201#if ENABLE_COMBINING
202 if (alloc)
203 delete [] alloc;
204#endif
205}
206#endif
207
208void
209rxvt_term::commit_iso14755 ()
210{
211 wchar_t ch[2];
212
213 ch[0] = iso14755buf & ISO_14755_MASK;
214 ch[1] = 0;
215
216 if (iso14755buf & ISO_14755_51)
217 {
218 char mb[16];
219 int len;
220
221 // allow verbatim 0-bytes and control-bytes to be entered
222 if (ch[0] >= 0x20)
223 len = wcstombs (mb, ch, 16);
224 else
225 {
226 mb[0] = ch[0];
227 len = 1;
228 }
229
230 if (len > 0)
231 tt_write ((unsigned char *)mb, len);
232 else
233 scr_bell ();
234 }
235
236 iso14755buf = 0;
237}
238
239int
240rxvt_term::hex_keyval (XKeyEvent &ev)
241{
242 // check wether this event corresponds to a hex digit
243 // if the modifiers had not been pressed.
244 for (int index = 0; index < 8; index++)
245 {
246 KeySym k = XLookupKeysym (&ev, index);
247
248 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
249 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
250 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
251 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
252 }
253
254 return -1;
255}
256#endif
257
62/*{{{ Convert the keypress event into a string */ 258/*{{{ Convert the keypress event into a string */
63void 259void
64rxvt_term::lookup_key (XKeyEvent &ev) 260rxvt_term::lookup_key (XKeyEvent &ev)
65{ 261{
66 int ctrl, meta, shft, len; 262 int ctrl, meta, shft, len;
… …
151 { 347 {
152 if (TermWin.saveLines) 348 if (TermWin.saveLines)
153 { 349 {
154#ifdef UNSHIFTED_SCROLLKEYS 350#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 351 if (!ctrl && !meta)
156 {
157#else 352#else
158 if (IS_SCROLL_MOD) 353 if (IS_SCROLL_MOD)
354#endif
159 { 355 {
160#endif
161 int lnsppg; 356 int lnsppg;
162 357
163#ifdef PAGING_CONTEXT_LINES 358#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 360#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 409 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 410 {
216 keysym += (XK_F11 - XK_F1); 411 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 412 shft = 0; /* turn off Shift */
218 } 413 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 414 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 415 {
221 switch (keysym) 416 switch (keysym)
222 { 417 {
223 /* normal XTerm key bindings */ 418 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 419 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 420 selection_request (ev.time, 0, 0);
226 return; 421 return;
422#if TODO // TODO
227 /* rxvt extras */ 423 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 424 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 425 change_font (FONT_UP);
230 return; 426 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 428 change_font (FONT_DN);
233 return; 429 return;
430#endif
234 } 431 }
235 } 432 }
236 } 433 }
434
435#if ENABLE_FRILLS || ISO_14755
436 // ISO 14755 support
437 if (shft && ctrl)
438 {
439 int hv;
440
441 if (iso14755buf & ISO_14755_51
442 && (keysym == XK_space || keysym == XK_KP_Space
443 || keysym == XK_Return || keysym == XK_KP_Enter))
444 {
445 commit_iso14755 ();
446 iso14755buf = ISO_14755_51;
447# if ISO_14755
448 iso14755_51 (0);
449# endif
450 return;
451 }
452 else if ((hv = hex_keyval (ev)) >= 0)
453 {
454 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
455 | hv | ISO_14755_51;
456# if ISO_14755
457 iso14755_51 (iso14755buf & ISO_14755_MASK);
458# endif
459 return;
460 }
461 else
462 {
463# if ENABLE_OVERLAY
464 scr_overlay_off ();
465# endif
466 iso14755buf = 0;
467 }
468 }
469 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
470 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
471 if (!(iso14755buf & ISO_14755_STARTED))
472 {
473 iso14755buf |= ISO_14755_STARTED;
474# if ENABLE_OVERLAY
475 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
476 scr_overlay_set (0, 0, "ISO 14755 mode");
477# endif
478 }
479#endif
480
237#ifdef PRINTPIPE 481#ifdef PRINTPIPE
238 if (keysym == XK_Print) 482 if (keysym == XK_Print)
239 { 483 {
240 scr_printscreen (ctrl | shft); 484 scr_printscreen (ctrl | shft);
241 return; 485 return;
… …
273 newlen = 1; 517 newlen = 1;
274 switch (keysym) 518 switch (keysym)
275 { 519 {
276#ifndef NO_BACKSPACE_KEY 520#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 521 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 522 if (priv_modes & PrivMode_HaveBackSpace)
279 { 523 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 524 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 525 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 526 kbuf[1] = '\0';
283 } 527 }
284 else 528 else
285 STRCPY (kbuf, key_backspace); 529 strcpy (kbuf, key_backspace);
286 break; 530 break;
287#endif 531#endif
288#ifndef NO_DELETE_KEY 532#ifndef NO_DELETE_KEY
289 case XK_Delete: 533 case XK_Delete:
290 STRCPY (kbuf, key_delete); 534 strcpy (kbuf, key_delete);
291 break; 535 break;
292#endif 536#endif
293 case XK_Tab: 537 case XK_Tab:
294 if (shft) 538 if (shft)
295 STRCPY (kbuf, "\033[Z"); 539 strcpy (kbuf, "\033[Z");
296 else 540 else
297 { 541 {
298#ifdef CTRL_TAB_MAKES_META 542#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 543 if (ctrl)
300 meta = 1; 544 meta = 1;
… …
306 newlen = 0; 550 newlen = 0;
307 } 551 }
308 break; 552 break;
309 553
310#ifdef XK_KP_Left 554#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 555 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 556 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 557 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 558 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 560 {
317 STRCPY (kbuf, "\033OZ"); 561 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 562 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 563 break;
320 } 564 }
321 else 565 else
322 /* translate to std. cursor key */ 566 /* translate to std. cursor key */
… …
325#endif 569#endif
326 case XK_Up: /* "\033[A" */ 570 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 571 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 572 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 573 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 574 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 575 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 576 /* do Shift first */
333 if (shft) 577 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 578 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 579 else if (ctrl)
336 { 580 {
337 kbuf[1] = 'O'; 581 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 582 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 583 }
340 else if (PrivateModes & PrivMode_aplCUR) 584 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 585 kbuf[1] = 'O';
342 break; 586 break;
343 587
344#ifndef UNSHIFTED_SCROLLKEYS 588#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 589# ifdef XK_KP_Prior
346 case XK_KP_Prior: 590 case XK_KP_Prior:
347 /* allow shift to override */ 591 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 592 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 593 {
350 STRCPY (kbuf, "\033Oy"); 594 strcpy (kbuf, "\033Oy");
351 break; 595 break;
352 } 596 }
353 /* FALLTHROUGH */ 597 /* FALLTHROUGH */
354# endif 598# endif
355 case XK_Prior: 599 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 600 strcpy (kbuf, "\033[5~");
357 break; 601 break;
358# ifdef XK_KP_Next 602# ifdef XK_KP_Next
359 case XK_KP_Next: 603 case XK_KP_Next:
360 /* allow shift to override */ 604 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 606 {
363 STRCPY (kbuf, "\033Os"); 607 strcpy (kbuf, "\033Os");
364 break; 608 break;
365 } 609 }
366 /* FALLTHROUGH */ 610 /* FALLTHROUGH */
367# endif 611# endif
368 case XK_Next: 612 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 613 strcpy (kbuf, "\033[6~");
370 break; 614 break;
371#endif 615#endif
372 case XK_KP_Enter: 616 case XK_KP_Enter:
373 /* allow shift to override */ 617 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 618 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 619 {
376 STRCPY (kbuf, "\033OM"); 620 strcpy (kbuf, "\033OM");
621 break;
622 }
623
624 /* FALLTHROUGH */
625
626 case XK_Return:
627 if (priv_modes & PrivMode_LFNL)
628 {
629 kbuf[0] = '\015';
630 kbuf[1] = '\012';
631 kbuf[2] = '\0';
377 } 632 }
378 else 633 else
379 { 634 {
380 kbuf[0] = '\r'; 635 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 636 kbuf[1] = '\0';
382 } 637 }
383 break; 638 break;
384 639
385#ifdef XK_KP_Begin 640#ifdef XK_KP_Begin
386 case XK_KP_Begin: 641 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 642 strcpy (kbuf, "\033Ou");
388 break; 643 break;
389 644
390 case XK_KP_Insert: 645 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 646 strcpy (kbuf, "\033Op");
392 break; 647 break;
393 648
394 case XK_KP_Delete: 649 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 650 strcpy (kbuf, "\033On");
396 break; 651 break;
397#endif 652#endif
398 case XK_KP_F1: /* "\033OP" */ 653 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 654 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 655 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 656 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 657 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 658 kbuf[2] += (keysym - XK_KP_F1);
404 break; 659 break;
405 660
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 661 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 662 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 673 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 674 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 675 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 676 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 677 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 678 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 679 {
425 STRCPY (kbuf, "\033Oj"); 680 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 681 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 682 }
428 else 683 else
429 { 684 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 685 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 686 kbuf[1] = '\0';
432 } 687 }
433 break; 688 break;
434 689
435 case XK_Find: 690 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 691 strcpy (kbuf, "\033[1~");
437 break; 692 break;
438 case XK_Insert: 693 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 694 strcpy (kbuf, "\033[2~");
440 break; 695 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 696#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 697 case DXK_Remove:
443 /* FALLTHROUGH */ 698 /* FALLTHROUGH */
444#endif 699#endif
445 case XK_Execute: 700 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 701 strcpy (kbuf, "\033[3~");
447 break; 702 break;
448 case XK_Select: 703 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 704 strcpy (kbuf, "\033[4~");
450 break; 705 break;
451#ifdef XK_KP_End 706#ifdef XK_KP_End
452 case XK_KP_End: 707 case XK_KP_End:
453 /* allow shift to override */ 708 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 710 {
456 STRCPY (kbuf, "\033Oq"); 711 strcpy (kbuf, "\033Oq");
457 break; 712 break;
458 } 713 }
459 /* FALLTHROUGH */ 714 /* FALLTHROUGH */
460#endif 715#endif
461 case XK_End: 716 case XK_End:
462 STRCPY (kbuf, KS_END); 717 strcpy (kbuf, KS_END);
463 break; 718 break;
464#ifdef XK_KP_Home 719#ifdef XK_KP_Home
465 case XK_KP_Home: 720 case XK_KP_Home:
466 /* allow shift to override */ 721 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 723 {
469 STRCPY (kbuf, "\033Ow"); 724 strcpy (kbuf, "\033Ow");
470 break; 725 break;
471 } 726 }
472 /* FALLTHROUGH */ 727 /* FALLTHROUGH */
473#endif 728#endif
474 case XK_Home: 729 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 730 strcpy (kbuf, KS_HOME);
476 break; 731 break;
477 732
478#define FKEY(n, fkey) \ 733#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 734 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 735
… …
533 default: 788 default:
534 newlen = 0; 789 newlen = 0;
535 break; 790 break;
536 } 791 }
537 if (newlen) 792 if (newlen)
538 len = STRLEN (kbuf); 793 len = strlen (kbuf);
539 } 794 }
540 795
541 /* 796 /*
542 * Pass meta for all function keys, if 'meta' option set 797 * Pass meta for all function keys, if 'meta' option set
543 */ 798 */
… …
571 } 826 }
572 827
573 if (len <= 0) 828 if (len <= 0)
574 return; /* not mapped */ 829 return; /* not mapped */
575 830
576 if (Options & Opt_scrollTtyKeypress) 831 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 832 if (TermWin.view_start)
578 { 833 {
579 TermWin.view_start = 0; 834 TermWin.view_start = 0;
580 want_refresh = 1; 835 want_refresh = 1;
581 } 836 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 885 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 886 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 887
633 if (n > 0 && s < count) 888 if (n > 0 && s < count)
634 { 889 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 890 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 891 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 892 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 893 cmdbuf_endp -= n;
639 s += n; 894 s += n;
640 } 895 }
… …
661 if (want_full_refresh) 916 if (want_full_refresh)
662 { 917 {
663 want_full_refresh = 0; 918 want_full_refresh = 0;
664 scr_clear (); 919 scr_clear ();
665 scr_touch (false); 920 scr_touch (false);
666 want_refresh = 1;
667 } 921 }
668#endif 922#endif
669 923
670 if (want_refresh) 924 if (want_refresh)
671 { 925 {
… …
675 IMSendSpot (); 929 IMSendSpot ();
676#endif 930#endif
677 } 931 }
678 932
679 display->flush (); 933 display->flush ();
934
935 flush_ev.stop ();
680} 936}
681 937
682void 938void
683rxvt_term::check_cb (check_watcher &w) 939rxvt_term::check_cb (check_watcher &w)
684{ 940{
685 SET_R (this); 941 SET_R (this);
686 SET_LOCALE (locale); 942 SET_LOCALE (locale);
687 943
944 display->flush ();
945
946 if (want_refresh && !flush_ev.active)
947 flush_ev.start (NOW + 0.01);
948}
949
950void
951rxvt_term::flush_cb (time_watcher &w)
952{
953 SET_R (this);
954 SET_LOCALE (locale);
955
956 refresh_limit = 1;
957 refresh_count = 0;
688 flush (); 958 flush ();
689} 959}
690 960
691#ifdef CURSOR_BLINK 961#ifdef CURSOR_BLINK
692void 962void
… …
768 1038
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1039 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1040 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1041 cmdbuf_endp = cmdbuf_ptr + n;
772 1042
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1044
775 if (n > 0) 1045 if (n > 0)
776 { 1046 {
777 cmdbuf_endp += n; 1047 cmdbuf_endp += n;
778 return true; 1048 return true;
… …
805 recolour_cursor (); 1075 recolour_cursor ();
806 1076
807#ifdef POINTER_BLANK 1077#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1078 hidden_pointer = 0;
809 1079
810 if (Options & Opt_pointerBlank) 1080 if (options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay); 1081 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1082#endif
813} 1083}
814 1084
815#ifdef POINTER_BLANK 1085#ifdef POINTER_BLANK
816void 1086void
817rxvt_term::pointer_blank () 1087rxvt_term::pointer_blank ()
818{ 1088{
819 if (! (Options & Opt_pointerBlank)) 1089 if (! (options & Opt_pointerBlank))
820 return; 1090 return;
821 1091
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1092 XDefineCursor (display->display, TermWin.vt, blank_cursor);
823 XFlush (display->display); 1093 XFlush (display->display);
824 1094
… …
844 x = ev.x; 1114 x = ev.x;
845 y = ev.y; 1115 y = ev.y;
846 pixel_position (&x, &y); 1116 pixel_position (&x, &y);
847 1117
848 if (MEvent.button == AnyButton) 1118 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1119 button_number = 3;
851 }
852 else 1120 else
853 { 1121 {
854 button_number = MEvent.button - Button1; 1122 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1123 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1124 if (button_number >= 3)
857 button_number += (64 - 3); 1125 button_number += (64 - 3);
858 } 1126 }
859 1127
860 if (PrivateModes & PrivMode_MouseX10) 1128 if (priv_modes & PrivMode_MouseX10)
861 { 1129 {
862 /* 1130 /*
863 * do not report ButtonRelease 1131 * do not report ButtonRelease
864 * no state info allowed 1132 * no state info allowed
865 */ 1133 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1148 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1149 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1150#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1151 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1152#endif
885
886 } 1153 }
887 1154
888#ifdef DEBUG_MOUSEREPORT 1155#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1156 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1157 if (key_state & 16)
891 fputc ('C', stderr); 1158 fputc ('C', stderr);
892 if (key_state & 4) 1159 if (key_state & 4)
893 fputc ('S', stderr); 1160 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1164 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1165 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1166 button_number,
900 x + 1, 1167 x + 1,
901 y + 1); 1168 y + 1);
902#else 1169#endif
1170
903 tt_printf ("\033[M%c%c%c", 1171 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1172 (32 + button_number + key_state),
905 (32 + x + 1), 1173 (32 + x + 1),
906 (32 + y + 1)); 1174 (32 + y + 1));
907#endif
908} 1175}
909 1176
910#ifdef USING_W11LIB 1177#ifdef USING_W11LIB
911void 1178void
912rxvt_W11_process_x_event (XEvent *ev) 1179rxvt_W11_process_x_event (XEvent *ev)
… …
923{ 1190{
924 SET_R (this); 1191 SET_R (this);
925 SET_LOCALE (locale); 1192 SET_LOCALE (locale);
926 1193
927#if defined(CURSOR_BLINK) 1194#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
929 { 1196 {
930 if (hidden_cursor) 1197 if (hidden_cursor)
931 { 1198 {
932 hidden_cursor = 0; 1199 hidden_cursor = 0;
933 want_refresh = 1; 1200 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1204 }
938#endif 1205#endif
939 1206
940#if defined(POINTER_BLANK) 1207#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1209 {
943 if (ev.type == MotionNotify 1210 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1211 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1212 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1213 if (hidden_pointer)
… …
958 1225
959 Window unused_root, unused_child; 1226 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1227 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1228 unsigned int unused_mask;
962 1229
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 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));
1010#endif
1011
1012 switch (ev.type) 1230 switch (ev.type)
1013 { 1231 {
1014 case KeyPress: 1232 case KeyPress:
1233#if ISO_14755
1234 if (!(iso14755buf & ISO_14755_52))
1235#endif
1015 lookup_key (ev.xkey); 1236 lookup_key (ev.xkey);
1237
1238 break;
1239
1240 case KeyRelease:
1241 {
1242#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1243 KeySym ks;
1244
1245 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1246#endif
1247
1248#if ENABLE_FRILLS || ISO_14755
1249 // ISO 14755 support
1250 if (iso14755buf)
1251 if (iso14755buf & ISO_14755_52)
1252 {
1253# if ENABLE_OVERLAY
1254 scr_overlay_off ();
1255# endif
1256# if ISO_14755
1257 // iso14755 part 5.2 handling: release time
1258 // first: controls
1259 if ((ev.xkey.state & ControlMask)
1260 && ((ks >= 0x40 && ks <= 0x5f)
1261 || (ks >= 0x61 && ks <= 0x7f)))
1262 {
1263 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1264 commit_iso14755 ();
1265 return; // case-break;
1266 }
1267
1268 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1269 if (i[0] == ks)
1270 {
1271 iso14755buf = ISO_14755_51 | i[1];
1272 commit_iso14755 ();
1273 return; // case-break;
1274 }
1275
1276 scr_bell ();
1277# endif
1278 iso14755buf = 0;
1016 break; 1279 break;
1280 }
1281 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1282 {
1283# if ENABLE_OVERLAY
1284 scr_overlay_off ();
1285# endif
1286 if (iso14755buf & ISO_14755_51)
1287 commit_iso14755 ();
1288#if ISO_14755
1289 else if (iso14755buf & ISO_14755_STARTED)
1290 {
1291 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1292
1293 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1294 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1295 }
1296# endif
1297 else
1298 iso14755buf = 0;
1299 }
1300#endif
1017 1301
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1302#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1303 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1304 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R) 1305 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1306 mouse_slip_wheel_speed = 0;
1030 } 1307#endif
1031 break; 1308 break;
1032 } 1309 }
1033#endif
1034 1310
1035 case ButtonPress: 1311 case ButtonPress:
1036 button_press (ev.xbutton); 1312 button_press (ev.xbutton);
1037 break; 1313 break;
1038 1314
… …
1065 &Size, &RemainingBytes, 1341 &Size, &RemainingBytes,
1066 &data); 1342 &data);
1067 XChangeProperty (display->display, display->root, 1343 XChangeProperty (display->display, display->root,
1068 XA_CUT_BUFFER0, XA_STRING, 1344 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace, 1345 8, PropModeReplace,
1070 data, STRLEN (data)); 1346 data, strlen (data));
1071 XFree (data); 1347 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1348 selection_paste (display->root, XA_CUT_BUFFER0, True);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1349 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1074 } 1350 }
1075#endif /* OFFIX_DND */ 1351#endif /* OFFIX_DND */
1076 break; 1352 break;
1077 1353
1078 case MappingNotify: 1354 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1355 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1356 break;
1081 1357
1082 /* 1358 /*
1083 * XXX: this is not the _current_ arrangement 1359 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1360 * Here's my conclusion:
… …
1109 { 1385 {
1110 TermWin.focus = 1; 1386 TermWin.focus = 1;
1111 want_refresh = 1; 1387 want_refresh = 1;
1112#ifdef USE_XIM 1388#ifdef USE_XIM
1113 if (Input_Context != NULL) 1389 if (Input_Context != NULL)
1390 {
1391 IMSetStatusPosition ();
1114 XSetICFocus (Input_Context); 1392 XSetICFocus (Input_Context);
1393 }
1115#endif 1394#endif
1116#ifdef CURSOR_BLINK 1395#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink) 1396 if (options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1397 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif 1398#endif
1120#ifdef OFF_FOCUS_FADING 1399#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade]) 1400 if (rs[Rs_fade])
1122 { 1401 {
1123 PixColors = PixColorsFocused; 1402 pix_colors = pix_colors_focused;
1124 set_colorfgbg ();
1125 scr_clear (); 1403 scr_recolour ();
1126 scr_touch (true);
1127 } 1404 }
1128#endif 1405#endif
1129 1406
1130 } 1407 }
1131 break; 1408 break;
… …
1133 case FocusOut: 1410 case FocusOut:
1134 if (TermWin.focus) 1411 if (TermWin.focus)
1135 { 1412 {
1136 TermWin.focus = 0; 1413 TermWin.focus = 0;
1137 want_refresh = 1; 1414 want_refresh = 1;
1415
1416#if ENABLE_FRILLS || ISO_14755
1417 iso14755buf = 0;
1418#endif
1419#if ENABLE_OVERLAY
1420 scr_overlay_off ();
1421#endif
1138#ifdef USE_XIM 1422#ifdef USE_XIM
1139 if (Input_Context != NULL) 1423 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context); 1424 XUnsetICFocus (Input_Context);
1141#endif 1425#endif
1142#ifdef CURSOR_BLINK 1426#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink) 1427 if (options & Opt_cursorBlink)
1144 cursor_blink_ev.stop (); 1428 cursor_blink_ev.stop ();
1145 hidden_cursor = 0; 1429 hidden_cursor = 0;
1146#endif 1430#endif
1147#ifdef OFF_FOCUS_FADING 1431#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade]) 1432 if (rs[Rs_fade])
1149 { 1433 {
1150 PixColors = PixColorsUnFocused; 1434 pix_colors = pix_colors_unfocused;
1151 set_colorfgbg ();
1152 scr_clear (); 1435 scr_recolour ();
1153 scr_touch (true);
1154 } 1436 }
1155#endif 1437#endif
1156
1157 } 1438 }
1158 break; 1439 break;
1159 1440
1160 case ConfigureNotify: 1441 case ConfigureNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1442 if (ev.xconfigure.window == TermWin.parent[0])
… …
1170 } 1451 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1452 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172 1453
1173 if (szHint.width != width || szHint.height != height) 1454 if (szHint.width != width || szHint.height != height)
1174 { 1455 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1456 seen_resize = 1;
1176 resize_all_windows (width, height, 1); 1457 resize_all_windows (width, height, 1);
1177 } 1458 }
1178#ifdef DEBUG_SIZE 1459
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1460#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent) 1461 if (options & Opt_transparent)
1186 { 1462 {
1187 check_our_parents (); 1463 check_our_parents ();
1188 if (am_transparent) 1464 if (am_transparent)
1189 want_full_refresh = 1; 1465 want_refresh = want_full_refresh = 1;
1190 } 1466 }
1191#endif 1467#endif
1192 } 1468 }
1469 break;
1470
1471 case PropertyNotify:
1472 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1473 && ev.xproperty.state == PropertyNewValue)
1474 selection_property (ev.xproperty.window, ev.xproperty.atom);
1475
1193 break; 1476 break;
1194 1477
1195 case SelectionClear: 1478 case SelectionClear:
1196 selection_clear (); 1479 selection_clear ();
1197 break; 1480 break;
… …
1228 1511
1229 case GraphicsExpose: 1512 case GraphicsExpose:
1230 case Expose: 1513 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1514 if (ev.xany.window == TermWin.vt)
1232 { 1515 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1516 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1237 // I don't understand this, so I changed it :) 1520
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522
1523 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1526
1241 // ev.xexpose.width, TermWin.height, False); 1527 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1528 }
1245 else 1529 else
1246 { 1530 {
1247 XEvent unused_event; 1531 XEvent unused_event;
1248 1532
… …
1258 } 1542 }
1259#ifdef MENUBAR 1543#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1545 menubar_expose ();
1262#endif 1546#endif
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == TermWin.parent[0])
1550 XClearWindow (display->display, ev.xany.window);
1551#endif
1263 } 1552 }
1264 break; 1553 break;
1265 1554
1266 case MotionNotify: 1555 case MotionNotify:
1267#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
… …
1273 { 1562 {
1274 menubar_control (ev.xbutton); 1563 menubar_control (ev.xbutton);
1275 break; 1564 break;
1276 } 1565 }
1277#endif 1566#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1567 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1279 break; 1568 break;
1280 1569
1281 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == TermWin.vt)
1282 { 1571 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1573 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1286 ; 1575 ;
1287 1576
1288 XQueryPointer (display->display, TermWin.vt, 1577 XQueryPointer (display->display, TermWin.vt,
1289 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1580 & (ev.xbutton.x), & (ev.xbutton.y),
1292 &unused_mask); 1581 &unused_mask);
1293#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1583 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1585 {
1297#endif 1586#endif
1587#if ISO_14755
1588 // 5.4
1589 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1590 {
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592 break;
1593 }
1594#endif
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1596 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1300#ifdef SELECTION_SCROLLING 1597#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1598 if (ev.xbutton.y < TermWin.int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1599 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1303 { 1600 {
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1607 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1608
1312 /* save the event params so we can highlight 1609 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1610 * the selection in the pending-scroll loop
1314 */ 1611 */
1315 selection_save_x=ev.xbutton.x; 1612 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1613 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1614 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1615
1320 /* calc number of lines to scroll */ 1616 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1617 if (ev.xbutton.y<TermWin.int_bwidth)
1322 { 1618 {
1323 scroll_selection_dir = UP; 1619 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1620 dist = TermWin.int_bwidth - ev.xbutton.y;
1325 } 1621 }
1326 else 1622 else
1327 { 1623 {
1328 scroll_selection_dir = DN; 1624 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y -
1330 (TermWin.int_bwidth + TermWin.height); 1625 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1331 } 1626 }
1627
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1628 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1629 / SELECTION_SCROLL_LINE_SPEEDUP
1630 + 1;
1334 MIN_IT (scroll_selection_lines, 1631 MIN_IT (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1632 SELECTION_SCROLL_MAX_LINES);
1336 } 1633 }
1337 else 1634 else
1338 { 1635 {
1339 /* we are within the text window, so we 1636 /* we are within the text window, so we
1340 * shouldn't be scrolling 1637 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1639 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1640 sel_scroll_ev.stop();
1344 } 1641 }
1345#endif 1642#endif
1346#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1347
1348 } 1644 }
1349#endif 1645#endif
1350
1351 } 1646 }
1352 } 1647 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1649 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1650 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1356 MotionNotify, &ev)) ; 1651 MotionNotify, &ev)) ;
1357 XQueryPointer (display->display, scrollBar.win, 1652 XQueryPointer (display->display, scrollBar.win,
1358 &unused_root, &unused_child, 1653 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1654 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1655 & (ev.xbutton.x), & (ev.xbutton.y),
1361 &unused_mask); 1656 &unused_mask);
… …
1367 } 1662 }
1368 break; 1663 break;
1369 } 1664 }
1370} 1665}
1371 1666
1667#if TRANSPARENT
1372void 1668void
1373rxvt_term::rootwin_cb (XEvent &ev) 1669rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1670{
1375 SET_R (this); 1671 SET_R (this);
1376 SET_LOCALE (locale); 1672 SET_LOCALE (locale);
1377 1673
1378 switch (ev.type) 1674 switch (ev.type)
1379 { 1675 {
1380 case PropertyNotify: 1676 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1677 /*
1391 * if user used some Esetroot compatible prog to set the root bg, 1678 * if user used some Esetroot compatible prog to set the root bg,
1392 * use the property to determine the pixmap. We use it later on. 1679 * use the property to determine the pixmap. We use it later on.
1393 */ 1680 */
1394 if (xa[XA_XROOTPMAPID] == 0) 1681 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1682 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396 1683
1397 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1684 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1398 return; 1685 return;
1399 }
1400 1686
1401 /* FALLTHROUGH */ 1687 /* FALLTHROUGH */
1402 case ReparentNotify: 1688 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1689 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1690 want_refresh = want_full_refresh = 1;
1405 break; 1691 break;
1406#endif
1407 } 1692 }
1408} 1693}
1694#endif
1409 1695
1410void 1696void
1411rxvt_term::button_press (XButtonEvent &ev) 1697rxvt_term::button_press (XButtonEvent &ev)
1412{ 1698{
1413 int reportmode = 0, clickintime; 1699 int reportmode = 0, clickintime;
1414 1700
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1701 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1416 if (!bypass_keystate) 1702 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1703 reportmode = !! (priv_modes & PrivMode_mouse_report);
1704
1418 /* 1705 /*
1419 * VT window processing of button press 1706 * VT window processing of button press
1420 */ 1707 */
1421 if (ev.window == TermWin.vt) 1708 if (ev.window == TermWin.vt)
1422 { 1709 {
1710#if ISO_14755
1711 // 5.4
1712 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1713 {
1714 iso14755_54 (ev.x, ev.y);
1715 return;
1716 }
1717#endif
1718
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1719 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1424 if (reportmode) 1720 if (reportmode)
1425 { 1721 {
1426 /* mouse report from vt window */ 1722 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1723 /* save the xbutton state (for ButtonRelease) */
… …
1461 MEvent.clicks = 0; 1757 MEvent.clicks = 0;
1462 switch (ev.button) 1758 switch (ev.button)
1463 { 1759 {
1464 case Button1: 1760 case Button1:
1465 /* allow shift+left click to extend selection */ 1761 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1763 {
1468 if (MEvent.button == Button1 && clickintime) 1764 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1765 selection_rotate (ev.x, ev.y);
1470 else 1766 else
1471 selection_extend (ev.x, ev.y, 1); 1767 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1782 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1783 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1784 selection_rotate (ev.x, ev.y);
1489 else 1785 else
1490 selection_extend (ev.x, ev.y, 1); 1786 selection_extend (ev.x, ev.y, 1);
1787
1491 MEvent.button = Button3; 1788 MEvent.button = Button3;
1492 break; 1789 break;
1493 } 1790 }
1494 } 1791 }
1792
1495 MEvent.time = ev.time; 1793 MEvent.time = ev.time;
1496 return; 1794 return;
1497 } 1795 }
1498 1796
1499 /* 1797 /*
… …
1591 break; 1889 break;
1592 case R_SB_ALIGN_BOTTOM: 1890 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 1891 csrO = scrollBar.bot - scrollBar.top;
1594 break; 1892 break;
1595 } 1893 }
1894
1596 if (scrollBar.style == R_SB_XTERM 1895 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 1896 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 1897 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 1898 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 1899
1601 scrollBar.setMotion (); 1900 scrollBar.setMotion ();
1602 break; 1901 break;
1603 1902
1604 case Button1: 1903 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1904 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1629 scr_page ((ev.button == Button1 ? DN : UP), 1928 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 1929 (TermWin.nrow
1631 * scrollbar_position (ev.y) 1930 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 1931 / scrollbar_size ()));
1633 } 1932 }
1933
1634 break; 1934 break;
1635 } 1935 }
1636 } 1936 }
1637 return; 1937 return;
1638 } 1938 }
… …
1650{ 1950{
1651 int reportmode = 0; 1951 int reportmode = 0;
1652 1952
1653 csrO = 0; /* reset csr Offset */ 1953 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 1954 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1955 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 1956
1657 if (scrollbar_isUpDn ()) 1957 if (scrollbar_isUpDn ())
1658 { 1958 {
1659 scrollBar.setIdle (); 1959 scrollBar.setIdle ();
1660 scrollbar_show (0); 1960 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1961#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 1962 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 1963#endif
1664
1665 } 1964 }
1965
1666#ifdef SELECTION_SCROLLING 1966#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 1967 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 1968 sel_scroll_ev.stop();
1669#endif 1969#endif
1970
1670 if (ev.window == TermWin.vt) 1971 if (ev.window == TermWin.vt)
1671 { 1972 {
1973#if ISO_14755
1974 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return;
1977#endif
1672 if (reportmode) 1978 if (reportmode)
1673 { 1979 {
1674 /* mouse report from vt window */ 1980 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 1981 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 1982 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 1996 MEvent.button = AnyButton;
1691 mouse_report (ev); 1997 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 1998#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 1999 return;
1694 } 2000 }
2001
1695 /* 2002 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2003 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2004 * when overriding mouse reporting
1698 */ 2005 */
1699 if (PrivateModes & PrivMode_mouse_report 2006 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2007 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2008 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2009 selection_extend (ev.x, ev.y, 0);
1703 2010
1704 switch (ev.button) 2011 switch (ev.button)
… …
1719 2026
1720 v = ev.button == Button4 ? UP : DN; 2027 v = ev.button == Button4 ? UP : DN;
1721 2028
1722 if (ev.state & ShiftMask) 2029 if (ev.state & ShiftMask)
1723 i = 1; 2030 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2031 else if (options & Opt_mouseWheelScrollPage)
1725 i = TermWin.nrow - 1; 2032 i = TermWin.nrow - 1;
1726 else 2033 else
1727 i = 5; 2034 i = 5;
1728 2035
1729# ifdef MOUSE_SLIP_WHEELING 2036# ifdef MOUSE_SLIP_WHEELING
… …
1767#endif 2074#endif
1768} 2075}
1769 2076
1770#ifdef TRANSPARENT 2077#ifdef TRANSPARENT
1771#if TINTING 2078#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2079/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2080
1775static void 2081typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2082
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2083void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2084{
1783 /* No saturation */ 2085 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2086 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 int r, g, b; 2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i;
1787 2091
1788 b = ((uint16_t *) ptr)[x]; 2092 Visual* visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2093
1790 g = (b & 0x3e0) * gm; 2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2095
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2096 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2097 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2098 mask_g = visual->green_mask;
1795 } 2099 mask_b = visual->blue_mask;
1796 ptr += bpl; 2100
1797 } 2101 /* boring lookup table pre-initialization */
2102 switch (srcImage->bits_per_pixel) {
2103 case 15:
2104 if ((mask_r != 0x7c00) ||
2105 (mask_g != 0x03e0) ||
2106 (mask_b != 0x001f))
2107 return;
2108 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2109 lookup_r = lookup;
2110 lookup_g = lookup+32;
2111 lookup_b = lookup+32+32;
2112 sh_r = 10;
2113 sh_g = 5;
2114 sh_b = 0;
2115 break;
2116 case 16:
2117 if ((mask_r != 0xf800) ||
2118 (mask_g != 0x07e0) ||
2119 (mask_b != 0x001f))
2120 return;
2121 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2122 lookup_r = lookup;
2123 lookup_g = lookup+32;
2124 lookup_b = lookup+32+64;
2125 sh_r = 11;
2126 sh_g = 5;
2127 sh_b = 0;
2128 break;
2129 case 24:
2130 if ((mask_r != 0xff0000) ||
2131 (mask_g != 0x00ff00) ||
2132 (mask_b != 0x0000ff))
2133 return;
2134 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2135 lookup_r = lookup;
2136 lookup_g = lookup+256;
2137 lookup_b = lookup+256+256;
2138 sh_r = 16;
2139 sh_g = 8;
2140 sh_b = 0;
2141 break;
2142 case 32:
2143 if ((mask_r != 0xff0000) ||
2144 (mask_g != 0x00ff00) ||
2145 (mask_b != 0x0000ff))
2146 return;
2147 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2148 lookup_r = lookup;
2149 lookup_g = lookup+256;
2150 lookup_b = lookup+256+256;
2151 sh_r = 16;
2152 sh_g = 8;
2153 sh_b = 0;
2154 break;
2155 default:
2156 return; /* we do not support this color depth */
2157 }
2158
2159 /* prepare limits for color transformation (each channel is handled separately) */
2160 if (shade < 0) {
2161 shade = -shade;
2162 if (shade < 0) shade = 0;
2163 if (shade > 100) shade = 100;
2164
2165 lower_lim_r = 65535-rm;
2166 lower_lim_g = 65535-gm;
2167 lower_lim_b = 65535-bm;
2168
2169 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2170 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2171 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2172
2173 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1798 } else { 2174 } else {
1799 for (y = h; --y >= 0;) { 2175 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2176 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2177
1803 b = ((uint16_t *) ptr)[x]; 2178 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2179
1805 g = (b & 0x3e0) * gm; 2180 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2181 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2182 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2183 }
1809 b |= (!(b >> 5) - 1); 2184
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2185 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1811 | ((g >> 8) & 0x3e0) 2186 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2187 {
1813 } 2188 unsigned int tmp;
1814 ptr += bpl; 2189
2190 tmp = lower_lim_r;
2191 lower_lim_r = lower_lim_b;
2192 lower_lim_b = tmp;
2193
2194 tmp = upper_lim_r;
2195 upper_lim_r = upper_lim_b;
2196 upper_lim_b = tmp;
2197 }
2198
2199 /* fill our lookup tables */
2200 for (i = 0; i <= mask_r>>sh_r; i++)
2201 {
2202 RUINT32T tmp;
2203 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2204 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2205 lookup_r[i] = (tmp/65535)<<sh_r;
2206 }
2207 for (i = 0; i <= mask_g>>sh_g; i++)
2208 {
2209 RUINT32T tmp;
2210 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2211 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2212 lookup_g[i] = (tmp/65535)<<sh_g;
2213 }
2214 for (i = 0; i <= mask_b>>sh_b; i++)
2215 {
2216 RUINT32T tmp;
2217 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2218 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2219 lookup_b[i] = (tmp/65535)<<sh_b;
2220 }
2221
2222 /* apply table to input image (replacing colors by newly calculated ones) */
2223 switch (srcImage->bits_per_pixel)
2224 {
2225 case 15:
2226 {
2227 unsigned short *p1, *pf, *p, *pl;
2228 p1 = (unsigned short *) srcImage->data;
2229 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2230 while (p1 < pf)
2231 {
2232 p = p1;
2233 pl = p1 + srcImage->width;
2234 for (; p < pl; p++)
1815 } 2235 {
2236 *p = lookup_r[(*p & 0x7c00)>>10] |
2237 lookup_g[(*p & 0x03e0)>> 5] |
2238 lookup_b[(*p & 0x001f)];
2239 }
2240 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1816 } 2241 }
1817} 2242 break;
1818 2243 }
1819/* RGB 16 */ 2244 case 16:
1820static void 2245 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2246 unsigned short *p1, *pf, *p, *pl;
1822{ 2247 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2248 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2249 while (p1 < pf)
1825 2250 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2251 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2252 pl = p1 + srcImage->width;
1828 /* No saturation */ 2253 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2254 {
1843 } else { 2255 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2256 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2257 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2258 }
1859 ptr += bpl; 2259 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2260 }
2261 break;
2262 }
2263 case 24:
2264 {
2265 unsigned char *p1, *pf, *p, *pl;
2266 p1 = (unsigned char *) srcImage->data;
2267 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2268 while (p1 < pf)
2269 {
2270 p = p1;
2271 pl = p1 + srcImage->width * 3;
2272 for (; p < pl; p += 3)
1860 } 2273 {
2274 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2275 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2276 p[2] = lookup_r[(p[2] & 0x0000ff)];
2277 }
2278 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1861 } 2279 }
1862} 2280 break;
2281 }
2282 case 32:
2283 {
2284 RUINT32T *p1, *pf, *p, *pl;
2285 p1 = (RUINT32T *) srcImage->data;
2286 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1863 2287
1864/* RGB 24 */ 2288 while (p1 < pf)
1865static void 2289 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2290 p = p1;
1867{ 2291 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2292 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2293 {
1896 } else { 2294 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2295 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2296 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2297 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2298 }
1927 ptr += bpl; 2299 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2300 }
2301 break;
2302 }
1929 } 2303 }
1930}
1931 2304
1932/* RGB 32 */ 2305 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2306}
2003
2004#endif 2307#endif
2005 2308
2006/* 2309/*
2007 * Check our parents are still who we think they are. 2310 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2311 * Do transparency updates if required
… …
2018 Pixmap rootpixmap = None; 2321 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2322 XWindowAttributes wattr, wrootattr;
2020 2323
2021 pchanged = 0; 2324 pchanged = 0;
2022 2325
2023 if (!(Options & Opt_transparent)) 2326 if (!(options & Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2327 return pchanged; /* Don't try any more */
2025 2328
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2329 XGetWindowAttributes (display->display, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2330 rootdepth = wrootattr.depth;
2028 2331
… …
2031 if (rootdepth != wattr.depth) 2334 if (rootdepth != wattr.depth)
2032 { 2335 {
2033 if (am_transparent) 2336 if (am_transparent)
2034 { 2337 {
2035 pchanged = 1; 2338 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2340 am_transparent = am_pixmap_trans = 0;
2038 } 2341 }
2039 2342
2040 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
2041 } 2344 }
… …
2057 i = (xa[XA_XSETROOTID] 2360 i = (xa[XA_XSETROOTID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2361 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2363 &nitems, &bytes_after, &prop) == Success);
2061 2364
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2365 if (!i || prop == NULL
2366#if TINTING
2367 || !rs[Rs_color + Color_tint]
2368#endif
2369 )
2063 have_pixmap = 0; 2370 have_pixmap = 0;
2064 else 2371 else
2065 { 2372 {
2066 have_pixmap = 1; 2373 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2374 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2385 Window cr;
2079 XImage *image; 2386 XImage *image;
2080 GC gc; 2387 GC gc;
2081 XGCValues gcvalue; 2388 XGCValues gcvalue;
2082 2389
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2391 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2392 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2393 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2394 nx = ny = 0;
2088 2395
… …
2130 2437
2131#if TINTING 2438#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2439 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2440 {
2134 unsigned short rm, gm, bm; 2441 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2442 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2443
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2444 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2445
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2446 ShadeXImage (display, image, shade, rm, gm, bm);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2447 }
2151#endif 2448#endif
2152 2449
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2450 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2154 szHint.width, szHint.height, image->depth); 2451 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2452 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2453 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2454 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2455 XFreeGC (display->display, gc);
2159 XDestroyImage (image); 2456 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2457 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2458 XClearWindow (display->display, TermWin.parent[0]);
2161 2459
2162 if (!am_transparent || !am_pixmap_trans) 2460 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2461 pchanged = 1;
2164 2462
2165 am_transparent = am_pixmap_trans = 1; 2463 am_transparent = am_pixmap_trans = 1;
… …
2170 { 2468 {
2171 unsigned int n; 2469 unsigned int n;
2172 /* 2470 /*
2173 * InheritPixmap transparency 2471 * InheritPixmap transparency
2174 */ 2472 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2177 { 2474 {
2178 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
2181 XFree (list); 2478 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2479
2184 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
2185 { 2481 {
2186 if (oldp != None) 2482 if (oldp != None)
2187 pchanged = 1; 2483 pchanged = 1;
… …
2198 if (pchanged) 2494 if (pchanged)
2199 { 2495 {
2200 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
2201 { 2497 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2500 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2207 break; 2502 break;
2208 } 2503 }
2209 } 2504 }
2210 } 2505 }
2211 2506
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 { 2508 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2509 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2511 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
2219 } 2513 }
2220 else 2514 else
2221 { 2515 {
2222#if WAIT_FOR_WM 2516#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2519 sleep (1);
2226#endif 2520#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2523 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2524 XClearWindow (display->display, TermWin.parent[n]);
2525 }
2230 2526
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2527 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2232 am_transparent = 1; 2528 am_transparent = 1;
2233 } 2529 }
2234 2530
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
2533 }
2534
2535 if (scrollBar.win)
2536 {
2537 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle ();
2539 scrollbar_show (0);
2237 } 2540 }
2238 2541
2239 return pchanged; 2542 return pchanged;
2240} 2543}
2241#endif 2544#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2563 if (ch == NOCHAR) // TODO: improve
2261 break; 2564 break;
2262 2565
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2566 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2264 { 2567 {
2568 if (!seen_input)
2569 {
2570 seen_input = 1;
2571 // many badly-written programs (e.g. jed) contain a race condition:
2572 // they first read the screensize and then install a SIGWINCH handler.
2573 // some window managers resize the window early, and these programs
2574 // then sometimes get the size wrong.
2575 // unfortunately other programs are even more buggy and dislike
2576 // being sent SIGWINCH, so only do it when we were in fact being
2577 // resized.
2578 if (seen_resize)
2579 kill (-cmd_pid, SIGWINCH);
2580 }
2581
2265 /* Read a text string from the input buffer */ 2582 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2583 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2584 bool refreshnow = false;
2268 int nlines = 0; 2585 int nlines = 0;
2269 unicode_t *str = buf; 2586 unicode_t *str = buf;
2270 2587
2271 *str++ = ch;
2272
2273 for (;;) 2588 for (;;)
2274 { 2589 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2590 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break; 2591 break;
2280 2592
2281 *str++ = ch; 2593 *str++ = ch;
2282 2594
2283 if (ch == C0_LF) 2595 if (ch == C0_LF)
2284 { 2596 {
2285 nlines++; 2597 nlines++;
2286 refresh_count++; 2598 refresh_count++;
2287 2599
2288 if (! (Options & Opt_jumpScroll) 2600 if (!(options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2601 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2290 { 2602 {
2291 refreshnow = true; 2603 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR; 2604 ch = NOCHAR;
2294 break; 2605 break;
2295 } 2606 }
2296 2607
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2608 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2609 if (nlines >= TermWin.nrow - 1)
2299 { 2610 {
2300 scr_add_lines (buf, nlines, str - buf); 2611 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2612 nlines = 0;
2302 str = buf; 2613 str = buf;
… …
2306 if (str >= buf + UBUFSIZ) 2617 if (str >= buf + UBUFSIZ)
2307 { 2618 {
2308 ch = NOCHAR; 2619 ch = NOCHAR;
2309 break; 2620 break;
2310 } 2621 }
2622
2623 seq_begin = cmdbuf_ptr;
2624 ch = next_char ();
2311 } 2625 }
2312 2626
2313 scr_add_lines (buf, nlines, str - buf); 2627 scr_add_lines (buf, nlines, str - buf);
2314 2628
2315 /* 2629 /*
2316 * If there have been a lot of new lines, then update the screen 2630 * If there have been a lot of new lines, then update the screen
2317 * What the heck I'll cheat and only refresh less than every page-full. 2631 * What the heck I'll cheat and only refresh less than every page-full.
2318 * the number of pages between refreshes is refresh_limit, which 2632 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2633 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2634 */
2324 if (refreshnow) 2635 if (refreshnow)
2325 { 2636 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2637 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2638 refresh_limit++;
2328 else 2639 else
2640 {
2641 flag = true;
2329 scr_refresh (refresh_type); 2642 scr_refresh (refresh_type);
2643 }
2330 } 2644 }
2331 2645
2332 } 2646 }
2333 else 2647 else
2334 { 2648 {
… …
2518 process_escape_seq (); 2832 process_escape_seq ();
2519 break; 2833 break;
2520 case C0_ENQ: /* terminal Status */ 2834 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2835 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2836 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2837 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2838 else
2525 tt_write ((unsigned char *)VT100_ANS, 2839 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2840 (unsigned int)strlen (VT100_ANS));
2527 break; 2841 break;
2528 case C0_BEL: /* bell */ 2842 case C0_BEL: /* bell */
2529 scr_bell (); 2843 scr_bell ();
2530 break; 2844 break;
2531 case C0_BS: /* backspace */ 2845 case C0_BS: /* backspace */
… …
2630void 2944void
2631rxvt_term::process_escape_seq () 2945rxvt_term::process_escape_seq ()
2632{ 2946{
2633 unicode_t ch = cmd_getc (); 2947 unicode_t ch = cmd_getc ();
2634 2948
2635 if (PrivateModes & PrivMode_vt52) 2949 if (priv_modes & PrivMode_vt52)
2636 { 2950 {
2637 process_escape_vt52 (ch); 2951 process_escape_vt52 (ch);
2638 return; 2952 return;
2639 } 2953 }
2640 2954
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 2969 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 2970 break;
2657 case '+': 2971 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 2972 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 2973 break;
2660#ifndef NO_FRILLS 2974#if ENABLE_FRILLS
2661 case '6': 2975 case '6':
2662 scr_backindex (); 2976 scr_backindex ();
2663 break; 2977 break;
2664#endif 2978#endif
2665 case '7': 2979 case '7':
2666 scr_cursor (SAVE); 2980 scr_cursor (SAVE);
2667 break; 2981 break;
2668 case '8': 2982 case '8':
2669 scr_cursor (RESTORE); 2983 scr_cursor (RESTORE);
2670 break; 2984 break;
2671#ifndef NO_FRILLS 2985#if ENABLE_FRILLS
2672 case '9': 2986 case '9':
2673 scr_forwardindex (); 2987 scr_forwardindex ();
2674 break; 2988 break;
2675#endif 2989#endif
2676 case '=': 2990 case '=':
… …
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3289 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2976 break; 3290 break;
2977 3291
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3292 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3293 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3294 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3295 break;
2982 3296
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3297 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3298 process_sgr_mode (nargs, arg);
2985 break; 3299 break;
… …
2992 break; 3306 break;
2993 case 6: /* CPR requested */ 3307 case 6: /* CPR requested */
2994 scr_report_position (); 3308 scr_report_position ();
2995 break; 3309 break;
2996 case 7: /* unofficial extension */ 3310 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3311 if (options & Opt_insecure)
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3312 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3313 break;
3000 case 8: /* unofficial extension */ 3314 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3315 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3316 break;
3003 } 3317 }
… …
3039 break; 3353 break;
3040 3354
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3355 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3356 if (arg[0] == 4)
3043 scr_insert_mode (0); 3357 scr_insert_mode (0);
3358 else if (arg[0] == 20)
3359 priv_modes &= ~PrivMode_LFNL;
3044 break; 3360 break;
3045 3361
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3362 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3363 if (arg[0] == 4)
3048 scr_insert_mode (1); 3364 scr_insert_mode (1);
3365 else if (arg[0] == 20)
3366 priv_modes |= PrivMode_LFNL;
3049 break; 3367 break;
3050 3368
3051 /* 3369 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3370 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3371 */
… …
3065 break; 3383 break;
3066 case CSI_75: 3384 case CSI_75:
3067 scr_cursor (RESTORE); 3385 scr_cursor (RESTORE);
3068 break; 3386 break;
3069 3387
3070#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
3071 case CSI_74: 3389 case CSI_74:
3072 process_window_ops (arg, nargs); 3390 process_window_ops (arg, nargs);
3073 break; 3391 break;
3074#endif 3392#endif
3075 3393
… …
3082 break; 3400 break;
3083 } 3401 }
3084} 3402}
3085/*}}} */ 3403/*}}} */
3086 3404
3087#ifndef NO_FRILLS 3405#if ENABLE_FRILLS
3088/* ARGSUSED */ 3406/* ARGSUSED */
3089void 3407void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3408rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3409{
3092 int x, y; 3410 int x, y;
… …
3159 break; 3477 break;
3160 case 19: /* report window size (chars) */ 3478 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3479 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3162 break; 3480 break;
3163 case 20: /* report icon label */ 3481 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3482 {
3166 char *s; 3483 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3484 XGetIconName (display->display, TermWin.parent[0], &s);
3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3485 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3486 XFree (s);
3169 } 3487 }
3170 break; 3488 break;
3171 case 21: /* report window title */ 3489 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3490 {
3174 char *s; 3491 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3492 XFetchName (display->display, TermWin.parent[0], &s);
3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3493 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s);
3177 } 3495 }
3178 break; 3496 break;
3179 } 3497 }
3180} 3498}
3181#endif 3499#endif
3182 3500
… …
3186 * ends_how is terminator used. returned input must be free()'d 3504 * ends_how is terminator used. returned input must be free()'d
3187 */ 3505 */
3188unsigned char * 3506unsigned char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3507rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3508{
3191 unicode_t prev = 0, ch; 3509 unicode_t seen_esc = 0, ch;
3192 unsigned int n = 0; 3510 unsigned int n = 0;
3193 unsigned char *s; 3511 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3512 unsigned char string[STRING_MAX];
3195 3513
3196 while ((ch = cmd_getc ()) != NOCHAR) 3514 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3515 {
3198 if (prev == C0_ESC) 3516 if (seen_esc)
3199 { 3517 {
3200 if (ch == 0x5c) /* 7bit ST */ 3518 if (ch == 0x5c) /* 7bit ST */
3201 break; 3519 break;
3202 else 3520 else
3203 return NULL; 3521 return NULL;
3204 } 3522 }
3523 else if (ch == C0_ESC)
3524 {
3525 seen_esc = 1;
3526 continue;
3527 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3528 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3529 break;
3207 else if (ch < 0x20) 3530 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3531 return NULL; /* other control character - exit */
3532
3533 seen_esc = 0;
3209 3534
3210 if (n >= sizeof (string) - 1) 3535 if (n >= sizeof (string) - 1)
3211 // stop at some sane length 3536 // stop at some sane length
3212 return NULL; 3537 return NULL;
3213 3538
3214 if (ch == C0_SYN) 3539 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 (); 3540 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else 3541 else
3220 string[n++] = prev = ch; 3542 string[n++] = ch;
3221 } 3543 }
3222 3544
3223 string[n++] = '\0'; 3545 string[n++] = '\0';
3224 3546
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3547 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL; 3548 return NULL;
3227 3549
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3550 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3551 strncpy (s, string, n);
3230 return s; 3552 return s;
3231} 3553}
3232 3554
3233/*----------------------------------------------------------------------*/ 3555/*----------------------------------------------------------------------*/
3234/* 3556/*
… …
3279void 3601void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3602rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3281{ 3603{
3282 if (str[0] == '?' && !str[1]) 3604 if (str[0] == '?' && !str[1])
3283 { 3605 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3606 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3607 pix_colors_focused[color].get (display, r, g, b);
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3608 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3289 }
3290 } 3609 }
3291 else 3610 else
3292 set_window_color (color, str); 3611 set_window_color (color, str);
3293} 3612}
3294 3613
… …
3322{ 3641{
3323 int changed = 0; 3642 int changed = 0;
3324 int color; 3643 int color;
3325 char *buf, *name; 3644 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3645 bool query = str[0] == '?' && !str[1];
3646 int saveop = op;
3327 3647
3328 assert (str != NULL); 3648 assert (str != NULL);
3329 switch (op) 3649 switch (op)
3330 { 3650 {
3331 case XTerm_name: 3651 case XTerm_name:
… …
3380 break; 3700 break;
3381 3701
3382 case XTerm_Color: 3702 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3703 for (buf = (char *)str; buf && *buf;)
3384 { 3704 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3705 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3706 break;
3387 3707
3388 *name++ = '\0'; 3708 *name++ = '\0';
3389 color = atoi (buf); 3709 color = atoi (buf);
3390 3710
3391 if (color < 0 || color >= TOTAL_COLORS) 3711 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3712 break;
3393 3713
3394 if ((buf = STRCHR (name, ';')) != NULL) 3714 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3715 *buf++ = '\0';
3396 3716
3397 if (name[0] == '?' && !name[1]) 3717 if (name[0] == '?' && !name[1])
3398 { 3718 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3719 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3720 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3721 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 } 3722 }
3406 else 3723 else
3407 set_window_color (color + minCOLOR, name); 3724 set_window_color (color + minCOLOR, name);
3408 } 3725 }
3409 break; 3726 break;
… …
3426 break; 3743 break;
3427#ifndef NO_BOLD_UNDERLINE_REVERSE 3744#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case XTerm_Color_BD: 3745 case XTerm_Color_BD:
3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3746 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3430 break; 3747 break;
3748 case XTerm_Color_IT:
3749 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3750 break;
3431 case XTerm_Color_UL: 3751 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3752 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break; 3753 break;
3434 case XTerm_Color_RV: 3754 case XTerm_Color_RV:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3755 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3756 break;
3757#endif
3758#if TRANSPARENT || TINTING
3759 case XTerm_Color_tint:
3760 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3761 check_our_parents ();
3762 if (am_transparent)
3763 want_full_refresh = want_refresh = 1;
3436 break; 3764 break;
3437#endif 3765#endif
3438 3766
3439 case XTerm_Pixmap: 3767 case XTerm_Pixmap:
3440 if (*str != ';') 3768 if (*str != ';')
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3771 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3772 set_bgPixmap (str); /* change pixmap */
3445#endif 3773#endif
3446 scr_touch (true); 3774 scr_touch (true);
3447 } 3775 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3776 while ((str = strchr (str, ';')) != NULL)
3449 { 3777 {
3450 str++; 3778 str++;
3451#if XPM_BACKGROUND 3779#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3780 changed += scale_pixmap (str);
3453#endif 3781#endif
… …
3472 case XTerm_logfile: 3800 case XTerm_logfile:
3473 // TODO, when secure mode? 3801 // TODO, when secure mode?
3474 break; 3802 break;
3475 3803
3476 case XTerm_font: 3804 case XTerm_font:
3805 op = URxvt_font;
3806 case URxvt_font:
3807#if ENABLE_STYLES
3808 case URxvt_boldFont:
3809 case URxvt_italicFont:
3810 case URxvt_boldItalicFont:
3811#endif
3477 if (query) 3812 if (query)
3813 tt_printf ("\33]%d;%-.250s%c", saveop,
3814 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3815 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3816 resp);
3817 else
3478 { 3818 {
3479 if (Options & Opt_insecure) 3819 const char *&res = rs[Rs_font + (op - URxvt_font)];
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3820
3481 TermWin.fontset->fontdesc 3821 res = strdup (str);
3482 ? TermWin.fontset->fontdesc 3822 allocated.push_back ((void *)res);
3483 : "", 3823 set_fonts ();
3484 resp);
3485 } 3824 }
3486 else
3487 change_font (str);
3488 break; 3825 break;
3489 3826
3490#ifndef NO_FRILLS 3827#if ENABLE_FRILLS
3491 case XTerm_locale: 3828 case XTerm_locale:
3492 if (query) 3829 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3830 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3496 }
3497 else 3831 else
3498 { 3832 {
3499 set_locale (str); 3833 set_locale (str);
3500# ifdef USE_XIM 3834# ifdef USE_XIM
3501 im_cb (); 3835 im_cb ();
3502# endif 3836# endif
3503 } 3837 }
3504 break; 3838 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif 3839#endif
3515 3840
3516#ifdef MENUBAR 3841#ifdef MENUBAR
3517 case XTerm_Menu: 3842 case XTerm_Menu:
3518 if (Options & Opt_insecure) 3843 if (options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3845 break;
3521#endif 3846#endif
3522#if 0 3847#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3848 case XTerm_dumpscreen: /* no error notices */
… …
3550{ 3875{
3551 int state; 3876 int state;
3552 3877
3553 if (mode == 's') 3878 if (mode == 's')
3554 { 3879 {
3555 SavedModes |= (PrivateModes & bit); 3880 SavedModes |= (priv_modes & bit);
3556 return -1; 3881 return -1;
3557 } 3882 }
3558 else 3883 else
3559 { 3884 {
3560 if (mode == 'r') 3885 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3886 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3887 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3888 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3889 PrivMode (state, bit);
3565 } 3890 }
3566 3891
3567 return state; 3892 return state;
3568} 3893}
… …
3586 { 3, PrivMode_132 }, 3911 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 3912 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 3913 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 3914 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 3915 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 3917 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3918#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 3919 { menuBar_esc, PrivMode_menuBar },
3594#endif 3920#endif
3921 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 3923#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3924 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3925#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3926 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 3927 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3928 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3929 // 45 margin bell NYI
3605 // 46 start logging 3930 // 46 start logging
… …
3646 3971
3647 /* extra handling for values with state unkept */ 3972 /* extra handling for values with state unkept */
3648 switch (arg[i]) 3973 switch (arg[i])
3649 { 3974 {
3650 case 1048: /* alternative cursor save */ 3975 case 1048: /* alternative cursor save */
3976 case 1049:
3651 if (Options & Opt_secondaryScreen) 3977 if (options & Opt_secondaryScreen)
3652 if (mode == 0) 3978 if (mode == 0)
3653 scr_cursor (RESTORE); 3979 scr_cursor (RESTORE);
3654 else if (mode == 1) 3980 else if (mode == 1)
3655 scr_cursor (SAVE); 3981 scr_cursor (SAVE);
3656 break; 3982 break;
… …
3667 * within VT52 mode 3993 * within VT52 mode
3668 */ 3994 */
3669 PrivMode (1, PrivMode_vt52); 3995 PrivMode (1, PrivMode_vt52);
3670 break; 3996 break;
3671 case 3: /* 80/132 */ 3997 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 3998 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3674 break; 4000 break;
3675 case 4: /* smooth scrolling */ 4001 case 4: /* smooth scrolling */
3676 if (state) 4002 if (state)
3677 Options &= ~Opt_jumpScroll; 4003 options &= ~Opt_jumpScroll;
3678 else 4004 else
3679 Options |= Opt_jumpScroll; 4005 options |= Opt_jumpScroll;
3680 break; 4006 break;
3681 case 5: /* reverse video */ 4007 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4008 scr_rvideo_mode (state);
3683 break; 4009 break;
3684 case 6: /* relative/absolute origins */ 4010 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4014 scr_autowrap (state);
3689 break; 4015 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 4016 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 4017 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4018 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4019 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4020 break;
3695#ifdef menuBar_esc 4021#ifdef menuBar_esc
3696 case menuBar_esc: 4022 case menuBar_esc:
3697#ifdef MENUBAR 4023#ifdef MENUBAR
3698 map_menuBar (state); 4024 map_menuBar (state);
… …
3718 break; 4044 break;
3719 /* case 66: - application key pad */ 4045 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4046 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4047 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4048 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4049 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4050 break;
3725#if 0 4051#if 0
3726 case 1001: 4052 case 1001:
3727 break; /* X11 mouse highlighting */ 4053 break; /* X11 mouse highlighting */
3728#endif 4054#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4055 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4056 if (state)
3731 Options &= ~Opt_scrollTtyOutput; 4057 options &= ~Opt_scrollTtyOutput;
3732 else 4058 else
3733 Options |= Opt_scrollTtyOutput; 4059 options |= Opt_scrollTtyOutput;
3734 break; 4060 break;
3735 case 1011: /* scroll to bottom on key press */ 4061 case 1011: /* scroll to bottom on key press */
3736 if (state) 4062 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4063 options |= Opt_scrollTtyKeypress;
3738 else 4064 else
3739 Options &= ~Opt_scrollTtyKeypress; 4065 options &= ~Opt_scrollTtyKeypress;
3740 break; 4066 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4067 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4068 if (options & Opt_secondaryScreen)
3743 if (current_screen != PRIMARY) 4069 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4070 scr_erase_screen (2);
3745 scr_change_screen (state); 4071 scr_change_screen (state);
3746 break; 4072 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4073 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4074 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4075 if (options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4077 scr_erase_screen (2);
3752 break; 4078 break;
3753 default: 4079 default:
3754 break; 4080 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4106 rendset = 0, rendstyle = ~RS_None;
3781 break; 4107 break;
3782 case 1: 4108 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4109 rendset = 1, rendstyle = RS_Bold;
3784 break; 4110 break;
3785 //case 2: // faint or second colour 4111 //case 2: // low intensity
4112 case 3:
4113 rendset = 1, rendstyle = RS_Italic;
4114 break;
3786 case 4: 4115 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4116 rendset = 1, rendstyle = RS_Uline;
3788 break; 4117 break;
3789 case 5: // slowly blinking 4118 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4119 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4131 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4132 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4133 //...
3805 //case 19: // ninth alt font 4134 //case 19: // ninth alt font
3806 //case 20: // gothic 4135 //case 20: // gothic
3807 case 21: // disable bold, faint 4136 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4137 rendset = 0, rendstyle = RS_Bold;
3809 break; 4138 break;
3810 case 22: 4139 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4140 rendset = 0, rendstyle = RS_Bold;
3812 break; 4141 break;
3813 //case 23: disable italic 4142 case 23: // disable italic
4143 rendset = 0, rendstyle = RS_Italic;
4144 break;
3814 case 24: 4145 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4146 rendset = 0, rendstyle = RS_Uline;
3816 break; 4147 break;
3817 case 25: 4148 case 25:
4149 rendset = 0, rendstyle = RS_Blink;
4150 break;
4151 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4152 rendset = 0, rendstyle = RS_Blink;
3819 break; 4153 break;
3820 case 27: 4154 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4155 rendset = 0, rendstyle = RS_RVid;
3822 break; 4156 break;
… …
3840 case 35: 4174 case 35:
3841 case 36: 4175 case 36:
3842 case 37: 4176 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4177 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4178 break;
3845#ifdef TTY_256COLOR 4179 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4180 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4181 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4182 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4183 i += 2;
3851 } 4184 }
3852 break; 4185 break;
3853#endif
3854 case 39: /* default fg */ 4186 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4187 scr_color (Color_fg, Color_fg);
3856 break; 4188 break;
3857 4189
3858 case 40: 4190 case 40:
… …
3863 case 45: 4195 case 45:
3864 case 46: 4196 case 46:
3865 case 47: 4197 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4199 break;
3868#ifdef TTY_256COLOR 4200 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4202 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4204 i += 2;
3874 } 4205 }
3875 break; 4206 break;
3876#endif
3877 case 49: /* default bg */ 4207 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4208 scr_color (Color_bg, Color_bg);
3879 break; 4209 break;
4210
4211 //case 50: // not variable spacing
3880 4212
3881#ifndef NO_BRIGHTCOLOR 4213#ifndef NO_BRIGHTCOLOR
3882 case 90: 4214 case 90:
3883 case 91: /* set bright fg color */ 4215 case 91: /* set bright fg color */
3884 case 92: 4216 case 92:
3885 case 93: 4217 case 93:
3886 case 94: 4218 case 94:
3887 case 95: 4219 case 95:
3888 case 96: 4220 case 96:
3889 case 97: 4221 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4222 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4223 break;
3893 case 100: 4224 case 100:
3894 case 101: /* set bright bg color */ 4225 case 101: /* set bright bg color */
3895 case 102: 4226 case 102:
3896 case 103: 4227 case 103:
3897 case 104: 4228 case 104:
3898 case 105: 4229 case 105:
3899 case 106: 4230 case 106:
3900 case 107: 4231 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4233 break;
3904#endif 4234#endif
3905 4235
3906 } 4236 }
3907 } 4237 }
… …
3914{ 4244{
3915 unicode_t ch, cmd = cmd_getc (); 4245 unicode_t ch, cmd = cmd_getc ();
3916 4246
3917 if (cmd == 'Q') 4247 if (cmd == 'Q')
3918 { /* query graphics */ 4248 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4249 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4250 return;
3921 } 4251 }
3922 /* swallow other graphics sequences until terminating ':' */ 4252 /* swallow other graphics sequences until terminating ':' */
3923 do 4253 do
3924 ch = cmd_getc (); 4254 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4269 unsigned char buf[256];
3940 4270
3941 va_start (arg_ptr, fmt); 4271 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4273 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4274 tt_write (buf, strlen (buf));
3945} 4275}
3946 4276
3947/* ---------------------------------------------------------------------- */ 4277/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4278/* Write data to the pty as typed by the user, pasted with the mouse,
3949 * or generated by us in response to a query ESC sequence. 4279 * or generated by us in response to a query ESC sequence.
3950 */ 4280 */
3951void 4281void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4282rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{ 4283{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4284 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3955 4285
3956 if (len) 4286 if (len)
3957 { 4287 {
3958 if (v_buflen == 0) 4288 if (v_buflen == 0)
3959 { 4289 {
3960 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4290 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3961 4291
3962 if ((unsigned int)written == len) 4292 if ((unsigned int)written == len)
3963 return; 4293 return;
3964 4294
3965 data += written; 4295 data += written;
… …
3973 v_buflen += len; 4303 v_buflen += len;
3974 } 4304 }
3975 4305
3976 for (;;) 4306 for (;;)
3977 { 4307 {
3978 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4308 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3979 4309
3980 if (written > 0) 4310 if (written > 0)
3981 { 4311 {
3982 v_buflen -= written; 4312 v_buflen -= written;
3983 4313

Diff Legend

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