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.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.145 by root, Mon Aug 16 12:04:57 2004 UTC

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

Diff Legend

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