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.39 by pcg, Mon Feb 9 07:15:46 2004 UTC vs.
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent &ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69 /* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
… …
77 meta = (ev.state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev.state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev.state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
… …
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
115 wkbuf[len] = 0; 123 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 125 if (len < 0)
118 len = 0; 126 len = 0;
127 }
119 } 128 }
120 else 129 else
121 len = 0; 130 len = 0;
122 } 131 }
123 132
124 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
126 } 135 }
127 else 136 else
128#endif 137#endif
129
130 { 138 {
131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
133 } 141 }
134 142
135 if (valid_keysym) 143 if (valid_keysym)
136 { 144 {
137 /* for some backwards compatibility */ 145 /* for some backwards compatibility */
… …
142 if (meta) 150 if (meta)
143# endif 151# endif
144 { 152 {
145 if (keysym == ks_bigfont) 153 if (keysym == ks_bigfont)
146 { 154 {
147 change_font (0, FONT_UP); 155 change_font (FONT_UP);
148 return; 156 return;
149 } 157 }
150 else if (keysym == ks_smallfont) 158 else if (keysym == ks_smallfont)
151 { 159 {
152 change_font (0, FONT_DN); 160 change_font (FONT_DN);
153 return; 161 return;
154 } 162 }
155 } 163 }
156#endif 164#endif
157 165
… …
162 { 170 {
163#else 171#else
164 if (IS_SCROLL_MOD) 172 if (IS_SCROLL_MOD)
165 { 173 {
166#endif 174#endif
167 int lnsppg; 175 int lnsppg;
168 176
169#ifdef PAGING_CONTEXT_LINES 177#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 179#else
172 lnsppg = TermWin.nrow * 4 / 5; 180 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 218 scr_move_to (1, 0);
211 return; 219 return;
212 } 220 }
213 } 221 }
214#endif 222#endif
215
216 } 223 }
217 224
218 if (shft) 225 if (shft)
219 { 226 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 227 /* Shift + F1 - F10 generates F11 - F20 */
… …
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 238 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev.time, 0, 0); 239 selection_request (ev.time, 0, 0);
233 return; 240 return;
234 /* rxvt extras */ 241 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 242 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 243 change_font (FONT_UP);
237 return; 244 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 246 change_font (FONT_DN);
240 return; 247 return;
241 } 248 }
242 } 249 }
243 } 250 }
244#ifdef PRINTPIPE 251#ifdef PRINTPIPE
… …
246 { 253 {
247 scr_printscreen (ctrl | shft); 254 scr_printscreen (ctrl | shft);
248 return; 255 return;
249 } 256 }
250#endif 257#endif
251#ifdef GREEK_SUPPORT
252 if (keysym == ks_greekmodeswith)
253 {
254 greek_mode = !greek_mode;
255 if (greek_mode)
256 {
257 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset();
261 }
262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return;
265 }
266#endif
267 258
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 259 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 260 {
270#ifdef KEYSYM_RESOURCE 261#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 263 {
273 unsigned int l; 264 unsigned int l;
274 const unsigned char *kbuf0; 265 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC; 266 const unsigned char ch = C0_ESC;
276 267
… …
286 tt_write (kbuf0, l); 277 tt_write (kbuf0, l);
287 return; 278 return;
288 } 279 }
289 else 280 else
290#endif 281#endif
291
292 { 282 {
293 newlen = 1; 283 newlen = 1;
294 switch (keysym) 284 switch (keysym)
295 { 285 {
296#ifndef NO_BACKSPACE_KEY 286#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 287 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 288 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 289 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 291 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 292 kbuf[1] = '\0';
303 } 293 }
304 else 294 else
305 STRCPY(kbuf, key_backspace); 295 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 {
309 int col, row;
310
311 newlen = STRLEN(kbuf);
312 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
316 }
317# endif
318 break; 296 break;
319#endif 297#endif
320#ifndef NO_DELETE_KEY 298#ifndef NO_DELETE_KEY
321 case XK_Delete: 299 case XK_Delete:
322 STRCPY(kbuf, key_delete); 300 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack)
325 {
326 int col, row;
327
328 newlen = STRLEN(kbuf);
329 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
333 }
334# endif
335 break; 301 break;
336#endif 302#endif
337 case XK_Tab: 303 case XK_Tab:
338 if (shft) 304 if (shft)
339 STRCPY(kbuf, "\033[Z"); 305 STRCPY (kbuf, "\033[Z");
340 else 306 else
341 { 307 {
342#ifdef CTRL_TAB_MAKES_META 308#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 309 if (ctrl)
344 meta = 1; 310 meta = 1;
… …
348 meta = 1; 314 meta = 1;
349#endif 315#endif
350 newlen = 0; 316 newlen = 0;
351 } 317 }
352 break; 318 break;
353
354 319
355#ifdef XK_KP_Left 320#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 321 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 322 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 323 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 324 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 326 {
362 STRCPY(kbuf, "\033OZ"); 327 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 328 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 329 break;
365 } 330 }
366 else 331 else
367 /* translate to std. cursor key */ 332 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 333 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 335#endif
371 case XK_Up: /* "\033[A" */ 336 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 337 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 338 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 339 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 340 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 341 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 342 /* do Shift first */
378 if (shft) 343 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 344 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 345 else if (ctrl)
381 { 346 {
382 kbuf[1] = 'O'; 347 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 348 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 349 }
385 else if (PrivateModes & PrivMode_aplCUR) 350 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 351 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET
388 //TODO: ??
389 if (Options & Opt_mc_hack)
390 {
391 int col, row, m;
392
393 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines;
395 m = 0;
396 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col]))
398 m = 1;
399 else if (keysym == XK_Left)
400 {
401 if (col > 0)
402 {
403 if (IS_MULTI2(screen.rend[row][col - 1]))
404 m = 1;
405 }
406 else if (screen.cur.row > 0)
407 {
408 col = screen.tlen[--row];
409 if (col == -1)
410 col = TermWin.ncol - 1;
411 else
412 col--;
413 if (col > 0
414 && IS_MULTI2(screen.rend[row][col]))
415 m = 1;
416 }
417 }
418 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
420 }
421#endif
422 break; 352 break;
423 353
424#ifndef UNSHIFTED_SCROLLKEYS 354#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 355# ifdef XK_KP_Prior
426 case XK_KP_Prior: 356 case XK_KP_Prior:
427 /* allow shift to override */ 357 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 358 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 359 {
430 STRCPY(kbuf, "\033Oy"); 360 STRCPY (kbuf, "\033Oy");
431 break; 361 break;
432 } 362 }
433 /* FALLTHROUGH */ 363 /* FALLTHROUGH */
434# endif 364# endif
435 case XK_Prior: 365 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 366 STRCPY (kbuf, "\033[5~");
437 break; 367 break;
438# ifdef XK_KP_Next 368# ifdef XK_KP_Next
439 case XK_KP_Next: 369 case XK_KP_Next:
440 /* allow shift to override */ 370 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 371 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 372 {
443 STRCPY(kbuf, "\033Os"); 373 STRCPY (kbuf, "\033Os");
444 break; 374 break;
445 } 375 }
446 /* FALLTHROUGH */ 376 /* FALLTHROUGH */
447# endif 377# endif
448 case XK_Next: 378 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 379 STRCPY (kbuf, "\033[6~");
450 break; 380 break;
451#endif 381#endif
452 case XK_KP_Enter: 382 case XK_KP_Enter:
453 /* allow shift to override */ 383 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 385 {
456 STRCPY(kbuf, "\033OM"); 386 STRCPY (kbuf, "\033OM");
457 } 387 }
458 else 388 else
459 { 389 {
460 kbuf[0] = '\r'; 390 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 391 kbuf[1] = '\0';
462 } 392 }
463 break; 393 break;
464 394
465#ifdef XK_KP_Begin 395#ifdef XK_KP_Begin
466 case XK_KP_Begin: 396 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 397 STRCPY (kbuf, "\033Ou");
468 break; 398 break;
469 399
470 case XK_KP_Insert: 400 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 401 STRCPY (kbuf, "\033Op");
472 break; 402 break;
473 403
474 case XK_KP_Delete: 404 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 405 STRCPY (kbuf, "\033On");
476 break; 406 break;
477#endif 407#endif
478 case XK_KP_F1: /* "\033OP" */ 408 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 409 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 410 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 411 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 412 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 413 kbuf[2] += (keysym - XK_KP_F1);
484 break; 414 break;
485 415
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 416 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 417 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 418 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 419 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 420 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 421 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 422 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 430 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 431 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 432 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 433 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 434 {
505 STRCPY(kbuf, "\033Oj"); 435 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 436 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 437 }
508 else 438 else
509 { 439 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 440 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 441 kbuf[1] = '\0';
512 } 442 }
513 break; 443 break;
514 444
515 case XK_Find: 445 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 446 STRCPY (kbuf, "\033[1~");
517 break; 447 break;
518 case XK_Insert: 448 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 449 STRCPY (kbuf, "\033[2~");
520 break; 450 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 451#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 452 case DXK_Remove:
523 /* FALLTHROUGH */ 453 /* FALLTHROUGH */
524#endif 454#endif
525 case XK_Execute: 455 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 456 STRCPY (kbuf, "\033[3~");
527 break; 457 break;
528 case XK_Select: 458 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 459 STRCPY (kbuf, "\033[4~");
530 break; 460 break;
531#ifdef XK_KP_End 461#ifdef XK_KP_End
532 case XK_KP_End: 462 case XK_KP_End:
533 /* allow shift to override */ 463 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 464 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 465 {
536 STRCPY(kbuf, "\033Oq"); 466 STRCPY (kbuf, "\033Oq");
537 break; 467 break;
538 } 468 }
539 /* FALLTHROUGH */ 469 /* FALLTHROUGH */
540#endif 470#endif
541 case XK_End: 471 case XK_End:
542 STRCPY(kbuf, KS_END); 472 STRCPY (kbuf, KS_END);
543 break; 473 break;
544#ifdef XK_KP_Home 474#ifdef XK_KP_Home
545 case XK_KP_Home: 475 case XK_KP_Home:
546 /* allow shift to override */ 476 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 477 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 478 {
549 STRCPY(kbuf, "\033Ow"); 479 STRCPY (kbuf, "\033Ow");
550 break; 480 break;
551 } 481 }
552 /* FALLTHROUGH */ 482 /* FALLTHROUGH */
553#endif 483#endif
554 case XK_Home: 484 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 485 STRCPY (kbuf, KS_HOME);
556 break; 486 break;
557 487
558#define FKEY(n, fkey) \ 488#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 489 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 490
561 case XK_F1: /* "\033[11~" */ 491 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 492 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 493 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 494 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 495 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 496 FKEY (11, XK_F1);
567 break; 497 break;
568 case XK_F6: /* "\033[17~" */ 498 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 499 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 500 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 501 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 502 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 503 FKEY (17, XK_F6);
574 break; 504 break;
575 case XK_F11: /* "\033[23~" */ 505 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 506 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 507 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 508 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 509 FKEY (23, XK_F11);
580 break; 510 break;
581 case XK_F15: /* "\033[28~" */ 511 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 512 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 513 FKEY (28, XK_F15);
584 break; 514 break;
585 case XK_Help: /* "\033[28~" */ 515 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 516 FKEY (28, XK_Help);
587 break; 517 break;
588 case XK_Menu: /* "\033[29~" */ 518 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 519 FKEY (29, XK_Menu);
590 break; 520 break;
591 case XK_F17: /* "\033[31~" */ 521 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 522 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 523 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 524 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 535 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 536 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 537 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 538 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 539 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 540 FKEY (31, XK_F17);
611 break; 541 break;
612#undef FKEY 542#undef FKEY
613 default: 543 default:
614 newlen = 0; 544 newlen = 0;
615 break; 545 break;
616 } 546 }
617 if (newlen) 547 if (newlen)
618 len = STRLEN(kbuf); 548 len = STRLEN (kbuf);
619 } 549 }
620 /* 550 /*
621 * Pass meta for all function keys, if 'meta' option set 551 * Pass meta for all function keys, if 'meta' option set
622 */ 552 */
623#ifdef META8_OPTION 553#ifdef META8_OPTION
… …
641 571
642 for (ch = kbuf; ch < kbuf + len; ch++) 572 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 573 *ch |= 0x80;
644 meta = 0; 574 meta = 0;
645 } 575 }
646#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat(kbuf, len);
650#endif 576#endif
651 /* nil */ ; 577 /* nil */ ;
652 } 578 }
653 } 579 }
654 580
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 603 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 604
679 /* escape prefix */ 605 /* escape prefix */
680 if (meta 606 if (meta
681#ifdef META8_OPTION 607#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 608 && meta_char == C0_ESC
683#endif 609#endif
684 ) 610 )
685 { 611 {
686 const unsigned char ch = C0_ESC; 612 const unsigned char ch = C0_ESC;
687
688 tt_write(&ch, 1); 613 tt_write (&ch, 1);
689 } 614 }
615
690#ifdef DEBUG_CMD 616#if defined(DEBUG_CMD)
691 if (debug_key)
692 { /* Display keyboard buffer contents */ 617 /* Display keyboard buffer contents */
693 char *p; 618 unsigned char *p;
694 int i; 619 int i;
695 620
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 621 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 622 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 623 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 624 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */ 625#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 626 tt_write (kbuf, (unsigned int)len);
703} 627}
704/*}}} */ 628/*}}} */
705 629
706#if (MENUBAR_MAX) 630#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 631/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 632/* attempt to `write' count to the input buffer */
709unsigned int 633unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 634rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 635{
712 unsigned int n, s; 636 unsigned int n, s;
713 637
714 n = cmdbuf_ptr - cmdbuf_base; 638 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 639 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
640
716 if (n > 0 && s < count) 641 if (n > 0 && s < count)
717 { 642 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 643 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 644 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 645 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 646 cmdbuf_endp -= n;
722 s += n; 647 s += n;
723 } 648 }
649
724 if (count > s) 650 if (count > s)
725 { 651 {
726 rxvt_print_error("data loss: cmd_write too large"); 652 rxvt_print_error ("data loss: cmd_write too large");
727 count = s; 653 count = s;
728 } 654 }
655
729 for (; count--;) 656 for (; count--;)
730 *cmdbuf_endp++ = *str++; 657 *cmdbuf_endp++ = *str++;
658
659 cmd_parse ();
660
731 return 0; 661 return 0;
732} 662}
733#endif /* MENUBAR_MAX */ 663#endif /* MENUBAR_MAX */
734 664
735void 665void
… …
753 IMSendSpot (); 683 IMSendSpot ();
754#endif 684#endif
755 685
756 } 686 }
757 687
758 XFlush (display->display); 688 display->flush ();
759} 689}
760 690
761void 691void
762rxvt_term::check_cb (check_watcher &w) 692rxvt_term::check_cb (check_watcher &w)
763{ 693{
… …
807 cmdbuf_endp += n; 737 cmdbuf_endp += n;
808 return true; 738 return true;
809 } 739 }
810 else if (n < 0 && errno != EAGAIN) 740 else if (n < 0 && errno != EAGAIN)
811 destroy (); 741 destroy ();
812 742
813 return false; 743 return false;
814} 744}
815 745
816void 746void
817rxvt_term::pty_cb (io_watcher &w, short revents) 747rxvt_term::pty_cb (io_watcher &w, short revents)
… …
834 seen_input = 1; 764 seen_input = 1;
835 /* once we know the shell is running, send the screen size. Again! */ 765 /* once we know the shell is running, send the screen size. Again! */
836 tt_winch (); 766 tt_winch ();
837 } 767 }
838 768
769 if (cmd_parse ())
770 break;
771 }
772 }
773}
774
775bool
776rxvt_term::cmd_parse ()
777{
778 bool flag = false;
839 uint32_t ch = NOCHAR; 779 uint32_t ch = NOCHAR;
780
781 for (;;)
782 {
783 if (ch == NOCHAR)
784 ch = next_char ();
785
786 if (ch == NOCHAR) // TODO: improve
787 break;
788
789 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
790 {
791 /* Read a text string from the input buffer */
792 uint32_t buf[BUFSIZ];
793 bool refreshnow = false;
794 int nlines = 0;
795 uint32_t *str = buf;
796
797 *str++ = ch;
840 798
841 for (;;) 799 for (;;)
842 { 800 {
843 if (ch == NOCHAR)
844 ch = next_char (); 801 ch = next_char ();
845 802
846 if (ch == NOCHAR) // TODO: improve 803 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
847 break; 804 break;
848 805 else
849 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
850 { 806 {
851 /* Read a text string from the input buffer */
852 uint32_t buf[BUFSIZ];
853 bool refreshnow = false;
854 int nlines = 0;
855 uint32_t *str = buf;
856
857 *str++ = ch; 807 *str++ = ch;
858 808
859 for (;;) 809 if (ch == '\n')
860 { 810 {
861 ch = next_char ();
862
863 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
864 break;
865 else 811 nlines++;
812 refresh_count++;
813
814 if (! (Options & Opt_jumpScroll)
815 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
866 { 816 {
867 *str++ = ch;
868
869 if (ch == '\n')
870 {
871 nlines++;
872 refresh_count++;
873
874 if (!(Options & Opt_jumpScroll)
875 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
876 {
877 refreshnow = true; 817 refreshnow = true;
878 flag = false; 818 flag = false;
879 ch = NOCHAR; 819 ch = NOCHAR;
880 break; 820 break;
881 } 821 }
882 822
883 // scr_add_lines only works for nlines < TermWin.nrow - 1. 823 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1) 824 if (nlines >= TermWin.nrow - 1)
885 { 825 {
886 scr_add_lines (buf, nlines, str - buf); 826 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0; 827 nlines = 0;
888 str = buf; 828 str = buf;
889 }
890 }
891
892 if (str >= buf + BUFSIZ)
893 {
894 ch = NOCHAR;
895 break;
896 }
897 } 829 }
898 } 830 }
899 831
900 scr_add_lines (buf, nlines, str - buf); 832 if (str >= buf + BUFSIZ)
901
902 /*
903 * If there have been a lot of new lines, then update the screen
904 * What the heck I'll cheat and only refresh less than every page-full.
905 * the number of pages between refreshes is refresh_limit, which
906 * is incremented here because we must be doing flat-out scrolling.
907 *
908 * refreshing should be correct for small scrolls, because of the
909 * time-out
910 */
911 if (refreshnow)
912 { 833 {
913 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 834 ch = NOCHAR;
914 refresh_limit++; 835 break;
915
916 scr_refresh (refresh_type);
917 } 836 }
918
919 }
920 else
921 {
922 switch (ch)
923 {
924 default:
925 process_nonprinting (ch);
926 break;
927 case C0_ESC: /* escape char */
928 process_escape_seq ();
929 break;
930 /*case 0x9b: */ /* CSI */
931 /* process_csi_seq (); */
932 }
933
934 ch = NOCHAR;
935 } 837 }
936 } 838 }
839
840 scr_add_lines (buf, nlines, str - buf);
841
842 /*
843 * If there have been a lot of new lines, then update the screen
844 * What the heck I'll cheat and only refresh less than every page-full.
845 * the number of pages between refreshes is refresh_limit, which
846 * is incremented here because we must be doing flat-out scrolling.
847 *
848 * refreshing should be correct for small scrolls, because of the
849 * time-out
850 */
851 if (refreshnow)
852 {
853 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
854 refresh_limit++;
855
856 scr_refresh (refresh_type);
857 }
858
859 }
860 else
937 } 861 {
862 switch (ch)
863 {
864 default:
865 process_nonprinting (ch);
866 break;
867 case C0_ESC: /* escape char */
868 process_escape_seq ();
869 break;
870 /*case 0x9b: */ /* CSI */
871 /* process_csi_seq (); */
872 }
873
874 ch = NOCHAR;
875 }
938 } 876 }
877
878 return flag;
939} 879}
940 880
941// read the next character, currently handles UTF-8 881// read the next character, currently handles UTF-8
942// will probably handle all sorts of other stuff in the future 882// will probably handle all sorts of other stuff in the future
943uint32_t 883uint32_t
944rxvt_term::next_char () 884rxvt_term::next_char ()
945{ 885{
946 while (cmdbuf_ptr < cmdbuf_endp) 886 while (cmdbuf_ptr < cmdbuf_endp)
947 { 887 {
948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 888 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
889 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
890 || !*cmdbuf_ptr)
949 return *cmdbuf_ptr++; 891 return *cmdbuf_ptr++;
950 892
951 wchar_t wc; 893 wchar_t wc;
952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 894 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
953 895
954 if (len == (size_t)-2) 896 if (len == (size_t)-2)
955 return NOCHAR; 897 {
898 // the mbstate stores incomplete sequences. didn't know this :/
899 cmdbuf_ptr = cmdbuf_endp;
900 break;
901 }
956 902
957 if (len == (size_t)-1) 903 if (len == (size_t)-1)
958 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 904 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
959 905
960 // assume wchar == unicode 906 // assume wchar == unicode
… …
963 } 909 }
964 910
965 return NOCHAR; 911 return NOCHAR;
966} 912}
967 913
968/* rxvt_cmd_getc() - Return next input character */ 914/* rxvt_cmd_getc () - Return next input character */
969/* 915/*
970 * Return the next input character after first passing any keyboard input 916 * Return the next input character after first passing any keyboard input
971 * to the command. 917 * to the command.
972 */ 918 */
973uint32_t 919uint32_t
… …
1001} 947}
1002 948
1003void 949void
1004rxvt_term::pointer_blank () 950rxvt_term::pointer_blank ()
1005{ 951{
1006 if (!(Options & Opt_pointerBlank)) 952 if (! (Options & Opt_pointerBlank))
1007 return; 953 return;
1008 954
1009 XDefineCursor (display->display, TermWin.vt, blank_cursor); 955 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1010 XFlush (display->display); 956 XFlush (display->display);
1011 957
… …
1021 pointer_blank (); 967 pointer_blank ();
1022} 968}
1023#endif 969#endif
1024 970
1025void 971void
1026rxvt_term::mouse_report (const XButtonEvent &ev) 972rxvt_term::mouse_report (XButtonEvent &ev)
1027{ 973{
1028 int button_number, key_state = 0; 974 int button_number, key_state = 0;
1029 int x, y; 975 int x, y;
1030 976
1031 x = ev.x; 977 x = ev.x;
1032 y = ev.y; 978 y = ev.y;
1033 pixel_position (&x, &y); 979 pixel_position (&x, &y);
1034 980
… …
1071#endif 1017#endif
1072 1018
1073 } 1019 }
1074 1020
1075#ifdef DEBUG_MOUSEREPORT 1021#ifdef DEBUG_MOUSEREPORT
1076 fprintf(stderr, "Mouse ["); 1022 fprintf (stderr, "Mouse [");
1077 if (key_state & 16) 1023 if (key_state & 16)
1078 fputc('C', stderr); 1024 fputc ('C', stderr);
1079 if (key_state & 4) 1025 if (key_state & 4)
1080 fputc('S', stderr); 1026 fputc ('S', stderr);
1081 if (key_state & 8) 1027 if (key_state & 8)
1082 fputc('A', stderr); 1028 fputc ('A', stderr);
1083 if (key_state & 32) 1029 if (key_state & 32)
1084 fputc('2', stderr); 1030 fputc ('2', stderr);
1085 fprintf(stderr, "]: <%d>, %d/%d\n", 1031 fprintf (stderr, "]: <%d>, %d/%d\n",
1086 button_number, 1032 button_number,
1087 x + 1, 1033 x + 1,
1088 y + 1); 1034 y + 1);
1089#else 1035#else
1090 tt_printf("\033[M%c%c%c", 1036 tt_printf ("\033[M%c%c%c",
1091 (32 + button_number + key_state), 1037 (32 + button_number + key_state),
1092 (32 + x + 1), 1038 (32 + x + 1),
1093 (32 + y + 1)); 1039 (32 + y + 1));
1094#endif 1040#endif
1095} 1041}
1096 1042
1097#ifdef USING_W11LIB 1043#ifdef USING_W11LIB
1098void 1044void
1099rxvt_W11_process_x_event(XEvent *ev) 1045rxvt_W11_process_x_event (XEvent *ev)
1100{ 1046{
1101 rxvt_t *r = rxvt_get_r(); 1047 rxvt_t *r = rxvt_get_r ();
1102 1048
1103 x_cb (*ev); 1049 x_cb (*ev);
1104} 1050}
1105#endif 1051#endif
1106 1052
… …
1189#endif 1135#endif
1190 1136
1191#ifdef DEBUG_X 1137#ifdef DEBUG_X
1192 struct timeval tp; 1138 struct timeval tp;
1193 struct tm *ltt; 1139 struct tm *ltt;
1194 (void)gettimeofday(&tp, NULL); 1140 (void)gettimeofday (&tp, NULL);
1195 ltt = localtime(&(tp.tv_sec)); 1141 ltt = localtime (& (tp.tv_sec));
1196 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)); 1142 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));
1197#endif 1143#endif
1198 1144
1199 switch (ev.type) 1145 switch (ev.type)
1200 { 1146 {
1201 case KeyPress: 1147 case KeyPress:
… …
1203 break; 1149 break;
1204 1150
1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1206 case KeyRelease: 1152 case KeyRelease:
1207 { 1153 {
1208 if (!(ev.xkey.state & ControlMask)) 1154 if (! (ev.xkey.state & ControlMask))
1209 mouse_slip_wheel_speed = 0; 1155 mouse_slip_wheel_speed = 0;
1210 else 1156 else
1211 { 1157 {
1212 KeySym ks; 1158 KeySym ks;
1213 1159
1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0); 1160 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1215 if (ks == XK_Control_L || ks == XK_Control_R) 1161 if (ks == XK_Control_L || ks == XK_Control_R)
1216 mouse_slip_wheel_speed = 0; 1162 mouse_slip_wheel_speed = 0;
1217 } 1163 }
1218 break; 1164 break;
1219 } 1165 }
… …
1242 Atom ActualType; 1188 Atom ActualType;
1243 int ActualFormat; 1189 int ActualFormat;
1244 unsigned char *data; 1190 unsigned char *data;
1245 unsigned long Size, RemainingBytes; 1191 unsigned long Size, RemainingBytes;
1246 1192
1247 XGetWindowProperty(display->display, display->root, 1193 XGetWindowProperty (display->display, display->root,
1248 xa[XA_DNDSELECTION], 1194 xa[XA_DNDSELECTION],
1249 0L, 1000000L, 1195 0L, 1000000L,
1250 False, AnyPropertyType, 1196 False, AnyPropertyType,
1251 &ActualType, &ActualFormat, 1197 &ActualType, &ActualFormat,
1252 &Size, &RemainingBytes, 1198 &Size, &RemainingBytes,
1253 &data); 1199 &data);
1254 XChangeProperty(display->display, display->root, 1200 XChangeProperty (display->display, display->root,
1255 XA_CUT_BUFFER0, XA_STRING, 1201 XA_CUT_BUFFER0, XA_STRING,
1256 8, PropModeReplace, 1202 8, PropModeReplace,
1257 data, STRLEN(data)); 1203 data, STRLEN (data));
1258 selection_paste (display->root, XA_CUT_BUFFER0, True); 1204 selection_paste (display->root, XA_CUT_BUFFER0, True);
1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime); 1205 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1260 } 1206 }
1261#endif /* OFFIX_DND */ 1207#endif /* OFFIX_DND */
1262 break; 1208 break;
1263 1209
1264 case MappingNotify: 1210 case MappingNotify:
1265 XRefreshKeyboardMapping(&(ev.xmapping)); 1211 XRefreshKeyboardMapping (& (ev.xmapping));
1266 break; 1212 break;
1267 1213
1268 /* 1214 /*
1269 * XXX: this is not the _current_ arrangement 1215 * XXX: this is not the _current_ arrangement
1270 * Here's my conclusion: 1216 * Here's my conclusion:
… …
1295 { 1241 {
1296 TermWin.focus = 1; 1242 TermWin.focus = 1;
1297 want_refresh = 1; 1243 want_refresh = 1;
1298#ifdef USE_XIM 1244#ifdef USE_XIM
1299 if (Input_Context != NULL) 1245 if (Input_Context != NULL)
1300 XSetICFocus(Input_Context); 1246 XSetICFocus (Input_Context);
1301#endif 1247#endif
1302#ifdef CURSOR_BLINK 1248#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink) 1249 if (Options & Opt_cursorBlink)
1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1250 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1305#endif 1251#endif
… …
1312 { 1258 {
1313 TermWin.focus = 0; 1259 TermWin.focus = 0;
1314 want_refresh = 1; 1260 want_refresh = 1;
1315#ifdef USE_XIM 1261#ifdef USE_XIM
1316 if (Input_Context != NULL) 1262 if (Input_Context != NULL)
1317 XUnsetICFocus(Input_Context); 1263 XUnsetICFocus (Input_Context);
1318#endif 1264#endif
1319#ifdef CURSOR_BLINK 1265#ifdef CURSOR_BLINK
1320 if (Options & Opt_cursorBlink) 1266 if (Options & Opt_cursorBlink)
1321 cursor_blink_ev.stop (); 1267 cursor_blink_ev.stop ();
1322 hidden_cursor = 0; 1268 hidden_cursor = 0;
… …
1332 1278
1333 do 1279 do
1334 { /* Wrap lots of configures into one */ 1280 { /* Wrap lots of configures into one */
1335 width = ev.xconfigure.width; 1281 width = ev.xconfigure.width;
1336 height = ev.xconfigure.height; 1282 height = ev.xconfigure.height;
1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1283 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1338 } 1284 }
1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1285 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340 1286
1341 if (szHint.width != width || szHint.height != height) 1287 if (szHint.width != width || szHint.height != height)
1342 { 1288 {
1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1289 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1344 resize_all_windows (width, height, 1); 1290 resize_all_windows (width, height, 1);
1345 } 1291 }
1346#ifdef DEBUG_SIZE 1292#ifdef DEBUG_SIZE
1347 else 1293 else
1348 { 1294 {
1349 D_SIZE((stderr, "Size: Not resizing")); 1295 D_SIZE ((stderr, "Size: Not resizing"));
1350 } 1296 }
1351#endif 1297#endif
1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1298#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1353 if (Options & Opt_transparent) 1299 if (Options & Opt_transparent)
1354 { 1300 {
… …
1360 1306
1361 } 1307 }
1362 break; 1308 break;
1363 1309
1364 case SelectionClear: 1310 case SelectionClear:
1365 selection_clear (); 1311 display->set_selection_owner (0);
1366 break; 1312 break;
1367 1313
1368 case SelectionNotify: 1314 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1315 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1316 selection_paste (ev.xselection.requestor,
… …
1385 case MapNotify: 1331 case MapNotify:
1386 TermWin.mapped = 1; 1332 TermWin.mapped = 1;
1387#ifdef TEXT_BLINK 1333#ifdef TEXT_BLINK
1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1334 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1389#endif 1335#endif
1390 break;
1391
1392 case PropertyNotify:
1393 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1394 if (ev.xproperty.state == PropertyNewValue)
1395 selection_property (ev.xproperty.window, ev.xproperty.atom);
1396 break; 1336 break;
1397 1337
1398#ifdef TRANSPARENT 1338#ifdef TRANSPARENT
1399 case ReparentNotify: 1339 case ReparentNotify:
1400 rootwin_cb (ev); 1340 rootwin_cb (ev);
… …
1419 } 1359 }
1420 else 1360 else
1421 { 1361 {
1422 XEvent unused_event; 1362 XEvent unused_event;
1423 1363
1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1364 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1425 Expose, 1365 Expose,
1426 &unused_event)) ; 1366 &unused_event)) ;
1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1367 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1428 GraphicsExpose, 1368 GraphicsExpose,
1429 &unused_event)) ; 1369 &unused_event)) ;
1430 if (isScrollbarWindow(ev.xany.window)) 1370 if (isScrollbarWindow (ev.xany.window))
1431 { 1371 {
1432 scrollBar.setIdle(); 1372 scrollBar.setIdle ();
1433 scrollbar_show (0); 1373 scrollbar_show (0);
1434 } 1374 }
1435#ifdef MENUBAR 1375#ifdef MENUBAR
1436 if (menubar_visible () && isMenuBarWindow(ev.xany.window)) 1376 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1437 menubar_expose (); 1377 menubar_expose ();
1438#endif 1378#endif
1439#ifdef RXVT_GRAPHICS
1440 Gr_expose (ev.xany.window);
1441#endif
1442
1443 } 1379 }
1444 break; 1380 break;
1445 1381
1446 case MotionNotify: 1382 case MotionNotify:
1447#ifdef POINTER_BLANK 1383#ifdef POINTER_BLANK
1448 if (hidden_pointer) 1384 if (hidden_pointer)
1449 pointer_unblank (); 1385 pointer_unblank ();
1450#endif 1386#endif
1451#if MENUBAR 1387#if MENUBAR
1452 if (isMenuBarWindow(ev.xany.window)) 1388 if (isMenuBarWindow (ev.xany.window))
1453 { 1389 {
1454 menubar_control (&(ev.xbutton)); 1390 menubar_control (ev.xbutton);
1455 break; 1391 break;
1456 } 1392 }
1457#endif 1393#endif
1458 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1394 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1459 break; 1395 break;
1460 1396
1461 if (ev.xany.window == TermWin.vt) 1397 if (ev.xany.window == TermWin.vt)
1462 { 1398 {
1463 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1399 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1464 { 1400 {
1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1401 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1466 ; 1402 ;
1467 1403
1468 XQueryPointer(display->display, TermWin.vt, 1404 XQueryPointer (display->display, TermWin.vt,
1469 &unused_root, &unused_child, 1405 &unused_root, &unused_child,
1470 &unused_root_x, &unused_root_y, 1406 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y), 1407 & (ev.xbutton.x), & (ev.xbutton.y),
1472 &unused_mask); 1408 &unused_mask);
1473#ifdef MOUSE_THRESHOLD 1409#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1410 /* deal with a `jumpy' mouse */
1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1411 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 { 1412 {
1477#endif 1413#endif
1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1414 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1479 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1415 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1480#ifdef SELECTION_SCROLLING 1416#ifdef SELECTION_SCROLLING
1481 if (ev.xbutton.y < TermWin.int_bwidth 1417 if (ev.xbutton.y < TermWin.int_bwidth
1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1418 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1483 { 1419 {
1484 int dist; 1420 int dist;
1485 1421
1486 pending_scroll_selection=1; 1422 pending_scroll_selection=1;
1487 1423
… …
1509 { 1445 {
1510 scroll_selection_dir = DN; 1446 scroll_selection_dir = DN;
1511 dist = ev.xbutton.y - 1447 dist = ev.xbutton.y -
1512 (TermWin.int_bwidth + TermWin.height); 1448 (TermWin.int_bwidth + TermWin.height);
1513 } 1449 }
1514 scroll_selection_lines=(Pixel2Height(dist)/ 1450 scroll_selection_lines= (Pixel2Height (dist)/
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1451 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1516 MIN_IT(scroll_selection_lines, 1452 MIN_IT (scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES); 1453 SELECTION_SCROLL_MAX_LINES);
1518 } 1454 }
1519 else 1455 else
1520 { 1456 {
1521 /* we are within the text window, so we 1457 /* we are within the text window, so we
… …
1529 } 1465 }
1530#endif 1466#endif
1531 1467
1532 } 1468 }
1533 } 1469 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1470 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1535 { 1471 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1472 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1537 MotionNotify, &ev)) ; 1473 MotionNotify, &ev)) ;
1538 XQueryPointer(display->display, scrollBar.win, 1474 XQueryPointer (display->display, scrollBar.win,
1539 &unused_root, &unused_child, 1475 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y, 1476 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y), 1477 & (ev.xbutton.x), & (ev.xbutton.y),
1542 &unused_mask); 1478 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1479 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1544 scrollbar_size()); 1480 scrollbar_size ());
1545 scr_refresh (refresh_type); 1481 scr_refresh (refresh_type);
1546 refresh_limit = 0; 1482 refresh_limit = 0;
1547 scrollbar_show (1); 1483 scrollbar_show (1);
1548 } 1484 }
1549 break; 1485 break;
1550 } 1486 }
1551} 1487}
1552 1488
1553#ifdef TRANSPARENT
1554void 1489void
1555rxvt_term::rootwin_cb (XEvent &ev) 1490rxvt_term::rootwin_cb (XEvent &ev)
1556{ 1491{
1557 SET_R (this); 1492 SET_R (this);
1558 SET_LOCALE (locale); 1493 SET_LOCALE (locale);
1559 1494
1560 if (ev.type == PropertyNotify) 1495 switch (ev.type)
1561 { 1496 {
1562 /* 1497 case PropertyNotify:
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1499 {
1500 if (ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502 break;
1503 }
1504#ifdef TRANSPARENT
1505 else
1506 {
1507 /*
1563 * if user used some Esetroot compatible prog to set the root bg, 1508 * if user used some Esetroot compatible prog to set the root bg,
1564 * use the property to determine the pixmap. We use it later on. 1509 * use the property to determine the pixmap. We use it later on.
1565 */ 1510 */
1566 if (xa[XA_XROOTPMAPID] == 0) 1511 if (xa[XA_XROOTPMAPID] == 0)
1567 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False); 1512 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1568 1513
1569 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1514 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1570 return; 1515 return;
1571 } 1516 }
1572 1517
1518 /* FALLTHROUGH */
1519 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1520 if ((Options & Opt_transparent) && check_our_parents ())
1574 {
1575 if (am_transparent) 1521 if (am_transparent)
1576 want_full_refresh = 1; 1522 want_full_refresh = 1;
1577 } 1523 break;
1578}
1579#endif 1524#endif
1525 }
1526}
1580 1527
1581void 1528void
1582rxvt_term::button_press (const XButtonEvent &ev) 1529rxvt_term::button_press (XButtonEvent &ev)
1583{ 1530{
1584 int reportmode = 0, clickintime; 1531 int reportmode = 0, clickintime;
1585 1532
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1533 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1587 if (!bypass_keystate) 1534 if (!bypass_keystate)
1588 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1535 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1589 /* 1536 /*
1590 * VT window processing of button press 1537 * VT window processing of button press
1591 */ 1538 */
1592 if (ev.window == TermWin.vt) 1539 if (ev.window == TermWin.vt)
1593 { 1540 {
1594#if RXVT_GRAPHICS
1595 if (ev.subwindow != None)
1596 rxvt_Gr_ButtonPress (ev.x, ev.y);
1597 else
1598#endif
1599
1600 {
1601 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1541 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1602 if (reportmode) 1542 if (reportmode)
1543 {
1544 /* mouse report from vt window */
1545 /* save the xbutton state (for ButtonRelease) */
1546 MEvent.state = ev.state;
1547#ifdef MOUSE_REPORT_DOUBLECLICK
1548 if (ev.button == MEvent.button && clickintime)
1603 { 1549 {
1604 /* mouse report from vt window */ 1550 /* same button, within alloted time */
1605 /* save the xbutton state (for ButtonRelease) */ 1551 MEvent.clicks++;
1606 MEvent.state = ev.state; 1552 if (MEvent.clicks > 1)
1607#ifdef MOUSE_REPORT_DOUBLECLICK
1608 if (ev.button == MEvent.button && clickintime)
1609 { 1553 {
1610 /* same button, within alloted time */
1611 MEvent.clicks++;
1612 if (MEvent.clicks > 1)
1613 {
1614 /* only report double clicks */ 1554 /* only report double clicks */
1615 MEvent.clicks = 2; 1555 MEvent.clicks = 2;
1616 mouse_report (ev); 1556 mouse_report (ev);
1617 1557
1618 /* don't report the release */ 1558 /* don't report the release */
1619 MEvent.clicks = 0; 1559 MEvent.clicks = 0;
1620 MEvent.button = AnyButton; 1560 MEvent.button = AnyButton;
1621 }
1622 } 1561 }
1623 else
1624 {
1625 /* different button, or time expired */
1626 MEvent.clicks = 1;
1627 MEvent.button = ev.button;
1628 mouse_report (ev);
1629 }
1630#else
1631 MEvent.button = ev.button;
1632 mouse_report (ev);
1633#endif /* MOUSE_REPORT_DOUBLECLICK */
1634
1635 } 1562 }
1636 else 1563 else
1637 { 1564 {
1565 /* different button, or time expired */
1566 MEvent.clicks = 1;
1567 MEvent.button = ev.button;
1568 mouse_report (ev);
1569 }
1570#else
1571 MEvent.button = ev.button;
1572 mouse_report (ev);
1573#endif /* MOUSE_REPORT_DOUBLECLICK */
1574
1575 }
1576 else
1577 {
1638 if (ev.button != MEvent.button) 1578 if (ev.button != MEvent.button)
1639 MEvent.clicks = 0; 1579 MEvent.clicks = 0;
1640 switch (ev.button) 1580 switch (ev.button)
1641 { 1581 {
1642 case Button1: 1582 case Button1:
1643 /* allow shift+left click to extend selection */ 1583 /* allow shift+left click to extend selection */
1644 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1584 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1645 { 1585 {
1646 if (MEvent.button == Button1 && clickintime)
1647 selection_rotate (ev.x, ev.y);
1648 else
1649 selection_extend (ev.x, ev.y, 1);
1650 }
1651 else
1652 {
1653 if (MEvent.button == Button1 && clickintime)
1654 MEvent.clicks++;
1655 else
1656 MEvent.clicks = 1;
1657
1658 selection_click (MEvent.clicks, ev.x, ev.y);
1659 }
1660
1661 MEvent.button = Button1;
1662 break;
1663
1664 case Button3:
1665 if (MEvent.button == Button3 && clickintime) 1586 if (MEvent.button == Button1 && clickintime)
1666 selection_rotate (ev.x, ev.y); 1587 selection_rotate (ev.x, ev.y);
1667 else 1588 else
1668 selection_extend (ev.x, ev.y, 1); 1589 selection_extend (ev.x, ev.y, 1);
1590 }
1591 else
1592 {
1593 if (MEvent.button == Button1 && clickintime)
1594 MEvent.clicks++;
1595 else
1596 MEvent.clicks = 1;
1597
1598 selection_click (MEvent.clicks, ev.x, ev.y);
1599 }
1600
1601 MEvent.button = Button1;
1602 break;
1603
1604 case Button3:
1605 if (MEvent.button == Button3 && clickintime)
1606 selection_rotate (ev.x, ev.y);
1607 else
1608 selection_extend (ev.x, ev.y, 1);
1669 MEvent.button = Button3; 1609 MEvent.button = Button3;
1670 break; 1610 break;
1671 }
1672 } 1611 }
1612 }
1673 MEvent.time = ev.time; 1613 MEvent.time = ev.time;
1674 return; 1614 return;
1675 }
1676 } 1615 }
1677 1616
1678 /* 1617 /*
1679 * Scrollbar window processing of button press 1618 * Scrollbar window processing of button press
1680 */ 1619 */
1681 if (isScrollbarWindow(ev.window)) 1620 if (isScrollbarWindow (ev.window))
1682 { 1621 {
1683 scrollBar.setIdle (); 1622 scrollBar.setIdle ();
1684 /* 1623 /*
1685 * Rxvt-style scrollbar: 1624 * Rxvt-style scrollbar:
1686 * move up if mouse is above slider 1625 * move up if mouse is above slider
… …
1698 * Mouse report disabled scrollbar: 1637 * Mouse report disabled scrollbar:
1699 * arrow buttons - send up/down 1638 * arrow buttons - send up/down
1700 * click on scrollbar - send pageup/down 1639 * click on scrollbar - send pageup/down
1701 */ 1640 */
1702 if ((scrollBar.style == R_SB_NEXT 1641 if ((scrollBar.style == R_SB_NEXT
1703 && scrollbarnext_upButton(ev.y)) 1642 && scrollbarnext_upButton (ev.y))
1704 || (scrollBar.style == R_SB_RXVT 1643 || (scrollBar.style == R_SB_RXVT
1705 && scrollbarrxvt_upButton(ev.y))) 1644 && scrollbarrxvt_upButton (ev.y)))
1706 tt_printf("\033[A"); 1645 tt_printf ("\033[A");
1707 else if ((scrollBar.style == R_SB_NEXT 1646 else if ((scrollBar.style == R_SB_NEXT
1708 && scrollbarnext_dnButton(ev.y)) 1647 && scrollbarnext_dnButton (ev.y))
1709 || (scrollBar.style == R_SB_RXVT 1648 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_dnButton(ev.y))) 1649 && scrollbarrxvt_dnButton (ev.y)))
1711 tt_printf("\033[B"); 1650 tt_printf ("\033[B");
1712 else 1651 else
1713 switch (ev.button) 1652 switch (ev.button)
1714 { 1653 {
1715 case Button2: 1654 case Button2:
1716 tt_printf("\014"); 1655 tt_printf ("\014");
1717 break; 1656 break;
1718 case Button1: 1657 case Button1:
1719 tt_printf("\033[6~"); 1658 tt_printf ("\033[6~");
1720 break; 1659 break;
1721 case Button3: 1660 case Button3:
1722 tt_printf("\033[5~"); 1661 tt_printf ("\033[5~");
1723 break; 1662 break;
1724 } 1663 }
1725 } 1664 }
1726 else 1665 else
1727#endif /* NO_SCROLLBAR_REPORT */ 1666#endif /* NO_SCROLLBAR_REPORT */
… …
1729 { 1668 {
1730 char upordown = 0; 1669 char upordown = 0;
1731 1670
1732 if (scrollBar.style == R_SB_NEXT) 1671 if (scrollBar.style == R_SB_NEXT)
1733 { 1672 {
1734 if (scrollbarnext_upButton(ev.y)) 1673 if (scrollbarnext_upButton (ev.y))
1735 upordown = -1; /* up */ 1674 upordown = -1; /* up */
1736 else if (scrollbarnext_dnButton(ev.y)) 1675 else if (scrollbarnext_dnButton (ev.y))
1737 upordown = 1; /* down */ 1676 upordown = 1; /* down */
1738 } 1677 }
1739 else if (scrollBar.style == R_SB_RXVT) 1678 else if (scrollBar.style == R_SB_RXVT)
1740 { 1679 {
1741 if (scrollbarrxvt_upButton(ev.y)) 1680 if (scrollbarrxvt_upButton (ev.y))
1742 upordown = -1; /* up */ 1681 upordown = -1; /* up */
1743 else if (scrollbarrxvt_dnButton(ev.y)) 1682 else if (scrollbarrxvt_dnButton (ev.y))
1744 upordown = 1; /* down */ 1683 upordown = 1; /* down */
1745 } 1684 }
1746 if (upordown) 1685 if (upordown)
1747 { 1686 {
1748#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1771 case R_SB_ALIGN_BOTTOM: 1710 case R_SB_ALIGN_BOTTOM:
1772 csrO = scrollBar.bot - scrollBar.top; 1711 csrO = scrollBar.bot - scrollBar.top;
1773 break; 1712 break;
1774 } 1713 }
1775 if (scrollBar.style == R_SB_XTERM 1714 if (scrollBar.style == R_SB_XTERM
1776 || scrollbar_above_slider(ev.y) 1715 || scrollbar_above_slider (ev.y)
1777 || scrollbar_below_slider(ev.y)) 1716 || scrollbar_below_slider (ev.y))
1778 scr_move_to ( scrollbar_position(ev.y) - csrO, 1717 scr_move_to ( scrollbar_position (ev.y) - csrO,
1779 scrollbar_size()); 1718 scrollbar_size ());
1780 scrollBar.setMotion (); 1719 scrollBar.setMotion ();
1781 break; 1720 break;
1782 1721
1783 case Button1: 1722 case Button1:
1784 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1723 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1786 /* FALLTHROUGH */ 1725 /* FALLTHROUGH */
1787 1726
1788 case Button3: 1727 case Button3:
1789 if (scrollBar.style != R_SB_XTERM) 1728 if (scrollBar.style != R_SB_XTERM)
1790 { 1729 {
1791 if (scrollbar_above_slider(ev.y)) 1730 if (scrollbar_above_slider (ev.y))
1792# ifdef RXVT_SCROLL_FULL 1731# ifdef RXVT_SCROLL_FULL
1793 scr_page (UP, TermWin.nrow - 1); 1732 scr_page (UP, TermWin.nrow - 1);
1794# else 1733# else
1795 scr_page (UP, TermWin.nrow / 4); 1734 scr_page (UP, TermWin.nrow / 4);
1796# endif 1735# endif
1797 else if (scrollbar_below_slider(ev.y)) 1736 else if (scrollbar_below_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 1737# ifdef RXVT_SCROLL_FULL
1799 scr_page (DN, TermWin.nrow - 1); 1738 scr_page (DN, TermWin.nrow - 1);
1800# else 1739# else
1801 scr_page (DN, TermWin.nrow / 4); 1740 scr_page (DN, TermWin.nrow / 4);
1802# endif 1741# endif
… …
1805 } 1744 }
1806 else 1745 else
1807 { 1746 {
1808 scr_page ((ev.button == Button1 ? DN : UP), 1747 scr_page ((ev.button == Button1 ? DN : UP),
1809 (TermWin.nrow 1748 (TermWin.nrow
1810 * scrollbar_position(ev.y) 1749 * scrollbar_position (ev.y)
1811 / scrollbar_size())); 1750 / scrollbar_size ()));
1812 } 1751 }
1813 break; 1752 break;
1814 } 1753 }
1815 } 1754 }
1816 return; 1755 return;
1817 } 1756 }
1818#if MENUBAR 1757#if MENUBAR
1819 /* 1758 /*
1820 * Menubar window processing of button press 1759 * Menubar window processing of button press
1821 */ 1760 */
1822 if (isMenuBarWindow(ev.window)) 1761 if (isMenuBarWindow (ev.window))
1823 menubar_control (ev); 1762 menubar_control (ev);
1824#endif 1763#endif
1825} 1764}
1826 1765
1827void 1766void
1828rxvt_term::button_release (const XButtonEvent &ev) 1767rxvt_term::button_release (XButtonEvent &ev)
1829{ 1768{
1830 int reportmode = 0; 1769 int reportmode = 0;
1831 1770
1832 csrO = 0; /* reset csr Offset */ 1771 csrO = 0; /* reset csr Offset */
1833 if (!bypass_keystate) 1772 if (!bypass_keystate)
1834 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1773 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1835 1774
1836 if (scrollbar_isUpDn()) 1775 if (scrollbar_isUpDn ())
1837 { 1776 {
1838 scrollBar.setIdle (); 1777 scrollBar.setIdle ();
1839 scrollbar_show (0); 1778 scrollbar_show (0);
1840#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1841 refresh_type &= ~SMOOTH_REFRESH; 1780 refresh_type &= ~SMOOTH_REFRESH;
… …
1845#ifdef SELECTION_SCROLLING 1784#ifdef SELECTION_SCROLLING
1846 pending_scroll_selection=0; 1785 pending_scroll_selection=0;
1847#endif 1786#endif
1848 if (ev.window == TermWin.vt) 1787 if (ev.window == TermWin.vt)
1849 { 1788 {
1850#ifdef RXVT_GRAPHICS
1851 if (ev.subwindow != None)
1852 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1853 else
1854#endif
1855
1856 {
1857 if (reportmode) 1789 if (reportmode)
1790 {
1791 /* mouse report from vt window */
1792 /* don't report release of wheel "buttons" */
1793 if (ev.button >= 4)
1794 return;
1795#ifdef MOUSE_REPORT_DOUBLECLICK
1796 /* only report the release of 'slow' single clicks */
1797 if (MEvent.button != AnyButton
1798 && (ev.button != MEvent.button
1799 || (ev.time - MEvent.time
1800 > MULTICLICK_TIME / 2)))
1858 { 1801 {
1859 /* mouse report from vt window */
1860 /* don't report release of wheel "buttons" */
1861 if (ev.button >= 4)
1862 return;
1863#ifdef MOUSE_REPORT_DOUBLECLICK
1864 /* only report the release of 'slow' single clicks */
1865 if (MEvent.button != AnyButton
1866 && (ev.button != MEvent.button
1867 || (ev.time - MEvent.time
1868 > MULTICLICK_TIME / 2)))
1869 {
1870 MEvent.clicks = 0; 1802 MEvent.clicks = 0;
1871 MEvent.button = AnyButton;
1872 mouse_report (ev);
1873 }
1874#else /* MOUSE_REPORT_DOUBLECLICK */
1875 MEvent.button = AnyButton; 1803 MEvent.button = AnyButton;
1876 mouse_report (ev); 1804 mouse_report (ev);
1805 }
1806#else /* MOUSE_REPORT_DOUBLECLICK */
1807 MEvent.button = AnyButton;
1808 mouse_report (ev);
1877#endif /* MOUSE_REPORT_DOUBLECLICK */ 1809#endif /* MOUSE_REPORT_DOUBLECLICK */
1878 return; 1810 return;
1879 } 1811 }
1880 /* 1812 /*
1881 * dumb hack to compensate for the failure of click-and-drag 1813 * dumb hack to compensate for the failure of click-and-drag
1882 * when overriding mouse reporting 1814 * when overriding mouse reporting
1883 */ 1815 */
1884 if (PrivateModes & PrivMode_mouse_report 1816 if (PrivateModes & PrivMode_mouse_report
1885 && bypass_keystate 1817 && bypass_keystate
1886 && ev.button == Button1 && MEvent.clicks <= 1) 1818 && ev.button == Button1 && MEvent.clicks <= 1)
1887 selection_extend (ev.x, ev.y, 0); 1819 selection_extend (ev.x, ev.y, 0);
1888 1820
1889 switch (ev.button) 1821 switch (ev.button)
1822 {
1823 case Button1:
1824 case Button3:
1825 selection_make (ev.time);
1826 break;
1827 case Button2:
1828 selection_request (ev.time, ev.x, ev.y);
1829 break;
1830#ifdef MOUSE_WHEEL
1831 case Button4:
1832 case Button5:
1890 { 1833 {
1891 case Button1: 1834 int i;
1892 case Button3: 1835 page_dirn v;
1893 selection_make (ev.time); 1836
1837 v = (ev.button == Button4) ? UP : DN;
1838 if (ev.state & ShiftMask)
1894 break; 1839 i = 1;
1895 case Button2: 1840 else if ((Options & Opt_mouseWheelScrollPage))
1896 selection_request (ev.time, ev.x, ev.y); 1841 i = TermWin.nrow - 1;
1842 else
1897 break; 1843 i = 5;
1898#ifdef MOUSE_WHEEL 1844# ifdef MOUSE_SLIP_WHEELING
1899 case Button4: 1845 if (ev.state & ControlMask)
1900 case Button5:
1901 { 1846 {
1902 int i;
1903 page_dirn v;
1904
1905 v = (ev.button == Button4) ? UP : DN;
1906 if (ev.state & ShiftMask)
1907 i = 1;
1908 else if ((Options & Opt_mouseWheelScrollPage))
1909 i = TermWin.nrow - 1;
1910 else
1911 i = 5;
1912# ifdef MOUSE_SLIP_WHEELING
1913 if (ev.state & ControlMask)
1914 {
1915 mouse_slip_wheel_speed += (v ? -1 : 1); 1847 mouse_slip_wheel_speed += (v ? -1 : 1);
1916 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1848 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1917 } 1849 }
1918# endif 1850# endif
1919# ifdef JUMP_MOUSE_WHEEL 1851# ifdef JUMP_MOUSE_WHEEL
1852 scr_page (v, i);
1853 scr_refresh (SMOOTH_REFRESH);
1854 scrollbar_show (1);
1855# else
1856 while (i--)
1857 {
1920 scr_page (v, i); 1858 scr_page (v, 1);
1921 scr_refresh (SMOOTH_REFRESH); 1859 scr_refresh (SMOOTH_REFRESH);
1922 scrollbar_show (1); 1860 scrollbar_show (1);
1923# else
1924 while (i--)
1925 {
1926 scr_page (v, 1);
1927 scr_refresh (SMOOTH_REFRESH);
1928 scrollbar_show (1);
1929 } 1861 }
1930# endif 1862# endif
1931 1863
1932 }
1933 break;
1934#endif
1935
1936 } 1864 }
1865 break;
1866#endif
1867
1937 } 1868 }
1938 } 1869 }
1939#ifdef MENUBAR 1870#ifdef MENUBAR
1940 else if (isMenuBarWindow(ev.window)) 1871 else if (isMenuBarWindow (ev.window))
1941 menubar_control (ev); 1872 menubar_control (ev);
1942#endif 1873#endif
1943} 1874}
1944 1875
1945 1876
… …
1959 Pixmap rootpixmap = None; 1890 Pixmap rootpixmap = None;
1960 XWindowAttributes wattr, wrootattr; 1891 XWindowAttributes wattr, wrootattr;
1961 1892
1962 pchanged = 0; 1893 pchanged = 0;
1963 1894
1964 if (!(Options & Opt_transparent)) 1895 if (! (Options & Opt_transparent))
1965 return pchanged; /* Don't try any more */ 1896 return pchanged; /* Don't try any more */
1966 1897
1967 XGetWindowAttributes(display->display, display->root, &wrootattr); 1898 XGetWindowAttributes (display->display, display->root, &wrootattr);
1968 rootdepth = wrootattr.depth; 1899 rootdepth = wrootattr.depth;
1969 1900
1970 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1971 if (rootdepth != wattr.depth) 1902 if (rootdepth != wattr.depth)
1972 { 1903 {
1973 if (am_transparent) 1904 if (am_transparent)
1974 { 1905 {
1975 pchanged = 1; 1906 pchanged = 1;
1976 XSetWindowBackground(display->display, TermWin.vt, 1907 XSetWindowBackground (display->display, TermWin.vt,
1977 PixColors[Color_bg]); 1908 PixColors[Color_bg]);
1978 am_transparent = am_pixmap_trans = 0; 1909 am_transparent = am_pixmap_trans = 0;
1979 } 1910 }
1980 return pchanged; /* Don't try any more */ 1911 return pchanged; /* Don't try any more */
1981 } 1912 }
1982 1913
1983 /* Get all X ops out of the queue so that our information is up-to-date. */ 1914 /* Get all X ops out of the queue so that our information is up-to-date. */
1984 XSync(display->display, False); 1915 XSync (display->display, False);
1985 1916
1986 /* 1917 /*
1987 * Make the frame window set by the window manager have 1918 * Make the frame window set by the window manager have
1988 * the root background. Some window managers put multiple nested frame 1919 * the root background. Some window managers put multiple nested frame
1989 * windows for each client, so we have to take care about that. 1920 * windows for each client, so we have to take care about that.
1990 */ 1921 */
1991 i = (xa[XA_XROOTPMAPID] != 0 1922 i = (xa[XA_XROOTPMAPID] != 0
1992 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID], 1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success)); 1925 &nitems, &bytes_after, &prop) == Success));
1995 if (!i || prop == NULL) 1926 if (!i || prop == NULL)
1996 have_pixmap = 0; 1927 have_pixmap = 0;
1997 else 1928 else
1998 { 1929 {
1999 have_pixmap = 1; 1930 have_pixmap = 1;
2000 rootpixmap = *((Pixmap *)prop); 1931 rootpixmap = * ((Pixmap *)prop);
2001 XFree(prop); 1932 XFree (prop);
2002 } 1933 }
2003 if (have_pixmap) 1934 if (have_pixmap)
2004 { 1935 {
2005 /* 1936 /*
2006 * Copy display->root pixmap transparency 1937 * Copy display->root pixmap transparency
… …
2010 Window cr; 1941 Window cr;
2011 XImage *image; 1942 XImage *image;
2012 GC gc; 1943 GC gc;
2013 XGCValues gcvalue; 1944 XGCValues gcvalue;
2014 1945
2015 XTranslateCoordinates(display->display, TermWin.parent[0], display->root, 1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2016 0, 0, &sx, &sy, &cr); 1947 0, 0, &sx, &sy, &cr);
2017 nw = (unsigned int)szHint.width; 1948 nw = (unsigned int)szHint.width;
2018 nh = (unsigned int)szHint.height; 1949 nh = (unsigned int)szHint.height;
2019 nx = ny = 0; 1950 nx = ny = 0;
2020 if (sx < 0) 1951 if (sx < 0)
… …
2027 { 1958 {
2028 nh += sy; 1959 nh += sy;
2029 ny = -sy; 1960 ny = -sy;
2030 sy = 0; 1961 sy = 0;
2031 } 1962 }
2032 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1963 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2033 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1964 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2034 allowedxerror = -1; 1965 allowedxerror = -1;
2035 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 1966 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2036 ZPixmap); 1967 ZPixmap);
2037 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1968 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2038 /* XXX: may need a delay here? */ 1969 /* XXX: may need a delay here? */
2039 allowedxerror = 0; 1970 allowedxerror = 0;
2040 if (image == NULL) 1971 if (image == NULL)
… …
2042 if (am_transparent && am_pixmap_trans) 1973 if (am_transparent && am_pixmap_trans)
2043 { 1974 {
2044 pchanged = 1; 1975 pchanged = 1;
2045 if (TermWin.pixmap != None) 1976 if (TermWin.pixmap != None)
2046 { 1977 {
2047 XFreePixmap(display->display, TermWin.pixmap); 1978 XFreePixmap (display->display, TermWin.pixmap);
2048 TermWin.pixmap = None; 1979 TermWin.pixmap = None;
2049 } 1980 }
2050 } 1981 }
2051 am_pixmap_trans = 0; 1982 am_pixmap_trans = 0;
2052 } 1983 }
2053 else 1984 else
2054 { 1985 {
2055 if (TermWin.pixmap != None) 1986 if (TermWin.pixmap != None)
2056 XFreePixmap(display->display, TermWin.pixmap); 1987 XFreePixmap (display->display, TermWin.pixmap);
2057 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt, 1988 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2058 (unsigned int)szHint.width, 1989 (unsigned int)szHint.width,
2059 (unsigned int)szHint.height, 1990 (unsigned int)szHint.height,
2060 (unsigned int)image->depth); 1991 (unsigned int)image->depth);
2061 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue); 1992 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2062 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0, 1993 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2063 nx, ny, (unsigned int)image->width, 1994 nx, ny, (unsigned int)image->width,
2064 (unsigned int)image->height); 1995 (unsigned int)image->height);
2065 XFreeGC(display->display, gc); 1996 XFreeGC (display->display, gc);
2066 XDestroyImage(image); 1997 XDestroyImage (image);
2067 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 1998 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2068 TermWin.pixmap); 1999 TermWin.pixmap);
2069 if (!am_transparent || !am_pixmap_trans) 2000 if (!am_transparent || !am_pixmap_trans)
2070 pchanged = 1; 2001 pchanged = 1;
2071 am_transparent = am_pixmap_trans = 1; 2002 am_transparent = am_pixmap_trans = 1;
2072 } 2003 }
… …
2075 { 2006 {
2076 unsigned int n; 2007 unsigned int n;
2077 /* 2008 /*
2078 * InheritPixmap transparency 2009 * InheritPixmap transparency
2079 */ 2010 */
2080 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2011 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2081 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2012 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2082 i++) 2013 i++)
2083 { 2014 {
2084 oldp = TermWin.parent[i]; 2015 oldp = TermWin.parent[i];
2085 XQueryTree(display->display, TermWin.parent[i - 1], &root, 2016 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2086 &TermWin.parent[i], &list, &n); 2017 &TermWin.parent[i], &list, &n);
2087 XFree(list); 2018 XFree (list);
2088 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2019 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2089 if (TermWin.parent[i] == display->root) 2020 if (TermWin.parent[i] == display->root)
2090 { 2021 {
2091 if (oldp != None) 2022 if (oldp != None)
2092 pchanged = 1; 2023 pchanged = 1;
2093 break; 2024 break;
… …
2098 n = 0; 2029 n = 0;
2099 if (pchanged) 2030 if (pchanged)
2100 { 2031 {
2101 for (; n < (unsigned int)i; n++) 2032 for (; n < (unsigned int)i; n++)
2102 { 2033 {
2103 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2034 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2104 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2035 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2105 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2036 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2106 { 2037 {
2107 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2038 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2108 break; 2039 break;
2109 } 2040 }
2110 } 2041 }
2111 } 2042 }
2112 if (n > (int)(sizeof(TermWin.parent) 2043 if (n > (int) (sizeof (TermWin.parent)
2113 / sizeof(TermWin.parent[0]))) 2044 / sizeof (TermWin.parent[0])))
2114 { 2045 {
2115 D_X((stderr, "InheritPixmap Turning off")); 2046 D_X ((stderr, "InheritPixmap Turning off"));
2116 XSetWindowBackground(display->display, TermWin.parent[0], 2047 XSetWindowBackground (display->display, TermWin.parent[0],
2117 PixColors[Color_fg]); 2048 PixColors[Color_fg]);
2118 XSetWindowBackground(display->display, TermWin.vt, 2049 XSetWindowBackground (display->display, TermWin.vt,
2119 PixColors[Color_bg]); 2050 PixColors[Color_bg]);
2120 am_transparent = 0; 2051 am_transparent = 0;
2121 /* XXX: also turn off Opt_transparent? */ 2052 /* XXX: also turn off Opt_transparent? */
2122 } 2053 }
2123 else 2054 else
… …
2127# ifdef HAVE_NANOSLEEP 2058# ifdef HAVE_NANOSLEEP
2128 struct timespec rqt; 2059 struct timespec rqt;
2129 2060
2130 rqt.tv_sec = 1; 2061 rqt.tv_sec = 1;
2131 rqt.tv_nsec = 0; 2062 rqt.tv_nsec = 0;
2132 nanosleep(&rqt, NULL); 2063 nanosleep (&rqt, NULL);
2133# else 2064# else
2134 sleep(1); 2065 sleep (1);
2135# endif 2066# endif
2136 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2067 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2137 for (n = 0; n < (unsigned int)i; n++) 2068 for (n = 0; n < (unsigned int)i; n++)
2138 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n], 2069 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2139 ParentRelative); 2070 ParentRelative);
2140 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2071 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2141 ParentRelative); 2072 ParentRelative);
2142 am_transparent = 1; 2073 am_transparent = 1;
2143 } 2074 }
2144 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2075 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2145 TermWin.parent[i] = None; 2076 TermWin.parent[i] = None;
2146 } 2077 }
2147 return pchanged; 2078 return pchanged;
2148} 2079}
2149#endif 2080#endif
… …
2154/*----------------------------------------------------------------------*/ 2085/*----------------------------------------------------------------------*/
2155#ifdef PRINTPIPE 2086#ifdef PRINTPIPE
2156FILE * 2087FILE *
2157rxvt_term::popen_printer () 2088rxvt_term::popen_printer ()
2158{ 2089{
2159 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2090 FILE *stream = popen (rs[Rs_print_pipe], "w");
2160 2091
2161 if (stream == NULL) 2092 if (stream == NULL)
2162 rxvt_print_error("can't open printer pipe"); 2093 rxvt_print_error ("can't open printer pipe");
2163 return stream; 2094 return stream;
2164} 2095}
2165 2096
2166int 2097int
2167rxvt_term::pclose_printer (FILE *stream) 2098rxvt_term::pclose_printer (FILE *stream)
2168{ 2099{
2169 fflush (stream); 2100 fflush (stream);
2170 /* pclose() reported not to work on SunOS 4.1.3 */ 2101 /* pclose () reported not to work on SunOS 4.1.3 */
2171# if defined (__sun__) /* TODO: RESOLVE THIS */ 2102# if defined (__sun__) /* TODO: RESOLVE THIS */
2172 /* pclose works provided SIGCHLD handler uses waitpid */ 2103 /* pclose works provided SIGCHLD handler uses waitpid */
2173 return pclose (stream); /* return fclose (stream); */ 2104 return pclose (stream); /* return fclose (stream); */
2174# else 2105# else
2175 return pclose (stream); 2106 return pclose (stream);
… …
2198 unsigned char ch; 2129 unsigned char ch;
2199 unsigned int i, len; 2130 unsigned int i, len;
2200 2131
2201 if ((ch = cmd_getc ()) != C0_ESC) 2132 if ((ch = cmd_getc ()) != C0_ESC)
2202 { 2133 {
2203 if (putc(ch, fd) == EOF) 2134 if (putc (ch, fd) == EOF)
2204 break; /* done = 1 */ 2135 break; /* done = 1 */
2205 } 2136 }
2206 else 2137 else
2207 { 2138 {
2208 len = 0; 2139 len = 0;
… …
2220 if ((buf[len++] = cmd_getc ()) == 'i') 2151 if ((buf[len++] = cmd_getc ()) == 'i')
2221 break; /* done = 1 */ 2152 break; /* done = 1 */
2222 } 2153 }
2223 } 2154 }
2224 for (i = 0; i < len; i++) 2155 for (i = 0; i < len; i++)
2225 if (putc(buf[i], fd) == EOF) 2156 if (putc (buf[i], fd) == EOF)
2226 { 2157 {
2227 done = 1; 2158 done = 1;
2228 break; 2159 break;
2229 } 2160 }
2230 } 2161 }
… …
2250{ 2181{
2251 switch (ch) 2182 switch (ch)
2252 { 2183 {
2253 case C0_ENQ: /* terminal Status */ 2184 case C0_ENQ: /* terminal Status */
2254 if (rs[Rs_answerbackstring]) 2185 if (rs[Rs_answerbackstring])
2255 tt_write( 2186 tt_write (
2256 (const unsigned char *)rs[Rs_answerbackstring], 2187 (const unsigned char *)rs[Rs_answerbackstring],
2257 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2188 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2258 else 2189 else
2259 tt_write((unsigned char *)VT100_ANS, 2190 tt_write ((unsigned char *)VT100_ANS,
2260 (unsigned int)STRLEN(VT100_ANS)); 2191 (unsigned int)STRLEN (VT100_ANS));
2261 break; 2192 break;
2262 case C0_BEL: /* bell */ 2193 case C0_BEL: /* bell */
2263 scr_bell (); 2194 scr_bell ();
2264 break; 2195 break;
2265 case C0_BS: /* backspace */ 2196 case C0_BS: /* backspace */
… …
2327 row = cmd_getc () - ' '; 2258 row = cmd_getc () - ' ';
2328 col = cmd_getc () - ' '; 2259 col = cmd_getc () - ' ';
2329 scr_gotorc (row, col, 0); 2260 scr_gotorc (row, col, 0);
2330 break; 2261 break;
2331 case 'Z': /* identify the terminal type */ 2262 case 'Z': /* identify the terminal type */
2332 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2263 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2333 break; 2264 break;
2334 case '<': /* turn off VT52 mode */ 2265 case '<': /* turn off VT52 mode */
2335 PrivMode(0, PrivMode_vt52); 2266 PrivMode (0, PrivMode_vt52);
2336 break; 2267 break;
2337 case 'F': /* use special graphics character set */ 2268 case 'F': /* use special graphics character set */
2338 case 'G': /* use regular character set */ 2269 case 'G': /* use regular character set */
2339 /* unimplemented */ 2270 /* unimplemented */
2340 break; 2271 break;
… …
2376 scr_charset_set (2, (unsigned int)cmd_getc ()); 2307 scr_charset_set (2, (unsigned int)cmd_getc ());
2377 break; 2308 break;
2378 case '+': 2309 case '+':
2379 scr_charset_set (3, (unsigned int)cmd_getc ()); 2310 scr_charset_set (3, (unsigned int)cmd_getc ());
2380 break; 2311 break;
2381#ifdef MULTICHAR_SET
2382 case '$':
2383 scr_charset_set (-2, (unsigned int)cmd_getc ());
2384 break;
2385#endif
2386#ifndef NO_FRILLS 2312#ifndef NO_FRILLS
2387 case '6': 2313 case '6':
2388 scr_backindex (); 2314 scr_backindex ();
2389 break; 2315 break;
2390#endif 2316#endif
… …
2399 scr_forwardindex (); 2325 scr_forwardindex ();
2400 break; 2326 break;
2401#endif 2327#endif
2402 case '=': 2328 case '=':
2403 case '>': 2329 case '>':
2404 PrivMode((ch == '='), PrivMode_aplKP); 2330 PrivMode ((ch == '='), PrivMode_aplKP);
2405 break; 2331 break;
2406 2332
2407 case C1_40: 2333 case C1_40:
2408 cmd_getc (); 2334 cmd_getc ();
2409 break; 2335 break;
… …
2445 process_dcs_seq (); 2371 process_dcs_seq ();
2446 break; 2372 break;
2447 2373
2448 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2374 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2449 case C1_SCI: /* ESC Z */ 2375 case C1_SCI: /* ESC Z */
2450 tt_write((const unsigned char *)ESCZ_ANSWER, 2376 tt_write ((const unsigned char *)ESCZ_ANSWER,
2451 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2377 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2452 break; /* steal obsolete ESC [ c */ 2378 break; /* steal obsolete ESC [ c */
2453 2379
2454 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2380 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2455 case C1_CSI: /* ESC [ */ 2381 case C1_CSI: /* ESC [ */
2456 process_csi_seq (); 2382 process_csi_seq ();
… …
2496 2422
2497#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2423#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2498 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2424 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2499 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2425 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2500#define get_byte_array_bit(array, bit) \ 2426#define get_byte_array_bit(array, bit) \
2501 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2427 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2502 2428
2503const unsigned char csi_defaults[] = 2429const unsigned char csi_defaults[] =
2504 { 2430 {
2505 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2431 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2506 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2432 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2507 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2433 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2508 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2434 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2509 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2435 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2510 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2436 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2511 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2437 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2512 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2438 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2513 }; 2439 };
2514/* *INDENT-ON* */ 2440/* *INDENT-ON* */
2515 2441
2516void 2442void
2517rxvt_term::process_csi_seq () 2443rxvt_term::process_csi_seq ()
… …
2532 ch = cmd_getc (); 2458 ch = cmd_getc ();
2533 } 2459 }
2534 /* read any numerical arguments */ 2460 /* read any numerical arguments */
2535 for (n = -1; ch < CSI_ICH; ) 2461 for (n = -1; ch < CSI_ICH; )
2536 { 2462 {
2537 if (isdigit(ch)) 2463 if (isdigit (ch))
2538 { 2464 {
2539 if (n < 0) 2465 if (n < 0)
2540 n = ch - '0'; 2466 n = ch - '0';
2541 else 2467 else
2542 n = n * 10 + ch - '0'; 2468 n = n * 10 + ch - '0';
… …
2568 2494
2569 if (nargs < ESC_ARGS) 2495 if (nargs < ESC_ARGS)
2570 arg[nargs++] = n; 2496 arg[nargs++] = n;
2571 2497
2572 i = ch - CSI_ICH; 2498 i = ch - CSI_ICH;
2573 ndef = get_byte_array_bit(csi_defaults, i); 2499 ndef = get_byte_array_bit (csi_defaults, i);
2574 for (p = 0; p < nargs; p++) 2500 for (p = 0; p < nargs; p++)
2575 if (arg[p] == -1) 2501 if (arg[p] == -1)
2576 arg[p] = ndef; 2502 arg[p] = ndef;
2577 2503
2578#ifdef DEBUG_CMD 2504#ifdef DEBUG_CMD
2579 fprintf(stderr, "CSI "); 2505 fprintf (stderr, "CSI ");
2580 for (p = 0; p < nargs; p++) 2506 for (p = 0; p < nargs; p++)
2581 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2507 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2582 fprintf(stderr, "%c\n", ch); 2508 fprintf (stderr, "%c\n", ch);
2583#endif 2509#endif
2584 2510
2585 /* 2511 /*
2586 * private mode handling 2512 * private mode handling
2587 */ 2513 */
… …
2589 { 2515 {
2590 switch (priv) 2516 switch (priv)
2591 { 2517 {
2592 case '>': 2518 case '>':
2593 if (ch == CSI_DA) /* secondary device attributes */ 2519 if (ch == CSI_DA) /* secondary device attributes */
2594 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2520 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2595 break; 2521 break;
2596 case '?': 2522 case '?':
2597 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2523 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2598 process_terminal_mode (ch, priv, nargs, arg); 2524 process_terminal_mode (ch, priv, nargs, arg);
2599 break; 2525 break;
… …
2602 } 2528 }
2603 2529
2604 switch (ch) 2530 switch (ch)
2605 { 2531 {
2606 /* 2532 /*
2607 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2533 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2608 */ 2534 */
2609#ifdef PRINTPIPE 2535#ifdef PRINTPIPE
2610 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2536 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2611 switch (arg[0]) 2537 switch (arg[0])
2612 { 2538 {
… …
2708 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2634 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2709 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2635 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2710 break; 2636 break;
2711 2637
2712 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2638 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2713 tt_write((const unsigned char *)VT100_ANS, 2639 tt_write ((const unsigned char *)VT100_ANS,
2714 (unsigned int)(sizeof(VT100_ANS) - 1)); 2640 (unsigned int) (sizeof (VT100_ANS) - 1));
2715 break; 2641 break;
2716 2642
2717 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2643 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2718 process_sgr_mode (nargs, arg); 2644 process_sgr_mode (nargs, arg);
2719 break; 2645 break;
2720 2646
2721 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2647 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2722 switch (arg[0]) 2648 switch (arg[0])
2723 { 2649 {
2724 case 5: /* DSR requested */ 2650 case 5: /* DSR requested */
2725 tt_printf("\033[0n"); 2651 tt_printf ("\033[0n");
2726 break; 2652 break;
2727 case 6: /* CPR requested */ 2653 case 6: /* CPR requested */
2728 scr_report_position (); 2654 scr_report_position ();
2729 break; 2655 break;
2730#if defined (ENABLE_DISPLAY_ANSWER) 2656#if defined (ENABLE_DISPLAY_ANSWER)
2731 case 7: /* unofficial extension */ 2657 case 7: /* unofficial extension */
2732 tt_printf("%-.250s\n", rs[Rs_display_name]); 2658 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2733 break; 2659 break;
2734#endif 2660#endif
2735 case 8: /* unofficial extension */ 2661 case 8: /* unofficial extension */
2736 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2662 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2737 break; 2663 break;
2738 } 2664 }
2739 break; 2665 break;
2740 2666
2741 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2667 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2808 break; 2734 break;
2809#endif 2735#endif
2810 2736
2811 case CSI_78: /* DECREQTPARM */ 2737 case CSI_78: /* DECREQTPARM */
2812 if (arg[0] == 0 || arg[0] == 1) 2738 if (arg[0] == 0 || arg[0] == 1)
2813 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2739 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2814 /* FALLTHROUGH */ 2740 /* FALLTHROUGH */
2815 2741
2816 default: 2742 default:
2817 break; 2743 break;
2818 } 2744 }
… …
2837 { 2763 {
2838 /* 2764 /*
2839 * commands 2765 * commands
2840 */ 2766 */
2841 case 1: /* deiconify window */ 2767 case 1: /* deiconify window */
2842 XMapWindow(display->display, TermWin.parent[0]); 2768 XMapWindow (display->display, TermWin.parent[0]);
2843 break; 2769 break;
2844 case 2: /* iconify window */ 2770 case 2: /* iconify window */
2845 XIconifyWindow(display->display, TermWin.parent[0], 2771 XIconifyWindow (display->display, TermWin.parent[0],
2846 DefaultScreen(display->display)); 2772 DefaultScreen (display->display));
2847 break; 2773 break;
2848 case 3: /* set position (pixels) */ 2774 case 3: /* set position (pixels) */
2849 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 2775 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2850 break; 2776 break;
2851 case 4: /* set size (pixels) */ 2777 case 4: /* set size (pixels) */
2852 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2778 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2853 break; 2779 break;
2854 case 5: /* raise window */ 2780 case 5: /* raise window */
2855 XRaiseWindow(display->display, TermWin.parent[0]); 2781 XRaiseWindow (display->display, TermWin.parent[0]);
2856 break; 2782 break;
2857 case 6: /* lower window */ 2783 case 6: /* lower window */
2858 XLowerWindow(display->display, TermWin.parent[0]); 2784 XLowerWindow (display->display, TermWin.parent[0]);
2859 break; 2785 break;
2860 case 7: /* refresh window */ 2786 case 7: /* refresh window */
2861 scr_touch (true); 2787 scr_touch (true);
2862 break; 2788 break;
2863 case 8: /* set size (chars) */ 2789 case 8: /* set size (chars) */
2864 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2790 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2865 (unsigned int)(args[1] * TermWin.fheight)); 2791 (unsigned int) (args[1] * TermWin.fheight));
2866 break; 2792 break;
2867 default: 2793 default:
2868 if (args[0] >= 24) /* set height (chars) */ 2794 if (args[0] >= 24) /* set height (chars) */
2869 set_widthheight ((unsigned int)TermWin.width, 2795 set_widthheight ((unsigned int)TermWin.width,
2870 (unsigned int)(args[1] * TermWin.fheight)); 2796 (unsigned int) (args[1] * TermWin.fheight));
2871 break; 2797 break;
2872 /* 2798 /*
2873 * reports - some output format copied from XTerm 2799 * reports - some output format copied from XTerm
2874 */ 2800 */
2875 case 11: /* report window state */ 2801 case 11: /* report window state */
2876 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2802 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2877 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2803 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2878 break; 2804 break;
2879 case 13: /* report window position */ 2805 case 13: /* report window position */
2880 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2881 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 2807 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2882 -wattr.border_width, -wattr.border_width, 2808 -wattr.border_width, -wattr.border_width,
2883 &x, &y, &wdummy); 2809 &x, &y, &wdummy);
2884 tt_printf("\033[3;%d;%dt", x, y); 2810 tt_printf ("\033[3;%d;%dt", x, y);
2885 break; 2811 break;
2886 case 14: /* report window size (pixels) */ 2812 case 14: /* report window size (pixels) */
2887 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2813 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2888 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2814 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2889 break; 2815 break;
2890 case 18: /* report window size (chars) */ 2816 case 18: /* report window size (chars) */
2891 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2817 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2892 break; 2818 break;
2893#if 0 /* XXX: currently disabled due to security concerns */ 2819#if 0 /* XXX: currently disabled due to security concerns */
2894 case 20: /* report icon label */ 2820 case 20: /* report icon label */
2895 XGetIconName(display->display, TermWin.parent[0], &s); 2821 XGetIconName (display->display, TermWin.parent[0], &s);
2896 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2897 break; 2823 break;
2898 case 21: /* report window title */ 2824 case 21: /* report window title */
2899 XFetchName(display->display, TermWin.parent[0], &s); 2825 XFetchName (display->display, TermWin.parent[0], &s);
2900 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2901 break; 2827 break;
2902#endif 2828#endif
2903 2829
2904 } 2830 }
2905} 2831}
2906#endif 2832#endif
2907 2833
2908/*----------------------------------------------------------------------*/ 2834/*----------------------------------------------------------------------*/
2909/* 2835/*
2910 * get input up until STRING TERMINATOR (or BEL) 2836 * get input up until STRING TERMINATOR (or BEL)
2911 * ends_how is terminator used. returned input must be free()d 2837 * ends_how is terminator used. returned input must be free ()d
2912 */ 2838 */
2913unsigned char * 2839unsigned char *
2914rxvt_term::get_to_st (unsigned char *ends_how) 2840rxvt_term::get_to_st (unsigned char *ends_how)
2915{ 2841{
2916 int seen_esc = 0; /* seen escape? */ 2842 int seen_esc = 0; /* seen escape? */
… …
2931 } 2857 }
2932 else if (ch == '\t') 2858 else if (ch == '\t')
2933 ch = ' '; /* translate '\t' to space */ 2859 ch = ' '; /* translate '\t' to space */
2934 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2860 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2935 return NULL; /* other control character - exit */ 2861 return NULL; /* other control character - exit */
2936 if (n < sizeof(string) - 1) 2862 if (n < sizeof (string) - 1)
2937 string[n++] = ch; 2863 string[n++] = ch;
2938 seen_esc = 0; 2864 seen_esc = 0;
2939 } 2865 }
2940 string[n++] = '\0'; 2866 string[n++] = '\0';
2941 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2867 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2942 return NULL; 2868 return NULL;
2943 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2869 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2944 STRNCPY(s, string, n); 2870 STRNCPY (s, string, n);
2945 return s; 2871 return s;
2946} 2872}
2947 2873
2948/*----------------------------------------------------------------------*/ 2874/*----------------------------------------------------------------------*/
2949/* 2875/*
… …
2956 /* 2882 /*
2957 * Not handled yet 2883 * Not handled yet
2958 */ 2884 */
2959 s = get_to_st (&eh); 2885 s = get_to_st (&eh);
2960 if (s) 2886 if (s)
2961 free(s); 2887 free (s);
2962 return; 2888 return;
2963} 2889}
2964 2890
2965/*----------------------------------------------------------------------*/ 2891/*----------------------------------------------------------------------*/
2966/* 2892/*
… …
2971{ 2897{
2972 unsigned char ch, eh, *s; 2898 unsigned char ch, eh, *s;
2973 int arg; 2899 int arg;
2974 2900
2975 ch = cmd_getc (); 2901 ch = cmd_getc ();
2976 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2902 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2977 arg = arg * 10 + (ch - '0'); 2903 arg = arg * 10 + (ch - '0');
2978 2904
2979 if (ch == ';') 2905 if (ch == ';')
2980 { 2906 {
2981 s = get_to_st (&eh); 2907 s = get_to_st (&eh);
2982 if (s) 2908 if (s)
2983 { 2909 {
2984 /* 2910 /*
2985 * rxvt_menubar_dispatch() violates the constness of the string, 2911 * rxvt_menubar_dispatch () violates the constness of the string,
2986 * so do it here 2912 * so do it here
2987 */ 2913 */
2988 if (arg == XTerm_Menu) 2914 if (arg == XTerm_Menu)
2989#if 0 /* XXX: currently disabled due to security concerns */ 2915#if 0 /* XXX: currently disabled due to security concerns */
2990 menubar_dispatch ((char *)s); 2916 menubar_dispatch ((char *)s);
2991#else 2917#else
2992 (void)0; 2918 (void)0;
2993#endif 2919#endif
2994 else 2920 else
2995 xterm_seq (arg, (char *)s, eh); 2921 xterm_seq (arg, (char *)s, eh);
2996 free(s); 2922 free (s);
2997 } 2923 }
2998 } 2924 }
2999} 2925}
3000/* 2926/*
3001 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2927 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
… …
3010 * 19 = change underlined character color 2936 * 19 = change underlined character color
3011 * 46 = change logfile (not implemented) 2937 * 46 = change logfile (not implemented)
3012 * 50 = change font 2938 * 50 = change font
3013 * 2939 *
3014 * rxvt extensions: 2940 * rxvt extensions:
2941 * 9 = change locale (NYI)
3015 * 10 = menu (may change in future) 2942 * 10 = menu (may change in future)
3016 * 20 = bg pixmap 2943 * 20 = bg pixmap
3017 * 39 = change default fg color 2944 * 39 = change default fg color
3018 * 49 = change default bg color 2945 * 49 = change default bg color
3019 * 55 = dump scrollback buffer and all of screen 2946 * 55 = dump scrollback buffer and all of screen
3020 */ 2947 */
3021void 2948void
3022rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 2949rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3023{ 2950{
3024 int changed = 0; 2951 int changed = 0;
3025 int color; 2952 int color;
3026 char *buf, *name; 2953 char *buf, *name;
3027 2954
3028 assert(str != NULL); 2955 assert (str != NULL);
3029 switch (op) 2956 switch (op)
3030 { 2957 {
3031 case XTerm_name: 2958 case XTerm_name:
3032 set_title (str); 2959 set_title (str);
3033 /* FALLTHROUGH */ 2960 /* FALLTHROUGH */
… …
3038 set_title (str); 2965 set_title (str);
3039 break; 2966 break;
3040 case XTerm_Color: 2967 case XTerm_Color:
3041 for (buf = (char *)str; buf && *buf;) 2968 for (buf = (char *)str; buf && *buf;)
3042 { 2969 {
3043 if ((name = STRCHR(buf, ';')) == NULL) 2970 if ((name = STRCHR (buf, ';')) == NULL)
3044 break; 2971 break;
3045 *name++ = '\0'; 2972 *name++ = '\0';
3046 color = atoi(buf); 2973 color = atoi (buf);
3047 if (color < 0 || color >= TOTAL_COLORS) 2974 if (color < 0 || color >= TOTAL_COLORS)
3048 break; 2975 break;
3049 if ((buf = STRCHR(name, ';')) != NULL) 2976 if ((buf = STRCHR (name, ';')) != NULL)
3050 *buf++ = '\0'; 2977 *buf++ = '\0';
3051 set_window_color (color + minCOLOR, name); 2978 set_window_color (color + minCOLOR, name);
3052 } 2979 }
3053 break; 2980 break;
3054#ifndef NO_CURSORCOLOR 2981#ifndef NO_CURSORCOLOR
… …
3071 break; 2998 break;
3072#endif 2999#endif
3073 3000
3074 case XTerm_Menu: 3001 case XTerm_Menu:
3075 /* 3002 /*
3076 * rxvt_menubar_dispatch() violates the constness of the string, 3003 * rxvt_menubar_dispatch () violates the constness of the string,
3077 * so DON'T do it here 3004 * so DON'T do it here
3078 */ 3005 */
3079 break; 3006 break;
3080 case XTerm_Pixmap: 3007 case XTerm_Pixmap:
3081 if (*str != ';') 3008 if (*str != ';')
… …
3084 scale_pixmap (""); /* reset to default scaling */ 3011 scale_pixmap (""); /* reset to default scaling */
3085 set_bgPixmap (str); /* change pixmap */ 3012 set_bgPixmap (str); /* change pixmap */
3086#endif 3013#endif
3087 scr_touch (true); 3014 scr_touch (true);
3088 } 3015 }
3089 while ((str = STRCHR(str, ';')) != NULL) 3016 while ((str = STRCHR (str, ';')) != NULL)
3090 { 3017 {
3091 str++; 3018 str++;
3092#if XPM_BACKGROUND 3019#if XPM_BACKGROUND
3093 changed += scale_pixmap (str); 3020 changed += scale_pixmap (str);
3094#endif 3021#endif
… …
3110 set_window_color (Color_bg, str); 3037 set_window_color (Color_bg, str);
3111 break; 3038 break;
3112 case XTerm_logfile: 3039 case XTerm_logfile:
3113 break; 3040 break;
3114 case XTerm_font: 3041 case XTerm_font:
3115 change_font (0, str); 3042 change_font (str);
3116 break; 3043 break;
3044#ifndef NO_FRILLS
3045 case XTerm_locale:
3046 if (str[0] == '?' && !str[1])
3047 tt_printf ("%-.250s\n", locale);
3048 else
3049 {
3050 set_locale (str);
3051# ifdef USE_XIM
3052 im_cb ();
3053# endif
3054 // TODO: call selection_make with the right values set
3055 // to re-fresh the selection.
3056 if (display->selection_owner == this)
3057 display->set_selection_owner (0);
3058 }
3059 break;
3060#endif
3117#if 0 3061#if 0
3118 case XTerm_dumpscreen: /* no error notices */ 3062 case XTerm_dumpscreen: /* no error notices */
3119 { 3063 {
3120 int fd; 3064 int fd;
3121 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3065 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3122 { 3066 {
3123 scr_dump (fd); 3067 scr_dump (fd);
3124 close(fd); 3068 close (fd);
3125 } 3069 }
3126 } 3070 }
3127 break; 3071 break;
3128#endif 3072#endif
3129 3073
… …
3154 else 3098 else
3155 { 3099 {
3156 if (mode == 'r') 3100 if (mode == 'r')
3157 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3101 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3158 else 3102 else
3159 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3103 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3160 PrivMode(state, bit); 3104 PrivMode (state, bit);
3161 } 3105 }
3162 return state; 3106 return state;
3163} 3107}
3164 3108
3165/* we're not using priv _yet_ */ 3109/* we're not using priv _yet_ */
3166void 3110void
3167rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3111rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3168{ 3112{
3169 unsigned int i, j; 3113 unsigned int i, j;
3170 int state; 3114 int state;
3171 static const struct 3115 static const struct
3172 { 3116 {
… …
3215 for (i = 0; i < nargs; i++) 3159 for (i = 0; i < nargs; i++)
3216 { 3160 {
3217 state = -1; 3161 state = -1;
3218 3162
3219 /* basic handling */ 3163 /* basic handling */
3220 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3164 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3221 if (argtopriv[j].argval == arg[i]) 3165 if (argtopriv[j].argval == arg[i])
3222 { 3166 {
3223 state = privcases (mode, argtopriv[j].bit); 3167 state = privcases (mode, argtopriv[j].bit);
3224 break; 3168 break;
3225 } 3169 }
… …
3233 scr_cursor (RESTORE); 3177 scr_cursor (RESTORE);
3234 else if (mode == 1) 3178 else if (mode == 1)
3235 scr_cursor (SAVE); 3179 scr_cursor (SAVE);
3236 /* FALLTHROUGH */ 3180 /* FALLTHROUGH */
3237 default: 3181 default:
3238 continue; /* for(;i;) */ 3182 continue; /* for (;i;) */
3239 } 3183 }
3240 3184
3241 /* extra handling for values with valid 0 or 1 state */ 3185 /* extra handling for values with valid 0 or 1 state */
3242 switch (arg[i]) 3186 switch (arg[i])
3243 { 3187 {
… …
3245 case 2: /* VT52 mode */ 3189 case 2: /* VT52 mode */
3246 /* oddball mode. should be set regardless of set/reset 3190 /* oddball mode. should be set regardless of set/reset
3247 * parameter. Return from VT52 mode with an ESC < from 3191 * parameter. Return from VT52 mode with an ESC < from
3248 * within VT52 mode 3192 * within VT52 mode
3249 */ 3193 */
3250 PrivMode(1, PrivMode_vt52); 3194 PrivMode (1, PrivMode_vt52);
3251 break; 3195 break;
3252 case 3: /* 80/132 */ 3196 case 3: /* 80/132 */
3253 if (PrivateModes & PrivMode_132OK) 3197 if (PrivateModes & PrivMode_132OK)
3254 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3198 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3255 (unsigned int)TermWin.height); 3199 (unsigned int)TermWin.height);
3256 break; 3200 break;
3257 case 4: /* smooth scrolling */ 3201 case 4: /* smooth scrolling */
3258 if (state) 3202 if (state)
3259 Options &= ~Opt_jumpScroll; 3203 Options &= ~Opt_jumpScroll;
… …
3270 scr_autowrap (state); 3214 scr_autowrap (state);
3271 break; 3215 break;
3272 /* case 8: - auto repeat, can't do on a per window basis */ 3216 /* case 8: - auto repeat, can't do on a per window basis */
3273 case 9: /* X10 mouse reporting */ 3217 case 9: /* X10 mouse reporting */
3274 if (state) /* orthogonal */ 3218 if (state) /* orthogonal */
3275 PrivateModes &= ~(PrivMode_MouseX11); 3219 PrivateModes &= ~ (PrivMode_MouseX11);
3276 break; 3220 break;
3277#ifdef menuBar_esc 3221#ifdef menuBar_esc
3278 case menuBar_esc: 3222 case menuBar_esc:
3279#ifdef MENUBAR 3223#ifdef MENUBAR
3280 map_menuBar (state); 3224 map_menuBar (state);
… …
3300 break; 3244 break;
3301 /* case 66: - application key pad */ 3245 /* case 66: - application key pad */
3302 /* case 67: - backspace key */ 3246 /* case 67: - backspace key */
3303 case 1000: /* X11 mouse reporting */ 3247 case 1000: /* X11 mouse reporting */
3304 if (state) /* orthogonal */ 3248 if (state) /* orthogonal */
3305 PrivateModes &= ~(PrivMode_MouseX10); 3249 PrivateModes &= ~ (PrivMode_MouseX10);
3306 break; 3250 break;
3307#if 0 3251#if 0
3308 case 1001: 3252 case 1001:
3309 break; /* X11 mouse highlighting */ 3253 break; /* X11 mouse highlighting */
3310#endif 3254#endif
… …
3380 break; 3324 break;
3381 } 3325 }
3382 if (rendset != -1) 3326 if (rendset != -1)
3383 { 3327 {
3384 scr_rendition (rendset, rendstyle); 3328 scr_rendition (rendset, rendstyle);
3385 continue; /* for(;i;) */ 3329 continue; /* for (;i;) */
3386 } 3330 }
3387 3331
3388 switch (arg[i]) 3332 switch (arg[i])
3389 { 3333 {
3390 case 30: 3334 case 30:
… …
3393 case 33: 3337 case 33:
3394 case 34: 3338 case 34:
3395 case 35: 3339 case 35:
3396 case 36: 3340 case 36:
3397 case 37: 3341 case 37:
3398 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3399 Color_fg); 3343 Color_fg);
3400 break; 3344 break;
3401#ifdef TTY_256COLOR 3345#ifdef TTY_256COLOR
3402 case 38: 3346 case 38:
3403 if (nargs > i + 2 && arg[i + 1] == 5) 3347 if (nargs > i + 2 && arg[i + 1] == 5)
3404 { 3348 {
3405 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3349 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3406 Color_fg); 3350 Color_fg);
3407 i += 2; 3351 i += 2;
3408 } 3352 }
3409 break; 3353 break;
3410#endif 3354#endif
… …
3418 case 43: 3362 case 43:
3419 case 44: 3363 case 44:
3420 case 45: 3364 case 45:
3421 case 46: 3365 case 46:
3422 case 47: 3366 case 47:
3423 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3424 Color_bg); 3368 Color_bg);
3425 break; 3369 break;
3426#ifdef TTY_256COLOR 3370#ifdef TTY_256COLOR
3427 case 48: 3371 case 48:
3428 if (nargs > i + 2 && arg[i + 1] == 5) 3372 if (nargs > i + 2 && arg[i + 1] == 5)
3429 { 3373 {
3430 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3374 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3431 Color_bg); 3375 Color_bg);
3432 i += 2; 3376 i += 2;
3433 } 3377 }
3434 break; 3378 break;
3435#endif 3379#endif
… …
3444 case 93: 3388 case 93:
3445 case 94: 3389 case 94:
3446 case 95: 3390 case 95:
3447 case 96: 3391 case 96:
3448 case 97: 3392 case 97:
3449 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3393 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3450 Color_fg); 3394 Color_fg);
3451 break; 3395 break;
3452 case 100: 3396 case 100:
3453 case 101: /* set bright bg color */ 3397 case 101: /* set bright bg color */
3454 case 102: 3398 case 102:
3455 case 103: 3399 case 103:
3456 case 104: 3400 case 104:
3457 case 105: 3401 case 105:
3458 case 106: 3402 case 106:
3459 case 107: 3403 case 107:
3460 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3404 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3461 Color_bg); 3405 Color_bg);
3462 break; 3406 break;
3463#endif 3407#endif
3464 3408
3465 } 3409 }
… …
3471void 3415void
3472rxvt_term::process_graphics () 3416rxvt_term::process_graphics ()
3473{ 3417{
3474 unsigned char ch, cmd = cmd_getc (); 3418 unsigned char ch, cmd = cmd_getc ();
3475 3419
3476#ifndef RXVT_GRAPHICS
3477 if (cmd == 'Q') 3420 if (cmd == 'Q')
3478 { /* query graphics */ 3421 { /* query graphics */
3479 tt_printf("\033G0\n"); /* no graphics */ 3422 tt_printf ("\033G0\n"); /* no graphics */
3480 return; 3423 return;
3481 } 3424 }
3482 /* swallow other graphics sequences until terminating ':' */ 3425 /* swallow other graphics sequences until terminating ':' */
3483 do 3426 do
3484 ch = cmd_getc (); 3427 ch = cmd_getc ();
3485 while (ch != ':'); 3428 while (ch != ':');
3486#else
3487 unsigned int nargs;
3488 int args[NGRX_PTS];
3489 unsigned char *text = NULL;
3490
3491 if (cmd == 'Q')
3492 { /* query graphics */
3493 tt_printf("\033G1\n"); /* yes, graphics (color) */
3494 return;
3495 }
3496 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3497 {
3498 int neg;
3499
3500 ch = cmd_getc ();
3501 neg = (ch == '-');
3502 if (neg || ch == '+')
3503 ch = cmd_getc ();
3504
3505 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3506 args[nargs] = args[nargs] * 10 + (ch - '0');
3507 if (neg)
3508 args[nargs] = -args[nargs];
3509
3510 nargs++;
3511 args[nargs] = 0;
3512 if (ch != ';')
3513 break;
3514 }
3515
3516 if ((cmd == 'T') && (nargs >= 5))
3517 {
3518 int i, len = args[4];
3519
3520 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3521
3522 if (text != NULL)
3523 {
3524 for (i = 0; i < len; i++)
3525 text[i] = cmd_getc ();
3526 text[len] = '\0';
3527 }
3528 }
3529 Gr_do_graphics (cmd, nargs, args, text);
3530#endif
3531} 3429}
3532/*}}} */ 3430/*}}} */
3533 3431
3534/* ------------------------------------------------------------------------- */ 3432/* ------------------------------------------------------------------------- */
3535 3433
3536/* 3434/*
3537 * Send printf() formatted output to the command. 3435 * Send printf () formatted output to the command.
3538 * Only use for small amounts of data. 3436 * Only use for small amounts of data.
3539 */ 3437 */
3540void 3438void
3541rxvt_term::tt_printf (const char *fmt,...) 3439rxvt_term::tt_printf (const char *fmt,...)
3542{ 3440{

Diff Legend

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