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.27 by pcg, Tue Dec 30 01:35:58 2003 UTC vs.
Revision 1.35 by pcg, Sat Jan 31 03:27:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.27 2003/12/30 01:35:58 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
53#include <wchar.h> 52#include <wchar.h>
54 53
55/*----------------------------------------------------------------------*/ 54/*----------------------------------------------------------------------*/
56 55
57/*{{{ Convert the keypress event into a string */ 56/*{{{ Convert the keypress event into a string */
58/* INTPROTO */
59void 57void
60rxvt_lookup_key(pR_ XKeyEvent *ev) 58rxvt_term::lookup_key (XKeyEvent *ev)
61{ 59{
62 int ctrl, meta, shft, len; 60 int ctrl, meta, shft, len;
63 unsigned int newlen; 61 unsigned int newlen;
64 KeySym keysym; 62 KeySym keysym;
65#ifdef DEBUG_CMD 63#ifdef DEBUG_CMD
… …
74 * 72 *
75 * Always permit `shift' to override the current setting 73 * Always permit `shift' to override the current setting
76 */ 74 */
77 shft = (ev->state & ShiftMask); 75 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 76 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 77 meta = (ev->state & ModMetaMask);
80 78
81 if (R->numlock_state || (ev->state & R->ModNumLockMask)) 79 if (numlock_state || (ev->state & ModNumLockMask))
82 { 80 {
83 R->numlock_state = (ev->state & R->ModNumLockMask); 81 numlock_state = (ev->state & ModNumLockMask);
84 PrivMode((!R->numlock_state), PrivMode_aplKP); 82 PrivMode((!numlock_state), PrivMode_aplKP);
85 } 83 }
86 84
87 kbuf[0] = 0; 85 kbuf[0] = 0;
88 86
89#ifdef USE_XIM 87#ifdef USE_XIM
90 if (R->Input_Context) 88 if (Input_Context)
91 { 89 {
92 Status status_return; 90 Status status_return;
93 91
94#ifdef X_HAVE_UTF8_STRING 92#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0) 93 if (enc_utf8 && 0)
96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf,
97 KBUFSZ, &keysym, &status_return); 95 KBUFSZ, &keysym, &status_return);
98 else 96 else
99#endif 97#endif
100 { 98 {
101 wchar_t wkbuf[KBUFSZ + 1]; 99 wchar_t wkbuf[KBUFSZ + 1];
102 100
103 // the XOpenIM manpage lies about hardcoding the locale 101 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales 102 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale]) 103 if (rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]); 104 SET_LOCALE (rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better 105 // assume wchar_t == unicode or better
108 len = XwcLookupString (R->Input_Context, ev, wkbuf, 106 len = XwcLookupString (Input_Context, ev, wkbuf,
109 KBUFSZ, &keysym, &status_return); 107 KBUFSZ, &keysym, &status_return);
110 if (R->rs[Rs_imLocale]) 108 if (rs[Rs_imLocale])
111 SET_LOCALE (R->locale); 109 SET_LOCALE (locale);
112 110
113 if (status_return == XLookupChars 111 if (status_return == XLookupChars
114 || status_return == XLookupBoth) 112 || status_return == XLookupBoth)
115 { 113 {
116 wkbuf[len] = 0; 114 wkbuf[len] = 0;
… …
126 || status_return == XLookupBoth; 124 || status_return == XLookupBoth;
127 } 125 }
128 else 126 else
129#endif 127#endif
130 { 128 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 129 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 130 valid_keysym = !len;
133 } 131 }
134 132
135 if (valid_keysym) 133 if (valid_keysym)
136 { 134 {
… …
140 if (ctrl) 138 if (ctrl)
141# else 139# else
142 if (meta) 140 if (meta)
143# endif 141# endif
144 { 142 {
145 if (keysym == R->ks_bigfont) 143 if (keysym == ks_bigfont)
146 { 144 {
147 rxvt_change_font(aR_ 0, FONT_UP); 145 change_font (0, FONT_UP);
148 return; 146 return;
149 } 147 }
150 else if (keysym == R->ks_smallfont) 148 else if (keysym == ks_smallfont)
151 { 149 {
152 rxvt_change_font(aR_ 0, FONT_DN); 150 change_font (0, FONT_DN);
153 return; 151 return;
154 } 152 }
155 } 153 }
156#endif 154#endif
157 155
158 if (R->TermWin.saveLines) { 156 if (TermWin.saveLines) {
159#ifdef UNSHIFTED_SCROLLKEYS 157#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) { 158 if (!ctrl && !meta) {
161#else 159#else
162 if (IS_SCROLL_MOD) { 160 if (IS_SCROLL_MOD) {
163#endif 161#endif
164 int lnsppg; 162 int lnsppg;
165 163
166#ifdef PAGING_CONTEXT_LINES 164#ifdef PAGING_CONTEXT_LINES
167 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES; 165 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
168#else 166#else
169 lnsppg = R->TermWin.nrow * 4 / 5; 167 lnsppg = TermWin.nrow * 4 / 5;
170#endif 168#endif
171 if (keysym == XK_Prior) { 169 if (keysym == XK_Prior) {
172 rxvt_scr_page(aR_ UP, lnsppg); 170 scr_page (UP, lnsppg);
173 return; 171 return;
174 } else if (keysym == XK_Next) { 172 } else if (keysym == XK_Next) {
175 rxvt_scr_page(aR_ DN, lnsppg); 173 scr_page (DN, lnsppg);
176 return; 174 return;
177 } 175 }
178 } 176 }
179#ifdef SCROLL_ON_UPDOWN_KEYS 177#ifdef SCROLL_ON_UPDOWN_KEYS
180 if (IS_SCROLL_MOD) { 178 if (IS_SCROLL_MOD) {
181 if (keysym == XK_Up) { 179 if (keysym == XK_Up) {
182 rxvt_scr_page(aR_ UP, 1); 180 scr_page (UP, 1);
183 return; 181 return;
184 } else if (keysym == XK_Down) { 182 } else if (keysym == XK_Down) {
185 rxvt_scr_page(aR_ DN, 1); 183 scr_page (DN, 1);
186 return; 184 return;
187 } 185 }
188 } 186 }
189#endif 187#endif
190#ifdef SCROLL_ON_HOMEEND_KEYS 188#ifdef SCROLL_ON_HOMEEND_KEYS
191 if (IS_SCROLL_MOD) { 189 if (IS_SCROLL_MOD) {
192 if (keysym == XK_Home) { 190 if (keysym == XK_Home) {
193 rxvt_scr_move_to(aR_ 0, 1); 191 scr_move_to (0, 1);
194 return; 192 return;
195 } else if (keysym == XK_End) { 193 } else if (keysym == XK_End) {
196 rxvt_scr_move_to(aR_ 1, 0); 194 scr_move_to (1, 0);
197 return; 195 return;
198 } 196 }
199 } 197 }
200#endif 198#endif
201 } 199 }
… …
203 if (shft) { 201 if (shft) {
204 /* Shift + F1 - F10 generates F11 - F20 */ 202 /* Shift + F1 - F10 generates F11 - F20 */
205 if (keysym >= XK_F1 && keysym <= XK_F10) { 203 if (keysym >= XK_F1 && keysym <= XK_F10) {
206 keysym += (XK_F11 - XK_F1); 204 keysym += (XK_F11 - XK_F1);
207 shft = 0; /* turn off Shift */ 205 shft = 0; /* turn off Shift */
208 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) { 206 } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) {
209 switch (keysym) { 207 switch (keysym) {
210 /* normal XTerm key bindings */ 208 /* normal XTerm key bindings */
211 case XK_Insert: /* Shift+Insert = paste mouse selection */ 209 case XK_Insert: /* Shift+Insert = paste mouse selection */
212 rxvt_selection_request(aR_ ev->time, 0, 0); 210 selection_request (ev->time, 0, 0);
213 return; 211 return;
214 /* rxvt extras */ 212 /* rxvt extras */
215 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 213 case XK_KP_Add: /* Shift+KP_Add = bigger font */
216 rxvt_change_font(aR_ 0, FONT_UP); 214 change_font (0, FONT_UP);
217 return; 215 return;
218 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 216 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
219 rxvt_change_font(aR_ 0, FONT_DN); 217 change_font (0, FONT_DN);
220 return; 218 return;
221 } 219 }
222 } 220 }
223 } 221 }
224#ifdef PRINTPIPE 222#ifdef PRINTPIPE
225 if (keysym == XK_Print) { 223 if (keysym == XK_Print) {
226 rxvt_scr_printscreen(aR_ ctrl | shft); 224 scr_printscreen (ctrl | shft);
227 return; 225 return;
228 } 226 }
229#endif 227#endif
230#ifdef GREEK_SUPPORT 228#ifdef GREEK_SUPPORT
231 if (keysym == R->ks_greekmodeswith) { 229 if (keysym == ks_greekmodeswith) {
232 R->greek_mode = !R->greek_mode; 230 greek_mode = !greek_mode;
233 if (R->greek_mode) { 231 if (greek_mode) {
234 rxvt_xterm_seq(aR_ XTerm_title, 232 xterm_seq (XTerm_title,
235 (greek_getmode() == GREEK_ELOT928 233 (greek_getmode() == GREEK_ELOT928
236 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 234 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
237 greek_reset(); 235 greek_reset();
238 } else 236 } else
239 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 237 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
240 return; 238 return;
241 } 239 }
242#endif 240#endif
243 241
244 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 242 if (keysym >= 0xFF00 && keysym <= 0xFFFF) {
245#ifdef KEYSYM_RESOURCE 243#ifdef KEYSYM_RESOURCE
246 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) { 244 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) {
247 unsigned int l; 245 unsigned int l;
248 const unsigned char *kbuf0; 246 const unsigned char *kbuf0;
249 const unsigned char ch = C0_ESC; 247 const unsigned char ch = C0_ESC;
250 248
251 kbuf0 = (R->Keysym_map[keysym & 0xFF]); 249 kbuf0 = (Keysym_map[keysym & 0xFF]);
252 l = (unsigned int)*kbuf0++; 250 l = (unsigned int)*kbuf0++;
253 251
254 /* escape prefix */ 252 /* escape prefix */
255 if (meta) 253 if (meta)
256# ifdef META8_OPTION 254# ifdef META8_OPTION
257 if (R->meta_char == C0_ESC) 255 if (meta_char == C0_ESC)
258# endif 256# endif
259 R->tt_write (&ch, 1); 257 tt_write (&ch, 1);
260 R->tt_write (kbuf0, l); 258 tt_write (kbuf0, l);
261 return; 259 return;
262 } else 260 } else
263#endif 261#endif
264 { 262 {
265 newlen = 1; 263 newlen = 1;
266 switch (keysym) { 264 switch (keysym) {
267#ifndef NO_BACKSPACE_KEY 265#ifndef NO_BACKSPACE_KEY
268 case XK_BackSpace: 266 case XK_BackSpace:
269 if (R->PrivateModes & PrivMode_HaveBackSpace) { 267 if (PrivateModes & PrivMode_HaveBackSpace) {
270 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 268 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace)
271 ^ !!ctrl) ? '\b' : '\177'; 269 ^ !!ctrl) ? '\b' : '\177';
272 kbuf[1] = '\0'; 270 kbuf[1] = '\0';
273 } else 271 } else
274 STRCPY(kbuf, R->key_backspace); 272 STRCPY(kbuf, key_backspace);
275# ifdef MULTICHAR_SET 273# ifdef MULTICHAR_SET
276 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 274 if ((Options & Opt_mc_hack) && screen.cur.col > 0) {
277 int col, row; 275 int col, row;
278 276
279 newlen = STRLEN(kbuf); 277 newlen = STRLEN(kbuf);
280 col = R->screen.cur.col - 1; 278 col = screen.cur.col - 1;
281 row = R->screen.cur.row + R->TermWin.saveLines; 279 row = screen.cur.row + TermWin.saveLines;
282 if (IS_MULTI2(R->screen.rend[row][col])) 280 if (IS_MULTI2(screen.rend[row][col]))
283 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 281 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
284 } 282 }
285# endif 283# endif
286 break; 284 break;
287#endif 285#endif
288#ifndef NO_DELETE_KEY 286#ifndef NO_DELETE_KEY
289 case XK_Delete: 287 case XK_Delete:
290 STRCPY(kbuf, R->key_delete); 288 STRCPY(kbuf, key_delete);
291# ifdef MULTICHAR_SET 289# ifdef MULTICHAR_SET
292 if (R->Options & Opt_mc_hack) { 290 if (Options & Opt_mc_hack) {
293 int col, row; 291 int col, row;
294 292
295 newlen = STRLEN(kbuf); 293 newlen = STRLEN(kbuf);
296 col = R->screen.cur.col; 294 col = screen.cur.col;
297 row = R->screen.cur.row + R->TermWin.saveLines; 295 row = screen.cur.row + TermWin.saveLines;
298 if (IS_MULTI1(R->screen.rend[row][col])) 296 if (IS_MULTI1(screen.rend[row][col]))
299 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 297 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
300 } 298 }
301# endif 299# endif
302 break; 300 break;
303#endif 301#endif
… …
321#ifdef XK_KP_Left 319#ifdef XK_KP_Left
322 case XK_KP_Up: /* \033Ox or standard */ 320 case XK_KP_Up: /* \033Ox or standard */
323 case XK_KP_Down: /* \033Or or standard */ 321 case XK_KP_Down: /* \033Or or standard */
324 case XK_KP_Right: /* \033Ov or standard */ 322 case XK_KP_Right: /* \033Ov or standard */
325 case XK_KP_Left: /* \033Ot or standard */ 323 case XK_KP_Left: /* \033Ot or standard */
326 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 324 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
327 STRCPY(kbuf, "\033OZ"); 325 STRCPY(kbuf, "\033OZ");
328 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 326 kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
329 break; 327 break;
330 } else 328 } else
331 /* translate to std. cursor key */ 329 /* translate to std. cursor key */
… …
342 if (shft) 340 if (shft)
343 kbuf[2] = ("dacb"[keysym - XK_Left]); 341 kbuf[2] = ("dacb"[keysym - XK_Left]);
344 else if (ctrl) { 342 else if (ctrl) {
345 kbuf[1] = 'O'; 343 kbuf[1] = 'O';
346 kbuf[2] = ("dacb"[keysym - XK_Left]); 344 kbuf[2] = ("dacb"[keysym - XK_Left]);
347 } else if (R->PrivateModes & PrivMode_aplCUR) 345 } else if (PrivateModes & PrivMode_aplCUR)
348 kbuf[1] = 'O'; 346 kbuf[1] = 'O';
349#ifdef MULTICHAR_SET 347#ifdef MULTICHAR_SET
350 //TODO: ?? 348 //TODO: ??
351 if (R->Options & Opt_mc_hack) { 349 if (Options & Opt_mc_hack) {
352 int col, row, m; 350 int col, row, m;
353 351
354 col = R->screen.cur.col; 352 col = screen.cur.col;
355 row = R->screen.cur.row + R->TermWin.saveLines; 353 row = screen.cur.row + TermWin.saveLines;
356 m = 0; 354 m = 0;
357 if (keysym == XK_Right 355 if (keysym == XK_Right
358 && IS_MULTI1(R->screen.rend[row][col])) 356 && IS_MULTI1(screen.rend[row][col]))
359 m = 1; 357 m = 1;
360 else if (keysym == XK_Left) { 358 else if (keysym == XK_Left) {
361 if (col > 0) { 359 if (col > 0) {
362 if (IS_MULTI2(R->screen.rend[row][col - 1])) 360 if (IS_MULTI2(screen.rend[row][col - 1]))
363 m = 1; 361 m = 1;
364 } else if (R->screen.cur.row > 0) { 362 } else if (screen.cur.row > 0) {
365 col = R->screen.tlen[--row]; 363 col = screen.tlen[--row];
366 if (col == -1) 364 if (col == -1)
367 col = R->TermWin.ncol - 1; 365 col = TermWin.ncol - 1;
368 else 366 else
369 col--; 367 col--;
370 if (col > 0 368 if (col > 0
371 && IS_MULTI2(R->screen.rend[row][col])) 369 && IS_MULTI2(screen.rend[row][col]))
372 m = 1; 370 m = 1;
373 } 371 }
374 } 372 }
375 if (m) 373 if (m)
376 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 374 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
… …
380 378
381#ifndef UNSHIFTED_SCROLLKEYS 379#ifndef UNSHIFTED_SCROLLKEYS
382# ifdef XK_KP_Prior 380# ifdef XK_KP_Prior
383 case XK_KP_Prior: 381 case XK_KP_Prior:
384 /* allow shift to override */ 382 /* allow shift to override */
385 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 383 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
386 STRCPY(kbuf, "\033Oy"); 384 STRCPY(kbuf, "\033Oy");
387 break; 385 break;
388 } 386 }
389 /* FALLTHROUGH */ 387 /* FALLTHROUGH */
390# endif 388# endif
… …
392 STRCPY(kbuf, "\033[5~"); 390 STRCPY(kbuf, "\033[5~");
393 break; 391 break;
394# ifdef XK_KP_Next 392# ifdef XK_KP_Next
395 case XK_KP_Next: 393 case XK_KP_Next:
396 /* allow shift to override */ 394 /* allow shift to override */
397 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 395 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
398 STRCPY(kbuf, "\033Os"); 396 STRCPY(kbuf, "\033Os");
399 break; 397 break;
400 } 398 }
401 /* FALLTHROUGH */ 399 /* FALLTHROUGH */
402# endif 400# endif
… …
404 STRCPY(kbuf, "\033[6~"); 402 STRCPY(kbuf, "\033[6~");
405 break; 403 break;
406#endif 404#endif
407 case XK_KP_Enter: 405 case XK_KP_Enter:
408 /* allow shift to override */ 406 /* allow shift to override */
409 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 407 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
410 STRCPY(kbuf, "\033OM"); 408 STRCPY(kbuf, "\033OM");
411 } else { 409 } else {
412 kbuf[0] = '\r'; 410 kbuf[0] = '\r';
413 kbuf[1] = '\0'; 411 kbuf[1] = '\0';
414 } 412 }
… …
450 case XK_KP_6: /* "\033Ov" : "6" */ 448 case XK_KP_6: /* "\033Ov" : "6" */
451 case XK_KP_7: /* "\033Ow" : "7" */ 449 case XK_KP_7: /* "\033Ow" : "7" */
452 case XK_KP_8: /* "\033Ox" : "8" */ 450 case XK_KP_8: /* "\033Ox" : "8" */
453 case XK_KP_9: /* "\033Oy" : "9" */ 451 case XK_KP_9: /* "\033Oy" : "9" */
454 /* allow shift to override */ 452 /* allow shift to override */
455 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 453 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
456 STRCPY(kbuf, "\033Oj"); 454 STRCPY(kbuf, "\033Oj");
457 kbuf[2] += (keysym - XK_KP_Multiply); 455 kbuf[2] += (keysym - XK_KP_Multiply);
458 } else { 456 } else {
459 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 457 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
460 kbuf[1] = '\0'; 458 kbuf[1] = '\0';
… …
478 STRCPY(kbuf, "\033[4~"); 476 STRCPY(kbuf, "\033[4~");
479 break; 477 break;
480#ifdef XK_KP_End 478#ifdef XK_KP_End
481 case XK_KP_End: 479 case XK_KP_End:
482 /* allow shift to override */ 480 /* allow shift to override */
483 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 481 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
484 STRCPY(kbuf, "\033Oq"); 482 STRCPY(kbuf, "\033Oq");
485 break; 483 break;
486 } 484 }
487 /* FALLTHROUGH */ 485 /* FALLTHROUGH */
488#endif 486#endif
… …
490 STRCPY(kbuf, KS_END); 488 STRCPY(kbuf, KS_END);
491 break; 489 break;
492#ifdef XK_KP_Home 490#ifdef XK_KP_Home
493 case XK_KP_Home: 491 case XK_KP_Home:
494 /* allow shift to override */ 492 /* allow shift to override */
495 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 493 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
496 STRCPY(kbuf, "\033Ow"); 494 STRCPY(kbuf, "\033Ow");
497 break; 495 break;
498 } 496 }
499 /* FALLTHROUGH */ 497 /* FALLTHROUGH */
500#endif 498#endif
… …
566 } 564 }
567 /* 565 /*
568 * Pass meta for all function keys, if 'meta' option set 566 * Pass meta for all function keys, if 'meta' option set
569 */ 567 */
570#ifdef META8_OPTION 568#ifdef META8_OPTION
571 if (meta && (R->meta_char == 0x80) && len > 0) 569 if (meta && (meta_char == 0x80) && len > 0)
572 kbuf[len - 1] |= 0x80; 570 kbuf[len - 1] |= 0x80;
573#endif 571#endif
574 } else if (ctrl && keysym == XK_minus) { 572 } else if (ctrl && keysym == XK_minus) {
575 len = 1; 573 len = 1;
576 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 574 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
577 } else { 575 } else {
578#ifdef META8_OPTION 576#ifdef META8_OPTION
579 /* set 8-bit on */ 577 /* set 8-bit on */
580 if (meta && (R->meta_char == 0x80)) { 578 if (meta && (meta_char == 0x80)) {
581 unsigned char *ch; 579 unsigned char *ch;
582 580
583 for (ch = kbuf; ch < kbuf + len; ch++) 581 for (ch = kbuf; ch < kbuf + len; ch++)
584 *ch |= 0x80; 582 *ch |= 0x80;
585 meta = 0; 583 meta = 0;
586 } 584 }
587#endif 585#endif
588#ifdef GREEK_SUPPORT 586#ifdef GREEK_SUPPORT
589 if (R->greek_mode) 587 if (greek_mode)
590 len = greek_xlat(kbuf, len); 588 len = greek_xlat(kbuf, len);
591#endif 589#endif
592 /* nil */ ; 590 /* nil */ ;
593 } 591 }
594 } 592 }
595 593
596 if (len <= 0) 594 if (len <= 0)
597 return; /* not mapped */ 595 return; /* not mapped */
598 596
599 if (R->Options & Opt_scrollTtyKeypress) 597 if (Options & Opt_scrollTtyKeypress)
600 if (R->TermWin.view_start) { 598 if (TermWin.view_start) {
601 R->TermWin.view_start = 0; 599 TermWin.view_start = 0;
602 R->want_refresh = 1; 600 want_refresh = 1;
603 } 601 }
604 602
605/* 603/*
606 * these modifications only affect the static keybuffer 604 * these modifications only affect the static keybuffer
607 * pass Shift/Control indicators for function keys ending with `~' 605 * pass Shift/Control indicators for function keys ending with `~'
… …
617 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 615 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
618 616
619/* escape prefix */ 617/* escape prefix */
620 if (meta 618 if (meta
621#ifdef META8_OPTION 619#ifdef META8_OPTION
622 && (R->meta_char == C0_ESC) 620 && (meta_char == C0_ESC)
623#endif 621#endif
624 ) { 622 ) {
625 const unsigned char ch = C0_ESC; 623 const unsigned char ch = C0_ESC;
626 624
627 R->tt_write(&ch, 1); 625 tt_write(&ch, 1);
628 } 626 }
629#ifdef DEBUG_CMD 627#ifdef DEBUG_CMD
630 if (debug_key) { /* Display keyboard buffer contents */ 628 if (debug_key) { /* Display keyboard buffer contents */
631 char *p; 629 char *p;
632 int i; 630 int i;
… …
635 for (i = 0, p = kbuf; i < len; i++, p++) 633 for (i = 0, p = kbuf; i < len; i++, p++)
636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 634 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
637 fprintf(stderr, "'\n"); 635 fprintf(stderr, "'\n");
638 } 636 }
639#endif /* DEBUG_CMD */ 637#endif /* DEBUG_CMD */
640 R->tt_write (kbuf, (unsigned int)len); 638 tt_write (kbuf, (unsigned int)len);
641} 639}
642/*}}} */ 640/*}}} */
643 641
644#if (MENUBAR_MAX) 642#if (MENUBAR_MAX)
645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 643/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
646/* attempt to `write' count to the input buffer */ 644/* attempt to `write' count to the input buffer */
647/* EXTPROTO */
648unsigned int 645unsigned int
649rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 646rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
650{ 647{
651 unsigned int n, s; 648 unsigned int n, s;
652 unsigned char *cmdbuf_base = R->cmdbuf_base,
653 *cmdbuf_endp = R->cmdbuf_endp,
654 *cmdbuf_ptr = R->cmdbuf_ptr;
655 649
656 n = cmdbuf_ptr - cmdbuf_base; 650 n = cmdbuf_ptr - cmdbuf_base;
657 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 651 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
658 if (n > 0 && s < count) { 652 if (n > 0 && s < count) {
659 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 653 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
… …
666 rxvt_print_error("data loss: cmd_write too large"); 660 rxvt_print_error("data loss: cmd_write too large");
667 count = s; 661 count = s;
668 } 662 }
669 for (; count--;) 663 for (; count--;)
670 *cmdbuf_endp++ = *str++; 664 *cmdbuf_endp++ = *str++;
671 R->cmdbuf_ptr = cmdbuf_ptr;
672 R->cmdbuf_endp = cmdbuf_endp;
673 return 0; 665 return 0;
674} 666}
675#endif /* MENUBAR_MAX */ 667#endif /* MENUBAR_MAX */
676 668
677void 669void
… …
688#endif 680#endif
689 681
690 if (want_refresh) 682 if (want_refresh)
691 { 683 {
692 scr_refresh (refresh_type); 684 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1); 685 scrollbar_show (1);
694#ifdef USE_XIM 686#ifdef USE_XIM
695 rxvt_IMSendSpot (this); 687 IMSendSpot ();
696#endif 688#endif
697 } 689 }
698 690
699 XFlush (Xdisplay); 691 XFlush (Xdisplay);
700} 692}
… …
716 XEvent xev; 708 XEvent xev;
717 709
718 XNextEvent (Xdisplay, &xev); 710 XNextEvent (Xdisplay, &xev);
719 711
720#if defined(CURSOR_BLINK) 712#if defined(CURSOR_BLINK)
721 if ((Options & Opt_cursorBlink) 713 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
722 && xev.type == KeyPress)
723 { 714 {
724 if (hidden_cursor) 715 if (hidden_cursor)
725 { 716 {
726 hidden_cursor = 0; 717 hidden_cursor = 0;
727 want_refresh = 1; 718 want_refresh = 1;
728 } 719 }
729 720
730 blink_ev.start (NOW + BLINK_INTERVAL); 721 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
731 } 722 }
732#endif 723#endif
733 724
734#if defined(POINTER_BLANK) 725#if defined(POINTER_BLANK)
735 if ((Options & Opt_pointerBlank) 726 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
736 && (pointerBlankDelay > 0))
737 { 727 {
738 if (xev.type == MotionNotify 728 if (xev.type == MotionNotify
739 || xev.type == ButtonPress 729 || xev.type == ButtonPress
740 || xev.type == ButtonRelease) 730 || xev.type == ButtonRelease)
741 if (hidden_pointer) 731 if (hidden_pointer)
… …
747#endif 737#endif
748 738
749#ifdef USE_XIM 739#ifdef USE_XIM
750 if (!XFilterEvent (&xev, xev.xany.window)) 740 if (!XFilterEvent (&xev, xev.xany.window))
751#endif 741#endif
752 rxvt_process_x_event (this, &xev); 742 process_x_event (&xev);
753 } 743 }
754 while (XPending (Xdisplay)); 744 while (XPending (Xdisplay));
755} 745}
756 746
757#ifdef CURSOR_BLINK 747#ifdef CURSOR_BLINK
758void 748void
759rxvt_term::blink_cb (time_watcher &w) 749rxvt_term::cursor_blink_cb (time_watcher &w)
760{ 750{
761 w.at += BLINK_INTERVAL;
762 hidden_cursor = !hidden_cursor; 751 hidden_cursor = !hidden_cursor;
763 want_refresh = 1; 752 want_refresh = 1;
753
754 w.start (w.at + BLINK_INTERVAL);
755}
756#endif
757
758#ifdef TEXT_BLINK
759void
760rxvt_term::text_blink_cb (time_watcher &w)
761{
762 if (scr_refresh_rend (RS_Blink, RS_Blink))
763 {
764 hidden_text = !hidden_text;
765 want_refresh = 1;
766 w.start (w.at + TEXT_BLINK_INTERVAL);
767 }
764} 768}
765#endif 769#endif
766 770
767void 771void
768rxvt_term::x_cb (io_watcher &w, short revents) 772rxvt_term::x_cb (io_watcher &w, short revents)
… …
869 break; 873 break;
870 } 874 }
871 } 875 }
872 } 876 }
873 877
874 rxvt_scr_add_lines (this, buf, nlines, str - buf); 878 scr_add_lines (buf, nlines, str - buf);
875 879
876 /* 880 /*
877 * If there have been a lot of new lines, then update the screen 881 * If there have been a lot of new lines, then update the screen
878 * What the heck I'll cheat and only refresh less than every page-full. 882 * What the heck I'll cheat and only refresh less than every page-full.
879 * the number of pages between refreshes is refresh_limit, which 883 * the number of pages between refreshes is refresh_limit, which
… …
894 else 898 else
895 { 899 {
896 switch (ch) 900 switch (ch)
897 { 901 {
898 default: 902 default:
899 rxvt_process_nonprinting (this, ch); 903 process_nonprinting (ch);
900 break; 904 break;
901 case C0_ESC: /* escape char */ 905 case C0_ESC: /* escape char */
902 rxvt_process_escape_seq (this); 906 process_escape_seq ();
903 break; 907 break;
904 /*case 0x9b: */ /* CSI */ 908 /*case 0x9b: */ /* CSI */
905 /* rxvt_process_csi_seq (this); */ 909 /* process_csi_seq (); */
906 } 910 }
907 911
908 ch = NOCHAR; 912 ch = NOCHAR;
909 } 913 }
910 } 914 }
… …
921 { 925 {
922 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 926 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
923 return *cmdbuf_ptr++; 927 return *cmdbuf_ptr++;
924 928
925 wchar_t wc; 929 wchar_t wc;
926 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 930 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
927 931
928 if (len == (size_t)-2) 932 if (len == (size_t)-2)
929 return NOCHAR; 933 return NOCHAR;
930 934
931 if (len == (size_t)-1) 935 if (len == (size_t)-1)
… …
942/* rxvt_cmd_getc() - Return next input character */ 946/* rxvt_cmd_getc() - Return next input character */
943/* 947/*
944 * Return the next input character after first passing any keyboard input 948 * Return the next input character after first passing any keyboard input
945 * to the command. 949 * to the command.
946 */ 950 */
947/* INTPROTO */
948uint32_t 951uint32_t
949rxvt_cmd_getc(pR) 952rxvt_term::cmd_getc ()
950{ 953{
951 for (;;) 954 for (;;)
952 { 955 {
953 uint32_t c = R->next_char (); 956 uint32_t c = next_char ();
954 if (c != NOCHAR) 957 if (c != NOCHAR)
955 return c; 958 return c;
956 959
957 // incomplete sequences should occur rarely, still, a better solution 960 // incomplete sequences should occur rarely, still, a better solution
958 // would be preferred. either setjmp/longjmp or better design. 961 // would be preferred. either setjmp/longjmp or better design.
959 fcntl (R->cmd_fd, F_SETFL, 0); 962 fcntl (cmd_fd, F_SETFL, 0);
960 R->pty_fill (); 963 pty_fill ();
961 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 964 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
962 } 965 }
963 966
964#if 0 967#if 0
965#define TIMEOUT_USEC 5000 968#define TIMEOUT_USEC 5000
966 fd_set readfds; 969 fd_set readfds;
… …
972#endif 975#endif
973 976
974 for (;;) { 977 for (;;) {
975 /* loop until we can return something */ 978 /* loop until we can return something */
976 979
977 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 980 if (v_bufstr < v_bufptr) /* output any pending chars */
978 R->tt_write(NULL, 0); 981 tt_write(NULL, 0);
979 982
980#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
981 if (R->mouse_slip_wheel_speed) { 984 if (mouse_slip_wheel_speed) {
982 quick_timeout = 1; 985 quick_timeout = 1;
983 if (!R->mouse_slip_wheel_delay-- 986 if (!mouse_slip_wheel_delay--
984 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN, 987 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
985 abs(R->mouse_slip_wheel_speed))) { 988 abs(mouse_slip_wheel_speed))) {
986 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 989 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
987 R->refresh_type |= SMOOTH_REFRESH; 990 refresh_type |= SMOOTH_REFRESH;
988 R->want_refresh = 1; 991 want_refresh = 1;
989 } 992 }
990 } 993 }
991#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */ 994#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
992#ifdef SELECTION_SCROLLING 995#ifdef SELECTION_SCROLLING
993 if (R->pending_scroll_selection) { 996 if (pending_scroll_selection) {
994 quick_timeout = 1; 997 quick_timeout = 1;
995 if (!R->scroll_selection_delay-- 998 if (!scroll_selection_delay--
996 && rxvt_scr_page(aR_ R->scroll_selection_dir, 999 && scr_page (scroll_selection_dir,
997 R->scroll_selection_lines)) { 1000 scroll_selection_lines)) {
998 R->selection_extend (R->selection_save_x, 1001 selection_extend (selection_save_x,
999 R->selection_save_y, R->selection_save_state); 1002 selection_save_y, selection_save_state);
1000 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1003 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1001 R->refresh_type |= SMOOTH_REFRESH; 1004 refresh_type |= SMOOTH_REFRESH;
1002 R->want_refresh = 1; 1005 want_refresh = 1;
1003 } 1006 }
1004 } 1007 }
1005#endif 1008#endif
1006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1007 if (scrollbar_isUp() || scrollbar_isDn()) { 1010 if (scrollbar_isUp() || scrollbar_isDn()) {
1008 quick_timeout = 1; 1011 quick_timeout = 1;
1009 if (!R->scroll_arrow_delay-- 1012 if (!scroll_arrow_delay--
1010 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) { 1013 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1011 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY; 1014 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1012 R->refresh_type |= SMOOTH_REFRESH; 1015 refresh_type |= SMOOTH_REFRESH;
1013 R->want_refresh = 1; 1016 want_refresh = 1;
1014 } 1017 }
1015 } 1018 }
1016#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1017 1020
1018#ifdef TRANSPARENT 1021#ifdef TRANSPARENT
1019 quick_timeout |= R->want_full_refresh; 1022 quick_timeout |= want_full_refresh;
1020#endif 1023#endif
1021#endif 1024#endif
1022} 1025}
1023 1026
1027#ifdef POINTER_BLANK
1024void 1028void
1025rxvt_term::pointer_unblank () 1029rxvt_term::pointer_unblank ()
1026{ 1030{
1027 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1031 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1028 recolour_cursor (); 1032 recolour_cursor ();
1029 1033
1030#ifdef POINTER_BLANK
1031 hidden_pointer = 0; 1034 hidden_pointer = 0;
1032 1035
1033 if (Options & Opt_pointerBlank) 1036 if (Options & Opt_pointerBlank)
1034 pointer_ev.start (NOW + pointerBlankDelay); 1037 pointer_ev.start (NOW + pointerBlankDelay);
1035#endif
1036} 1038}
1037 1039
1038#ifdef POINTER_BLANK
1039void 1040void
1040rxvt_term::pointer_blank () 1041rxvt_term::pointer_blank ()
1041{ 1042{
1042 pointer_ev.stop ();
1043
1044 if (!(Options & Opt_pointerBlank)) 1043 if (!(Options & Opt_pointerBlank))
1045 return; 1044 return;
1046 1045
1047 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1048 XFlush (Xdisplay); 1047 XFlush (Xdisplay);
… …
1058 1057
1059 pointer_blank (); 1058 pointer_blank ();
1060} 1059}
1061#endif 1060#endif
1062 1061
1063/* INTPROTO */
1064void 1062void
1065rxvt_mouse_report(pR_ const XButtonEvent *ev) 1063rxvt_term::mouse_report (const XButtonEvent *ev)
1066{ 1064{
1067 int button_number, key_state = 0; 1065 int button_number, key_state = 0;
1068 int x, y; 1066 int x, y;
1069 1067
1070 x = ev->x; 1068 x = ev->x;
1071 y = ev->y; 1069 y = ev->y;
1072 R->pixel_position (&x, &y); 1070 pixel_position (&x, &y);
1073 1071
1074 if (R->MEvent.button == AnyButton) { 1072 if (MEvent.button == AnyButton) {
1075 button_number = 3; 1073 button_number = 3;
1076 } else { 1074 } else {
1077 button_number = R->MEvent.button - Button1; 1075 button_number = MEvent.button - Button1;
1078 /* add 0x3D for wheel events, like xterm does */ 1076 /* add 0x3D for wheel events, like xterm does */
1079 if (button_number >= 3) 1077 if (button_number >= 3)
1080 button_number += (64 - 3); 1078 button_number += (64 - 3);
1081 } 1079 }
1082 1080
1083 if (R->PrivateModes & PrivMode_MouseX10) { 1081 if (PrivateModes & PrivMode_MouseX10) {
1084 /* 1082 /*
1085 * do not report ButtonRelease 1083 * do not report ButtonRelease
1086 * no state info allowed 1084 * no state info allowed
1087 */ 1085 */
1088 key_state = 0; 1086 key_state = 0;
… …
1094 * 8 = Meta 1092 * 8 = Meta
1095 * 16 = Control 1093 * 16 = Control
1096 * plus will add in our own Double-Click reporting 1094 * plus will add in our own Double-Click reporting
1097 * 32 = Double Click 1095 * 32 = Double Click
1098 */ 1096 */
1099 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1097 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1100 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1098 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1101 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1099 + ((MEvent.state & ControlMask) ? 16 : 0);
1102#ifdef MOUSE_REPORT_DOUBLECLICK 1100#ifdef MOUSE_REPORT_DOUBLECLICK
1103 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1101 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1104#endif 1102#endif
1105 } 1103 }
1106 1104
1107#ifdef DEBUG_MOUSEREPORT 1105#ifdef DEBUG_MOUSEREPORT
1108 fprintf(stderr, "Mouse ["); 1106 fprintf(stderr, "Mouse [");
… …
1117 fprintf(stderr, "]: <%d>, %d/%d\n", 1115 fprintf(stderr, "]: <%d>, %d/%d\n",
1118 button_number, 1116 button_number,
1119 x + 1, 1117 x + 1,
1120 y + 1); 1118 y + 1);
1121#else 1119#else
1122 R->tt_printf("\033[M%c%c%c", 1120 tt_printf("\033[M%c%c%c",
1123 (32 + button_number + key_state), 1121 (32 + button_number + key_state),
1124 (32 + x + 1), 1122 (32 + x + 1),
1125 (32 + y + 1)); 1123 (32 + y + 1));
1126#endif 1124#endif
1127} 1125}
1128 1126
1129#ifdef USING_W11LIB 1127#ifdef USING_W11LIB
1130/* EXTPROTO */
1131void 1128void
1132rxvt_W11_process_x_event(XEvent *ev) 1129rxvt_W11_process_x_event(XEvent *ev)
1133{ 1130{
1134 rxvt_t *r = rxvt_get_r(); 1131 rxvt_t *r = rxvt_get_r();
1135 1132
1136 rxvt_process_x_event(aR_ ev); 1133 process_x_event (ev);
1137} 1134}
1138#endif 1135#endif
1139 1136
1140/*{{{ process an X event */ 1137/*{{{ process an X event */
1141/* INTPROTO */
1142void 1138void
1143rxvt_process_x_event(pR_ XEvent *ev) 1139rxvt_term::process_x_event (XEvent *ev)
1144{ 1140{
1145 int i, want_timeout;
1146 Window unused_root, unused_child; 1141 Window unused_root, unused_child;
1147 int unused_root_x, unused_root_y; 1142 int unused_root_x, unused_root_y;
1148 unsigned int unused_mask; 1143 unsigned int unused_mask;
1149 1144
1150#ifdef DEBUG_X 1145#ifdef DEBUG_X
… …
1191#ifdef DEBUG_X 1186#ifdef DEBUG_X
1192 struct timeval tp; 1187 struct timeval tp;
1193 struct tm *ltt; 1188 struct tm *ltt;
1194 (void)gettimeofday(&tp, NULL); 1189 (void)gettimeofday(&tp, NULL);
1195 ltt = localtime(&(tp.tv_sec)); 1190 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 == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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)); 1191 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 1192#endif
1198 1193
1199 switch (ev->type) { 1194 switch (ev->type) {
1200 case KeyPress: 1195 case KeyPress:
1201 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1196 lookup_key ((XKeyEvent *)ev);
1202 break; 1197 break;
1203 1198
1204#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1199#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1205 case KeyRelease: 1200 case KeyRelease:
1206 { 1201 {
1207 if (!(ev->xkey.state & ControlMask)) 1202 if (!(ev->xkey.state & ControlMask))
1208 R->mouse_slip_wheel_speed = 0; 1203 mouse_slip_wheel_speed = 0;
1209 else { 1204 else {
1210 KeySym ks; 1205 KeySym ks;
1211 1206
1212 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1207 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1213 if (ks == XK_Control_L || ks == XK_Control_R) 1208 if (ks == XK_Control_L || ks == XK_Control_R)
1214 R->mouse_slip_wheel_speed = 0; 1209 mouse_slip_wheel_speed = 0;
1215 } 1210 }
1216 break; 1211 break;
1217 } 1212 }
1218#endif 1213#endif
1219 1214
1220 case ButtonPress: 1215 case ButtonPress:
1221 rxvt_button_press(aR_ (XButtonEvent *)ev); 1216 button_press ((XButtonEvent *)ev);
1222 break; 1217 break;
1223 1218
1224 case ButtonRelease: 1219 case ButtonRelease:
1225 rxvt_button_release(aR_ (XButtonEvent *)ev); 1220 button_release ((XButtonEvent *)ev);
1226 break; 1221 break;
1227 1222
1228 case ClientMessage: 1223 case ClientMessage:
1229 if (ev->xclient.format == 32 1224 if (ev->xclient.format == 32
1230 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1225 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1231 R->destroy (); 1226 destroy ();
1232#ifdef OFFIX_DND 1227#ifdef OFFIX_DND
1233 /* OffiX Dnd (drag 'n' drop) protocol */ 1228 /* OffiX Dnd (drag 'n' drop) protocol */
1234 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1229 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL]
1235 && (ev->xclient.data.l[0] == DndFile 1230 && (ev->xclient.data.l[0] == DndFile
1236 || ev->xclient.data.l[0] == DndDir 1231 || ev->xclient.data.l[0] == DndDir
1237 || ev->xclient.data.l[0] == DndLink)) { 1232 || ev->xclient.data.l[0] == DndLink)) {
1238 /* Get Dnd data */ 1233 /* Get Dnd data */
1239 Atom ActualType; 1234 Atom ActualType;
1240 int ActualFormat; 1235 int ActualFormat;
1241 unsigned char *data; 1236 unsigned char *data;
1242 unsigned long Size, RemainingBytes; 1237 unsigned long Size, RemainingBytes;
1243 1238
1244 XGetWindowProperty(R->Xdisplay, Xroot, 1239 XGetWindowProperty(Xdisplay, Xroot,
1245 R->xa[XA_DNDSELECTION], 1240 xa[XA_DNDSELECTION],
1246 0L, 1000000L, 1241 0L, 1000000L,
1247 False, AnyPropertyType, 1242 False, AnyPropertyType,
1248 &ActualType, &ActualFormat, 1243 &ActualType, &ActualFormat,
1249 &Size, &RemainingBytes, 1244 &Size, &RemainingBytes,
1250 &data); 1245 &data);
1251 XChangeProperty(R->Xdisplay, Xroot, 1246 XChangeProperty(Xdisplay, Xroot,
1252 XA_CUT_BUFFER0, XA_STRING, 1247 XA_CUT_BUFFER0, XA_STRING,
1253 8, PropModeReplace, 1248 8, PropModeReplace,
1254 data, STRLEN(data)); 1249 data, STRLEN(data));
1255 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1250 selection_paste (Xroot, XA_CUT_BUFFER0, True);
1256 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1251 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime);
1257 } 1252 }
1258#endif /* OFFIX_DND */ 1253#endif /* OFFIX_DND */
1259 break; 1254 break;
1260 1255
1261 case MappingNotify: 1256 case MappingNotify:
… …
1274 */ 1269 */
1275 case VisibilityNotify: 1270 case VisibilityNotify:
1276 switch (ev->xvisibility.state) 1271 switch (ev->xvisibility.state)
1277 { 1272 {
1278 case VisibilityUnobscured: 1273 case VisibilityUnobscured:
1279 R->refresh_type = FAST_REFRESH; 1274 refresh_type = FAST_REFRESH;
1280 break; 1275 break;
1281 case VisibilityPartiallyObscured: 1276 case VisibilityPartiallyObscured:
1282 R->refresh_type = SLOW_REFRESH; 1277 refresh_type = SLOW_REFRESH;
1283 break; 1278 break;
1284 default: 1279 default:
1285 R->refresh_type = NO_REFRESH; 1280 refresh_type = NO_REFRESH;
1286 break; 1281 break;
1287 } 1282 }
1288 break; 1283 break;
1289 1284
1290 case FocusIn: 1285 case FocusIn:
1291 if (!R->TermWin.focus) { 1286 if (!TermWin.focus) {
1292 R->TermWin.focus = 1; 1287 TermWin.focus = 1;
1293 R->want_refresh = 1; 1288 want_refresh = 1;
1294#ifdef USE_XIM 1289#ifdef USE_XIM
1295 if (R->Input_Context != NULL) 1290 if (Input_Context != NULL)
1296 XSetICFocus(R->Input_Context); 1291 XSetICFocus(Input_Context);
1297#endif 1292#endif
1298#ifdef CURSOR_BLINK 1293#ifdef CURSOR_BLINK
1299 if (R->Options & Opt_cursorBlink) 1294 if (Options & Opt_cursorBlink)
1300 R->blink_ev.start (NOW + BLINK_INTERVAL); 1295 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1301#endif 1296#endif
1302 } 1297 }
1303 break; 1298 break;
1304 1299
1305 case FocusOut: 1300 case FocusOut:
1306 if (R->TermWin.focus) { 1301 if (TermWin.focus) {
1307 R->TermWin.focus = 0; 1302 TermWin.focus = 0;
1308 R->want_refresh = 1; 1303 want_refresh = 1;
1309#ifdef USE_XIM 1304#ifdef USE_XIM
1310 if (R->Input_Context != NULL) 1305 if (Input_Context != NULL)
1311 XUnsetICFocus(R->Input_Context); 1306 XUnsetICFocus(Input_Context);
1312#endif 1307#endif
1313#ifdef CURSOR_BLINK 1308#ifdef CURSOR_BLINK
1314 if (R->Options & Opt_cursorBlink) 1309 if (Options & Opt_cursorBlink)
1315 R->blink_ev.stop (); 1310 cursor_blink_ev.stop ();
1316 R->hidden_cursor = 0; 1311 hidden_cursor = 0;
1317#endif 1312#endif
1318 } 1313 }
1319 break; 1314 break;
1320 1315
1321 case ConfigureNotify: 1316 case ConfigureNotify:
1322 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1317 if (ev->xconfigure.window == TermWin.parent[0]) {
1323 int height, width; 1318 int height, width;
1324 1319
1325 do { /* Wrap lots of configures into one */ 1320 do { /* Wrap lots of configures into one */
1326 width = ev->xconfigure.width; 1321 width = ev->xconfigure.width;
1327 height = ev->xconfigure.height; 1322 height = ev->xconfigure.height;
1328 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1323 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1329 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1324 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window,
1330 ConfigureNotify, ev)); 1325 ConfigureNotify, ev));
1331 if (R->szHint.width != width || R->szHint.height != height) { 1326 if (szHint.width != width || szHint.height != height) {
1332 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1327 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1333 R->resize_all_windows (width, height, 1); 1328 resize_all_windows (width, height, 1);
1334 } 1329 }
1335#ifdef DEBUG_SIZE 1330#ifdef DEBUG_SIZE
1336 else { 1331 else {
1337 D_SIZE((stderr, "Size: Not resizing")); 1332 D_SIZE((stderr, "Size: Not resizing"));
1338 } 1333 }
1339#endif 1334#endif
1340#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1341 if (R->Options & Opt_transparent) { 1336 if (Options & Opt_transparent) {
1342 rxvt_check_our_parents(aR); 1337 check_our_parents ();
1343 if (R->am_transparent) 1338 if (am_transparent)
1344 R->want_full_refresh = 1; 1339 want_full_refresh = 1;
1345 } 1340 }
1346#endif 1341#endif
1347 } 1342 }
1348 break; 1343 break;
1349 1344
1350 case SelectionClear: 1345 case SelectionClear:
1351 rxvt_selection_clear(aR); 1346 selection_clear ();
1352 break; 1347 break;
1353 1348
1354 case SelectionNotify: 1349 case SelectionNotify:
1355 if (R->selection_wait == Sel_normal) 1350 if (selection_wait == Sel_normal)
1356 rxvt_selection_paste(aR_ ev->xselection.requestor, 1351 selection_paste (ev->xselection.requestor,
1357 ev->xselection.property, True); 1352 ev->xselection.property, True);
1358 break; 1353 break;
1359 1354
1360 case SelectionRequest: 1355 case SelectionRequest:
1361 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1356 selection_send (&(ev->xselectionrequest));
1362 break; 1357 break;
1363 1358
1364 case UnmapNotify: 1359 case UnmapNotify:
1365 R->TermWin.mapped = 0; 1360 TermWin.mapped = 0;
1361#ifdef TEXT_BLINK
1362 text_blink_ev.stop ();
1363#endif
1366 break; 1364 break;
1367 1365
1368 case MapNotify: 1366 case MapNotify:
1369 R->TermWin.mapped = 1; 1367 TermWin.mapped = 1;
1368#ifdef TEXT_BLINK
1369 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1370#endif
1370 break; 1371 break;
1371 1372
1372 case PropertyNotify: 1373 case PropertyNotify:
1373 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1374 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) {
1374 if (ev->xproperty.state == PropertyNewValue) 1375 if (ev->xproperty.state == PropertyNewValue)
1375 rxvt_selection_property(aR_ ev->xproperty.window, 1376 selection_property (ev->xproperty.window,
1376 ev->xproperty.atom); 1377 ev->xproperty.atom);
1377 break; 1378 break;
1378 } 1379 }
1379#ifdef TRANSPARENT 1380#ifdef TRANSPARENT
1380 /* 1381 /*
1381 * if user used some Esetroot compatible prog to set the root bg, 1382 * if user used some Esetroot compatible prog to set the root bg,
1382 * use the property to determine the pixmap. We use it later on. 1383 * use the property to determine the pixmap. We use it later on.
1383 */ 1384 */
1384 if (R->xa[XA_XROOTPMAPID] == 0) 1385 if (xa[XA_XROOTPMAPID] == 0)
1385 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay, 1386 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1386 "_XROOTPMAP_ID", False); 1387 "_XROOTPMAP_ID", False);
1387 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID]) 1388 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1388 break; 1389 break;
1389 /* FALLTHROUGH */ 1390 /* FALLTHROUGH */
1390 case ReparentNotify: 1391 case ReparentNotify:
1391 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1392 if ((Options & Opt_transparent) && check_our_parents ()) {
1392 if (R->am_transparent) 1393 if (am_transparent)
1393 R->want_full_refresh = 1; 1394 want_full_refresh = 1;
1394 } 1395 }
1395#endif /* TRANSPARENT */ 1396#endif /* TRANSPARENT */
1396 break; 1397 break;
1397 1398
1398 case GraphicsExpose: 1399 case GraphicsExpose:
1399 case Expose: 1400 case Expose:
1400 if (ev->xany.window == R->TermWin.vt) { 1401 if (ev->xany.window == TermWin.vt) {
1401#ifdef NO_SLOW_LINK_SUPPORT 1402#ifdef NO_SLOW_LINK_SUPPORT
1402 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1403 scr_expose (ev->xexpose.x, ev->xexpose.y,
1403 ev->xexpose.width, ev->xexpose.height, False); 1404 ev->xexpose.width, ev->xexpose.height, False);
1404#else 1405#else
1405 // don't understand this, so commented it out 1406 // don't understand this, so commented it out
1406 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1407 scr_expose (ev->xexpose.x, ev->xexpose.y,
1407 ev->xexpose.width, ev->xexpose.height, False); 1408 ev->xexpose.width, ev->xexpose.height, False);
1408 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1409 //scr_expose (ev->xexpose.x, 0,
1409 // ev->xexpose.width, R->TermWin.height, False); 1410 // ev->xexpose.width, TermWin.height, False);
1410#endif 1411#endif
1411 R->want_refresh = 1; 1412 want_refresh = 1;
1412 } else { 1413 } else {
1413 XEvent unused_xevent; 1414 XEvent unused_xevent;
1414 1415
1415 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1416 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window,
1416 Expose, 1417 Expose,
1417 &unused_xevent)) ; 1418 &unused_xevent)) ;
1418 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1419 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window,
1419 GraphicsExpose, 1420 GraphicsExpose,
1420 &unused_xevent)) ; 1421 &unused_xevent)) ;
1421 if (isScrollbarWindow(ev->xany.window)) { 1422 if (isScrollbarWindow(ev->xany.window)) {
1422 R->scrollBar.setIdle(); 1423 scrollBar.setIdle();
1423 rxvt_scrollbar_show(aR_ 0); 1424 scrollbar_show (0);
1424 } 1425 }
1425#ifdef MENUBAR 1426#ifdef MENUBAR
1426 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1427 if (menubar_visible () && isMenuBarWindow(ev->xany.window))
1427 rxvt_menubar_expose(aR); 1428 menubar_expose ();
1428#endif 1429#endif
1429#ifdef RXVT_GRAPHICS 1430#ifdef RXVT_GRAPHICS
1430 rxvt_Gr_expose(aR_ ev->xany.window); 1431 Gr_expose (ev->xany.window);
1431#endif 1432#endif
1432 } 1433 }
1433 break; 1434 break;
1434 1435
1435 case MotionNotify: 1436 case MotionNotify:
1436#ifdef POINTER_BLANK 1437#ifdef POINTER_BLANK
1437 if (R->hidden_pointer) 1438 if (hidden_pointer)
1438 R->pointer_unblank (); 1439 pointer_unblank ();
1439#endif 1440#endif
1440#if MENUBAR 1441#if MENUBAR
1441 if (isMenuBarWindow(ev->xany.window)) { 1442 if (isMenuBarWindow(ev->xany.window)) {
1442 rxvt_menubar_control(aR_ &(ev->xbutton)); 1443 menubar_control (&(ev->xbutton));
1443 break; 1444 break;
1444 } 1445 }
1445#endif 1446#endif
1446 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1447 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate))
1447 break; 1448 break;
1448 1449
1449 if (ev->xany.window == R->TermWin.vt) { 1450 if (ev->xany.window == TermWin.vt) {
1450 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1451 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) {
1451 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1452 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt,
1452 MotionNotify, ev)) ; 1453 MotionNotify, ev)) ;
1453 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1454 XQueryPointer(Xdisplay, TermWin.vt,
1454 &unused_root, &unused_child, 1455 &unused_root, &unused_child,
1455 &unused_root_x, &unused_root_y, 1456 &unused_root_x, &unused_root_y,
1456 &(ev->xbutton.x), &(ev->xbutton.y), 1457 &(ev->xbutton.x), &(ev->xbutton.y),
1457 &unused_mask); 1458 &unused_mask);
1458#ifdef MOUSE_THRESHOLD 1459#ifdef MOUSE_THRESHOLD
1459 /* deal with a `jumpy' mouse */ 1460 /* deal with a `jumpy' mouse */
1460 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1461 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) {
1461#endif 1462#endif
1462 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1463 selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1463 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1464 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1464#ifdef SELECTION_SCROLLING 1465#ifdef SELECTION_SCROLLING
1465 if (ev->xbutton.y<R->TermWin.int_bwidth || 1466 if (ev->xbutton.y < TermWin.int_bwidth
1466 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1467 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) {
1467 int dist; 1468 int dist;
1468 1469
1469 R->pending_scroll_selection=1; 1470 pending_scroll_selection=1;
1470 1471
1471 /* don't clobber the current delay if we are 1472 /* don't clobber the current delay if we are
1472 * already in the middle of scrolling. 1473 * already in the middle of scrolling.
1473 */ 1474 */
1474 if (R->scroll_selection_delay<=0) 1475 if (scroll_selection_delay<=0)
1475 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1476 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1476 1477
1477 /* save the event params so we can highlight 1478 /* save the event params so we can highlight
1478 * the selection in the pending-scroll loop 1479 * the selection in the pending-scroll loop
1479 */ 1480 */
1480 R->selection_save_x=ev->xbutton.x; 1481 selection_save_x=ev->xbutton.x;
1481 R->selection_save_y=ev->xbutton.y; 1482 selection_save_y=ev->xbutton.y;
1482 R->selection_save_state= 1483 selection_save_state=
1483 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1484 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1484 1485
1485 /* calc number of lines to scroll */ 1486 /* calc number of lines to scroll */
1486 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1487 if (ev->xbutton.y<TermWin.int_bwidth) {
1487 R->scroll_selection_dir = UP; 1488 scroll_selection_dir = UP;
1488 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1489 dist = TermWin.int_bwidth - ev->xbutton.y;
1489 } 1490 }
1490 else { 1491 else {
1491 R->scroll_selection_dir = DN; 1492 scroll_selection_dir = DN;
1492 dist = ev->xbutton.y - 1493 dist = ev->xbutton.y -
1493 (R->TermWin.int_bwidth + R->TermWin.height); 1494 (TermWin.int_bwidth + TermWin.height);
1494 } 1495 }
1495 R->scroll_selection_lines=(Pixel2Height(dist)/ 1496 scroll_selection_lines=(Pixel2Height(dist)/
1496 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1497 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1497 MIN_IT(R->scroll_selection_lines, 1498 MIN_IT(scroll_selection_lines,
1498 SELECTION_SCROLL_MAX_LINES); 1499 SELECTION_SCROLL_MAX_LINES);
1499 } 1500 }
1500 else { 1501 else {
1501 /* we are within the text window, so we 1502 /* we are within the text window, so we
1502 * shouldn't be scrolling 1503 * shouldn't be scrolling
1503 */ 1504 */
1504 R->pending_scroll_selection = 0; 1505 pending_scroll_selection = 0;
1505 } 1506 }
1506#endif 1507#endif
1507#ifdef MOUSE_THRESHOLD 1508#ifdef MOUSE_THRESHOLD
1508 } 1509 }
1509#endif 1510#endif
1510 } 1511 }
1511 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) { 1512 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1512 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win, 1513 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1513 MotionNotify, ev)) ; 1514 MotionNotify, ev)) ;
1514 XQueryPointer(R->Xdisplay, R->scrollBar.win, 1515 XQueryPointer(Xdisplay, scrollBar.win,
1515 &unused_root, &unused_child, 1516 &unused_root, &unused_child,
1516 &unused_root_x, &unused_root_y, 1517 &unused_root_x, &unused_root_y,
1517 &(ev->xbutton.x), &(ev->xbutton.y), 1518 &(ev->xbutton.x), &(ev->xbutton.y),
1518 &unused_mask); 1519 &unused_mask);
1519 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1520 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1520 scrollbar_size()); 1521 scrollbar_size());
1521 R->scr_refresh (R->refresh_type); 1522 scr_refresh (refresh_type);
1522 R->refresh_limit = 0; 1523 refresh_limit = 0;
1523 rxvt_scrollbar_show(aR_ 1); 1524 scrollbar_show (1);
1524 } 1525 }
1525 break; 1526 break;
1526 } 1527 }
1527} 1528}
1528 1529
1529/* INTPROTO */
1530void 1530void
1531rxvt_button_press(pR_ XButtonEvent *ev) 1531rxvt_term::button_press (XButtonEvent *ev)
1532{ 1532{
1533 int reportmode = 0, clickintime; 1533 int reportmode = 0, clickintime;
1534 1534
1535 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1535 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1536 if (!R->bypass_keystate) 1536 if (!bypass_keystate)
1537 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1537 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1538/* 1538/*
1539 * VT window processing of button press 1539 * VT window processing of button press
1540 */ 1540 */
1541 if (ev->window == R->TermWin.vt) 1541 if (ev->window == TermWin.vt)
1542 { 1542 {
1543#if RXVT_GRAPHICS 1543#if RXVT_GRAPHICS
1544 if (ev->subwindow != None) 1544 if (ev->subwindow != None)
1545 rxvt_Gr_ButtonPress (ev->x, ev->y); 1545 rxvt_Gr_ButtonPress (ev->x, ev->y);
1546 else 1546 else
1547#endif 1547#endif
1548 { 1548 {
1549 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1549 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1550 if (reportmode) 1550 if (reportmode)
1551 { 1551 {
1552 /* mouse report from vt window */ 1552 /* mouse report from vt window */
1553 /* save the xbutton state (for ButtonRelease) */ 1553 /* save the xbutton state (for ButtonRelease) */
1554 R->MEvent.state = ev->state; 1554 MEvent.state = ev->state;
1555#ifdef MOUSE_REPORT_DOUBLECLICK 1555#ifdef MOUSE_REPORT_DOUBLECLICK
1556 if (ev->button == R->MEvent.button && clickintime) 1556 if (ev->button == MEvent.button && clickintime)
1557 { 1557 {
1558 /* same button, within alloted time */ 1558 /* same button, within alloted time */
1559 R->MEvent.clicks++; 1559 MEvent.clicks++;
1560 if (R->MEvent.clicks > 1) 1560 if (MEvent.clicks > 1)
1561 { 1561 {
1562 /* only report double clicks */ 1562 /* only report double clicks */
1563 R->MEvent.clicks = 2; 1563 MEvent.clicks = 2;
1564 rxvt_mouse_report(aR_ ev); 1564 mouse_report (ev);
1565 1565
1566 /* don't report the release */ 1566 /* don't report the release */
1567 R->MEvent.clicks = 0; 1567 MEvent.clicks = 0;
1568 R->MEvent.button = AnyButton; 1568 MEvent.button = AnyButton;
1569 } 1569 }
1570 } 1570 }
1571 else 1571 else
1572 { 1572 {
1573 /* different button, or time expired */ 1573 /* different button, or time expired */
1574 R->MEvent.clicks = 1; 1574 MEvent.clicks = 1;
1575 R->MEvent.button = ev->button; 1575 MEvent.button = ev->button;
1576 rxvt_mouse_report(aR_ ev); 1576 mouse_report (ev);
1577 } 1577 }
1578#else 1578#else
1579 R->MEvent.button = ev->button; 1579 MEvent.button = ev->button;
1580 rxvt_mouse_report(aR_ ev); 1580 mouse_report (ev);
1581#endif /* MOUSE_REPORT_DOUBLECLICK */ 1581#endif /* MOUSE_REPORT_DOUBLECLICK */
1582 } 1582 }
1583 else 1583 else
1584 { 1584 {
1585 if (ev->button != R->MEvent.button) 1585 if (ev->button != MEvent.button)
1586 R->MEvent.clicks = 0; 1586 MEvent.clicks = 0;
1587 switch (ev->button) 1587 switch (ev->button)
1588 { 1588 {
1589 case Button1: 1589 case Button1:
1590 /* allow shift+left click to extend selection */ 1590 /* allow shift+left click to extend selection */
1591 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report)) 1591 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report))
1592 { 1592 {
1593 if (R->MEvent.button == Button1 && clickintime) 1593 if (MEvent.button == Button1 && clickintime)
1594 R->selection_rotate (ev->x, ev->y); 1594 selection_rotate (ev->x, ev->y);
1595 else 1595 else
1596 R->selection_extend (ev->x, ev->y, 1); 1596 selection_extend (ev->x, ev->y, 1);
1597 } 1597 }
1598 else 1598 else
1599 { 1599 {
1600 if (R->MEvent.button == Button1 && clickintime) 1600 if (MEvent.button == Button1 && clickintime)
1601 R->MEvent.clicks++; 1601 MEvent.clicks++;
1602 else 1602 else
1603 R->MEvent.clicks = 1; 1603 MEvent.clicks = 1;
1604 1604
1605 R->selection_click (R->MEvent.clicks, ev->x, ev->y); 1605 selection_click (MEvent.clicks, ev->x, ev->y);
1606 } 1606 }
1607 1607
1608 R->MEvent.button = Button1; 1608 MEvent.button = Button1;
1609 break; 1609 break;
1610 1610
1611 case Button3: 1611 case Button3:
1612 if (R->MEvent.button == Button3 && clickintime) 1612 if (MEvent.button == Button3 && clickintime)
1613 R->selection_rotate (ev->x, ev->y); 1613 selection_rotate (ev->x, ev->y);
1614 else 1614 else
1615 R->selection_extend (ev->x, ev->y, 1); 1615 selection_extend (ev->x, ev->y, 1);
1616 R->MEvent.button = Button3; 1616 MEvent.button = Button3;
1617 break; 1617 break;
1618 } 1618 }
1619 } 1619 }
1620 R->MEvent.time = ev->time; 1620 MEvent.time = ev->time;
1621 return; 1621 return;
1622 } 1622 }
1623 } 1623 }
1624 1624
1625/* 1625/*
1626 * Scrollbar window processing of button press 1626 * Scrollbar window processing of button press
1627 */ 1627 */
1628 if (isScrollbarWindow(ev->window)) 1628 if (isScrollbarWindow(ev->window))
1629 { 1629 {
1630 R->scrollBar.setIdle (); 1630 scrollBar.setIdle ();
1631 /* 1631 /*
1632 * Rxvt-style scrollbar: 1632 * Rxvt-style scrollbar:
1633 * move up if mouse is above slider 1633 * move up if mouse is above slider
1634 * move dn if mouse is below slider 1634 * move dn if mouse is below slider
1635 * 1635 *
… …
1643 /* 1643 /*
1644 * Mouse report disabled scrollbar: 1644 * Mouse report disabled scrollbar:
1645 * arrow buttons - send up/down 1645 * arrow buttons - send up/down
1646 * click on scrollbar - send pageup/down 1646 * click on scrollbar - send pageup/down
1647 */ 1647 */
1648 if ((R->scrollBar.style == R_SB_NEXT 1648 if ((scrollBar.style == R_SB_NEXT
1649 && scrollbarnext_upButton(ev->y)) 1649 && scrollbarnext_upButton(ev->y))
1650 || (R->scrollBar.style == R_SB_RXVT 1650 || (scrollBar.style == R_SB_RXVT
1651 && scrollbarrxvt_upButton(ev->y))) 1651 && scrollbarrxvt_upButton(ev->y)))
1652 R->tt_printf("\033[A"); 1652 tt_printf("\033[A");
1653 else if ((R->scrollBar.style == R_SB_NEXT 1653 else if ((scrollBar.style == R_SB_NEXT
1654 && scrollbarnext_dnButton(ev->y)) 1654 && scrollbarnext_dnButton(ev->y))
1655 || (R->scrollBar.style == R_SB_RXVT 1655 || (scrollBar.style == R_SB_RXVT
1656 && scrollbarrxvt_dnButton(ev->y))) 1656 && scrollbarrxvt_dnButton(ev->y)))
1657 R->tt_printf("\033[B"); 1657 tt_printf("\033[B");
1658 else 1658 else
1659 switch (ev->button) { 1659 switch (ev->button) {
1660 case Button2: 1660 case Button2:
1661 R->tt_printf("\014"); 1661 tt_printf("\014");
1662 break; 1662 break;
1663 case Button1: 1663 case Button1:
1664 R->tt_printf("\033[6~"); 1664 tt_printf("\033[6~");
1665 break; 1665 break;
1666 case Button3: 1666 case Button3:
1667 R->tt_printf("\033[5~"); 1667 tt_printf("\033[5~");
1668 break; 1668 break;
1669 } 1669 }
1670 } 1670 }
1671 else 1671 else
1672#endif /* NO_SCROLLBAR_REPORT */ 1672#endif /* NO_SCROLLBAR_REPORT */
1673 { 1673 {
1674 char upordown = 0; 1674 char upordown = 0;
1675 1675
1676 if (R->scrollBar.style == R_SB_NEXT) { 1676 if (scrollBar.style == R_SB_NEXT) {
1677 if (scrollbarnext_upButton(ev->y)) 1677 if (scrollbarnext_upButton(ev->y))
1678 upordown = -1; /* up */ 1678 upordown = -1; /* up */
1679 else if (scrollbarnext_dnButton(ev->y)) 1679 else if (scrollbarnext_dnButton(ev->y))
1680 upordown = 1; /* down */ 1680 upordown = 1; /* down */
1681 } else if (R->scrollBar.style == R_SB_RXVT) { 1681 } else if (scrollBar.style == R_SB_RXVT) {
1682 if (scrollbarrxvt_upButton(ev->y)) 1682 if (scrollbarrxvt_upButton(ev->y))
1683 upordown = -1; /* up */ 1683 upordown = -1; /* up */
1684 else if (scrollbarrxvt_dnButton(ev->y)) 1684 else if (scrollbarrxvt_dnButton(ev->y))
1685 upordown = 1; /* down */ 1685 upordown = 1; /* down */
1686 } 1686 }
1687 if (upordown) { 1687 if (upordown) {
1688#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1688#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1689 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1689 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1690#endif 1690#endif
1691 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1691 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1692 if (upordown < 0) 1692 if (upordown < 0)
1693 R->scrollBar.setUp (); 1693 scrollBar.setUp ();
1694 else 1694 else
1695 R->scrollBar.setDn (); 1695 scrollBar.setDn ();
1696 } 1696 }
1697 } else 1697 } else
1698 switch (ev->button) { 1698 switch (ev->button) {
1699 case Button2: 1699 case Button2:
1700 switch (R->scrollbar_align) { 1700 switch (scrollbar_align) {
1701 case R_SB_ALIGN_TOP: 1701 case R_SB_ALIGN_TOP:
1702 R->csrO = 0; 1702 csrO = 0;
1703 break; 1703 break;
1704 case R_SB_ALIGN_CENTRE: 1704 case R_SB_ALIGN_CENTRE:
1705 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2; 1705 csrO = (scrollBar.bot - scrollBar.top) / 2;
1706 break; 1706 break;
1707 case R_SB_ALIGN_BOTTOM: 1707 case R_SB_ALIGN_BOTTOM:
1708 R->csrO = R->scrollBar.bot - R->scrollBar.top; 1708 csrO = scrollBar.bot - scrollBar.top;
1709 break; 1709 break;
1710 } 1710 }
1711 if (R->scrollBar.style == R_SB_XTERM 1711 if (scrollBar.style == R_SB_XTERM
1712 || scrollbar_above_slider(ev->y) 1712 || scrollbar_above_slider(ev->y)
1713 || scrollbar_below_slider(ev->y)) 1713 || scrollbar_below_slider(ev->y))
1714 rxvt_scr_move_to(aR_
1715 scrollbar_position(ev->y) - R->csrO, 1714 scr_move_to ( scrollbar_position(ev->y) - csrO,
1716 scrollbar_size()); 1715 scrollbar_size());
1717 R->scrollBar.setMotion (); 1716 scrollBar.setMotion ();
1718 break; 1717 break;
1719 1718
1720 case Button1: 1719 case Button1:
1721 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1720 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1722 R->csrO = ev->y - R->scrollBar.top; 1721 csrO = ev->y - scrollBar.top;
1723 /* FALLTHROUGH */ 1722 /* FALLTHROUGH */
1724 1723
1725 case Button3: 1724 case Button3:
1726 if (R->scrollBar.style != R_SB_XTERM) { 1725 if (scrollBar.style != R_SB_XTERM) {
1727 if (scrollbar_above_slider(ev->y)) 1726 if (scrollbar_above_slider(ev->y))
1728# ifdef RXVT_SCROLL_FULL 1727# ifdef RXVT_SCROLL_FULL
1729 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1); 1728 scr_page (UP, TermWin.nrow - 1);
1730# else 1729# else
1731 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4); 1730 scr_page (UP, TermWin.nrow / 4);
1732# endif 1731# endif
1733 else if (scrollbar_below_slider(ev->y)) 1732 else if (scrollbar_below_slider(ev->y))
1734# ifdef RXVT_SCROLL_FULL 1733# ifdef RXVT_SCROLL_FULL
1735 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1734 scr_page (DN, TermWin.nrow - 1);
1736# else 1735# else
1737 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1736 scr_page (DN, TermWin.nrow / 4);
1738# endif 1737# endif
1739 else 1738 else
1740 R->scrollBar.setMotion (); 1739 scrollBar.setMotion ();
1741 } else { 1740 } else {
1742 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1741 scr_page ((ev->button == Button1 ? DN : UP),
1743 (R->TermWin.nrow 1742 (TermWin.nrow
1744 * scrollbar_position(ev->y) 1743 * scrollbar_position(ev->y)
1745 / scrollbar_size())); 1744 / scrollbar_size()));
1746 } 1745 }
1747 break; 1746 break;
1748 } 1747 }
… …
1752#if MENUBAR 1751#if MENUBAR
1753 /* 1752 /*
1754 * Menubar window processing of button press 1753 * Menubar window processing of button press
1755 */ 1754 */
1756 if (isMenuBarWindow(ev->window)) 1755 if (isMenuBarWindow(ev->window))
1757 rxvt_menubar_control(aR_ ev); 1756 menubar_control (ev);
1758#endif 1757#endif
1759} 1758}
1760 1759
1761/* INTPROTO */
1762void 1760void
1763rxvt_button_release(pR_ XButtonEvent *ev) 1761rxvt_term::button_release (XButtonEvent *ev)
1764{ 1762{
1765 int reportmode = 0; 1763 int reportmode = 0;
1766 1764
1767 R->csrO = 0; /* reset csr Offset */ 1765 csrO = 0; /* reset csr Offset */
1768 if (!R->bypass_keystate) 1766 if (!bypass_keystate)
1769 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1767 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1770 1768
1771 if (scrollbar_isUpDn()) { 1769 if (scrollbar_isUpDn()) {
1772 R->scrollBar.setIdle (); 1770 scrollBar.setIdle ();
1773 rxvt_scrollbar_show(aR_ 0); 1771 scrollbar_show (0);
1774#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1772#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1775 R->refresh_type &= ~SMOOTH_REFRESH; 1773 refresh_type &= ~SMOOTH_REFRESH;
1776#endif 1774#endif
1777 } 1775 }
1778#ifdef SELECTION_SCROLLING 1776#ifdef SELECTION_SCROLLING
1779 R->pending_scroll_selection=0; 1777 pending_scroll_selection=0;
1780#endif 1778#endif
1781 if (ev->window == R->TermWin.vt) 1779 if (ev->window == TermWin.vt)
1782 { 1780 {
1783#ifdef RXVT_GRAPHICS 1781#ifdef RXVT_GRAPHICS
1784 if (ev->subwindow != None) 1782 if (ev->subwindow != None)
1785 rxvt_Gr_ButtonRelease(ev->x, ev->y); 1783 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1786 else 1784 else
… …
1792 /* don't report release of wheel "buttons" */ 1790 /* don't report release of wheel "buttons" */
1793 if (ev->button >= 4) 1791 if (ev->button >= 4)
1794 return; 1792 return;
1795#ifdef MOUSE_REPORT_DOUBLECLICK 1793#ifdef MOUSE_REPORT_DOUBLECLICK
1796 /* only report the release of 'slow' single clicks */ 1794 /* only report the release of 'slow' single clicks */
1797 if (R->MEvent.button != AnyButton 1795 if (MEvent.button != AnyButton
1798 && (ev->button != R->MEvent.button 1796 && (ev->button != MEvent.button
1799 || (ev->time - R->MEvent.time 1797 || (ev->time - MEvent.time
1800 > MULTICLICK_TIME / 2))) 1798 > MULTICLICK_TIME / 2)))
1801 { 1799 {
1802 R->MEvent.clicks = 0; 1800 MEvent.clicks = 0;
1803 R->MEvent.button = AnyButton; 1801 MEvent.button = AnyButton;
1804 rxvt_mouse_report(aR_ ev); 1802 mouse_report (ev);
1805 } 1803 }
1806#else /* MOUSE_REPORT_DOUBLECLICK */ 1804#else /* MOUSE_REPORT_DOUBLECLICK */
1807 R->MEvent.button = AnyButton; 1805 MEvent.button = AnyButton;
1808 rxvt_mouse_report(aR_ ev); 1806 mouse_report (ev);
1809#endif /* MOUSE_REPORT_DOUBLECLICK */ 1807#endif /* MOUSE_REPORT_DOUBLECLICK */
1810 return; 1808 return;
1811 } 1809 }
1812 /* 1810 /*
1813 * dumb hack to compensate for the failure of click-and-drag 1811 * dumb hack to compensate for the failure of click-and-drag
1814 * when overriding mouse reporting 1812 * when overriding mouse reporting
1815 */ 1813 */
1816 if (R->PrivateModes & PrivMode_mouse_report 1814 if (PrivateModes & PrivMode_mouse_report
1817 && R->bypass_keystate 1815 && bypass_keystate
1818 && ev->button == Button1 && R->MEvent.clicks <= 1) 1816 && ev->button == Button1 && MEvent.clicks <= 1)
1819 R->selection_extend (ev->x, ev->y, 0); 1817 selection_extend (ev->x, ev->y, 0);
1820 1818
1821 switch (ev->button) { 1819 switch (ev->button) {
1822 case Button1: 1820 case Button1:
1823 case Button3: 1821 case Button3:
1824 rxvt_selection_make(aR_ ev->time); 1822 selection_make (ev->time);
1825 break; 1823 break;
1826 case Button2: 1824 case Button2:
1827 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1825 selection_request (ev->time, ev->x, ev->y);
1828 break; 1826 break;
1829#ifdef MOUSE_WHEEL 1827#ifdef MOUSE_WHEEL
1830 case Button4: 1828 case Button4:
1831 case Button5: 1829 case Button5:
1832 { 1830 {
… …
1834 page_dirn v; 1832 page_dirn v;
1835 1833
1836 v = (ev->button == Button4) ? UP : DN; 1834 v = (ev->button == Button4) ? UP : DN;
1837 if (ev->state & ShiftMask) 1835 if (ev->state & ShiftMask)
1838 i = 1; 1836 i = 1;
1839 else if ((R->Options & Opt_mouseWheelScrollPage)) 1837 else if ((Options & Opt_mouseWheelScrollPage))
1840 i = R->TermWin.nrow - 1; 1838 i = TermWin.nrow - 1;
1841 else 1839 else
1842 i = 5; 1840 i = 5;
1843# ifdef MOUSE_SLIP_WHEELING 1841# ifdef MOUSE_SLIP_WHEELING
1844 if (ev->state & ControlMask) 1842 if (ev->state & ControlMask)
1845 { 1843 {
1846 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1844 mouse_slip_wheel_speed += (v ? -1 : 1);
1847 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1845 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1848 } 1846 }
1849# endif 1847# endif
1850# ifdef JUMP_MOUSE_WHEEL 1848# ifdef JUMP_MOUSE_WHEEL
1851 rxvt_scr_page(aR_ v, i); 1849 scr_page (v, i);
1852 R->scr_refresh (SMOOTH_REFRESH); 1850 scr_refresh (SMOOTH_REFRESH);
1853 rxvt_scrollbar_show(aR_ 1); 1851 scrollbar_show (1);
1854# else 1852# else
1855 while (i--) 1853 while (i--)
1856 { 1854 {
1857 rxvt_scr_page(aR_ v, 1); 1855 scr_page (v, 1);
1858 R->scr_refresh (SMOOTH_REFRESH); 1856 scr_refresh (SMOOTH_REFRESH);
1859 rxvt_scrollbar_show(aR_ 1); 1857 scrollbar_show (1);
1860 } 1858 }
1861# endif 1859# endif
1862 } 1860 }
1863 break; 1861 break;
1864#endif 1862#endif
1865 } 1863 }
1866 } 1864 }
1867 } 1865 }
1868#ifdef MENUBAR 1866#ifdef MENUBAR
1869 else if (isMenuBarWindow(ev->window)) 1867 else if (isMenuBarWindow(ev->window))
1870 rxvt_menubar_control(aR_ ev); 1868 menubar_control (ev);
1871#endif 1869#endif
1872} 1870}
1873 1871
1874 1872
1875#ifdef TRANSPARENT 1873#ifdef TRANSPARENT
1876/* 1874/*
1877 * Check our parents are still who we think they are. 1875 * Check our parents are still who we think they are.
1878 * Do transparency updates if required 1876 * Do transparency updates if required
1879 */ 1877 */
1880/* EXTPROTO */
1881int 1878int
1882rxvt_check_our_parents(pR) 1879rxvt_term::check_our_parents ()
1883{ 1880{
1884 int i, pchanged, aformat, have_pixmap, rootdepth; 1881 int i, pchanged, aformat, have_pixmap, rootdepth;
1885 unsigned long nitems, bytes_after; 1882 unsigned long nitems, bytes_after;
1886 Atom atype; 1883 Atom atype;
1887 unsigned char *prop = NULL; 1884 unsigned char *prop = NULL;
… …
1889 Pixmap rootpixmap = None; 1886 Pixmap rootpixmap = None;
1890 XWindowAttributes wattr, wrootattr; 1887 XWindowAttributes wattr, wrootattr;
1891 1888
1892 pchanged = 0; 1889 pchanged = 0;
1893 1890
1894 if (!(R->Options & Opt_transparent)) 1891 if (!(Options & Opt_transparent))
1895 return pchanged; /* Don't try any more */ 1892 return pchanged; /* Don't try any more */
1896 1893
1897 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1894 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr);
1898 rootdepth = wrootattr.depth; 1895 rootdepth = wrootattr.depth;
1899 1896
1900 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1897 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
1901 if (rootdepth != wattr.depth) { 1898 if (rootdepth != wattr.depth) {
1902 if (R->am_transparent) { 1899 if (am_transparent) {
1903 pchanged = 1; 1900 pchanged = 1;
1904 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1901 XSetWindowBackground(Xdisplay, TermWin.vt,
1905 R->PixColors[Color_bg]); 1902 PixColors[Color_bg]);
1906 R->am_transparent = R->am_pixmap_trans = 0; 1903 am_transparent = am_pixmap_trans = 0;
1907 } 1904 }
1908 return pchanged; /* Don't try any more */ 1905 return pchanged; /* Don't try any more */
1909 } 1906 }
1910 1907
1911/* Get all X ops out of the queue so that our information is up-to-date. */ 1908/* Get all X ops out of the queue so that our information is up-to-date. */
1912 XSync(R->Xdisplay, False); 1909 XSync(Xdisplay, False);
1913 1910
1914/* 1911/*
1915 * Make the frame window set by the window manager have 1912 * Make the frame window set by the window manager have
1916 * the root background. Some window managers put multiple nested frame 1913 * the root background. Some window managers put multiple nested frame
1917 * windows for each client, so we have to take care about that. 1914 * windows for each client, so we have to take care about that.
1918 */ 1915 */
1919 i = (R->xa[XA_XROOTPMAPID] != 0 1916 i = (xa[XA_XROOTPMAPID] != 0
1920 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1917 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID],
1921 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1918 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1922 &nitems, &bytes_after, &prop) == Success)); 1919 &nitems, &bytes_after, &prop) == Success));
1923 if (!i || prop == NULL) 1920 if (!i || prop == NULL)
1924 have_pixmap = 0; 1921 have_pixmap = 0;
1925 else { 1922 else {
… …
1936 Window cr; 1933 Window cr;
1937 XImage *image; 1934 XImage *image;
1938 GC gc; 1935 GC gc;
1939 XGCValues gcvalue; 1936 XGCValues gcvalue;
1940 1937
1941 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1938 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot,
1942 0, 0, &sx, &sy, &cr); 1939 0, 0, &sx, &sy, &cr);
1943 nw = (unsigned int)R->szHint.width; 1940 nw = (unsigned int)szHint.width;
1944 nh = (unsigned int)R->szHint.height; 1941 nh = (unsigned int)szHint.height;
1945 nx = ny = 0; 1942 nx = ny = 0;
1946 if (sx < 0) { 1943 if (sx < 0) {
1947 nw += sx; 1944 nw += sx;
1948 nx = -sx; 1945 nx = -sx;
1949 sx = 0; 1946 sx = 0;
… …
1953 ny = -sy; 1950 ny = -sy;
1954 sy = 0; 1951 sy = 0;
1955 } 1952 }
1956 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1953 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1957 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1954 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1958 R->allowedxerror = -1; 1955 allowedxerror = -1;
1959 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1956 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes,
1960 ZPixmap); 1957 ZPixmap);
1961 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1958 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1962 /* XXX: may need a delay here? */ 1959 /* XXX: may need a delay here? */
1963 R->allowedxerror = 0; 1960 allowedxerror = 0;
1964 if (image == NULL) { 1961 if (image == NULL) {
1965 if (R->am_transparent && R->am_pixmap_trans) { 1962 if (am_transparent && am_pixmap_trans) {
1966 pchanged = 1; 1963 pchanged = 1;
1967 if (R->TermWin.pixmap != None) { 1964 if (TermWin.pixmap != None) {
1968 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1965 XFreePixmap(Xdisplay, TermWin.pixmap);
1969 R->TermWin.pixmap = None; 1966 TermWin.pixmap = None;
1970 } 1967 }
1971 } 1968 }
1972 R->am_pixmap_trans = 0; 1969 am_pixmap_trans = 0;
1973 } else { 1970 } else {
1974 if (R->TermWin.pixmap != None) 1971 if (TermWin.pixmap != None)
1975 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1972 XFreePixmap(Xdisplay, TermWin.pixmap);
1976 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 1973 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt,
1977 (unsigned int)R->szHint.width, 1974 (unsigned int)szHint.width,
1978 (unsigned int)R->szHint.height, 1975 (unsigned int)szHint.height,
1979 (unsigned int)image->depth); 1976 (unsigned int)image->depth);
1980 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue); 1977 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0, 1978 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width, 1979 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 1980 (unsigned int)image->height);
1984 XFreeGC(R->Xdisplay, gc); 1981 XFreeGC(Xdisplay, gc);
1985 XDestroyImage(image); 1982 XDestroyImage(image);
1986 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 1983 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt,
1987 R->TermWin.pixmap); 1984 TermWin.pixmap);
1988 if (!R->am_transparent || !R->am_pixmap_trans) 1985 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 1986 pchanged = 1;
1990 R->am_transparent = R->am_pixmap_trans = 1; 1987 am_transparent = am_pixmap_trans = 1;
1991 } 1988 }
1992 } 1989 }
1993 if (!R->am_pixmap_trans) { 1990 if (!am_pixmap_trans) {
1994 unsigned int n; 1991 unsigned int n;
1995/* 1992/*
1996 * InheritPixmap transparency 1993 * InheritPixmap transparency
1997 */ 1994 */
1998 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 1995 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot));
1999 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 1996 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window));
2000 i++) { 1997 i++) {
2001 oldp = R->TermWin.parent[i]; 1998 oldp = TermWin.parent[i];
2002 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 1999 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root,
2003 &R->TermWin.parent[i], &list, &n); 2000 &TermWin.parent[i], &list, &n);
2004 XFree(list); 2001 XFree(list);
2005 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2002 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2006 if (R->TermWin.parent[i] == Xroot) { 2003 if (TermWin.parent[i] == Xroot) {
2007 if (oldp != None) 2004 if (oldp != None)
2008 pchanged = 1; 2005 pchanged = 1;
2009 break; 2006 break;
2010 } 2007 }
2011 if (oldp != R->TermWin.parent[i]) 2008 if (oldp != TermWin.parent[i])
2012 pchanged = 1; 2009 pchanged = 1;
2013 } 2010 }
2014 n = 0; 2011 n = 0;
2015 if (pchanged) { 2012 if (pchanged) {
2016 for (; n < (unsigned int)i; n++) { 2013 for (; n < (unsigned int)i; n++) {
2017 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2014 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr);
2018 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2015 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2019 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2016 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2020 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2017 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1;
2021 break; 2018 break;
2022 } 2019 }
2023 } 2020 }
2024 } 2021 }
2025 if (n > (int)(sizeof(R->TermWin.parent) 2022 if (n > (int)(sizeof(TermWin.parent)
2026 / sizeof(R->TermWin.parent[0]))) { 2023 / sizeof(TermWin.parent[0]))) {
2027 D_X((stderr, "InheritPixmap Turning off")); 2024 D_X((stderr, "InheritPixmap Turning off"));
2028 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2025 XSetWindowBackground(Xdisplay, TermWin.parent[0],
2029 R->PixColors[Color_fg]); 2026 PixColors[Color_fg]);
2030 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2027 XSetWindowBackground(Xdisplay, TermWin.vt,
2031 R->PixColors[Color_bg]); 2028 PixColors[Color_bg]);
2032 R->am_transparent = 0; 2029 am_transparent = 0;
2033 /* XXX: also turn off Opt_transparent? */ 2030 /* XXX: also turn off Opt_transparent? */
2034 } else { 2031 } else {
2035 /* wait (an arbitrary period) for the WM to do its thing 2032 /* wait (an arbitrary period) for the WM to do its thing
2036 * needed for fvwm2.2.2 (and before?) */ 2033 * needed for fvwm2.2.2 (and before?) */
2037# ifdef HAVE_NANOSLEEP 2034# ifdef HAVE_NANOSLEEP
… …
2043# else 2040# else
2044 sleep(1); 2041 sleep(1);
2045# endif 2042# endif
2046 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2043 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2047 for (n = 0; n < (unsigned int)i; n++) 2044 for (n = 0; n < (unsigned int)i; n++)
2048 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2045 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n],
2049 ParentRelative); 2046 ParentRelative);
2050 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2047 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt,
2051 ParentRelative); 2048 ParentRelative);
2052 R->am_transparent = 1; 2049 am_transparent = 1;
2053 } 2050 }
2054 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2051 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++)
2055 R->TermWin.parent[i] = None; 2052 TermWin.parent[i] = None;
2056 } 2053 }
2057 return pchanged; 2054 return pchanged;
2058} 2055}
2059#endif 2056#endif
2060 2057
2061/*}}} */ 2058/*}}} */
2062 2059
2063/*{{{ print pipe */ 2060/*{{{ print pipe */
2064/*----------------------------------------------------------------------*/ 2061/*----------------------------------------------------------------------*/
2065#ifdef PRINTPIPE 2062#ifdef PRINTPIPE
2066/* EXTPROTO */ 2063FILE *
2067FILE *
2068rxvt_popen_printer(pR) 2064rxvt_term::popen_printer ()
2069{ 2065{
2070 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2066 FILE *stream = popen(rs[Rs_print_pipe], "w");
2071 2067
2072 if (stream == NULL) 2068 if (stream == NULL)
2073 rxvt_print_error("can't open printer pipe"); 2069 rxvt_print_error("can't open printer pipe");
2074 return stream; 2070 return stream;
2075} 2071}
2076 2072
2077/* EXTPROTO */
2078int 2073int
2079rxvt_pclose_printer (FILE *stream) 2074rxvt_term::pclose_printer (FILE *stream)
2080{ 2075{
2081 fflush (stream); 2076 fflush (stream);
2082/* pclose() reported not to work on SunOS 4.1.3 */ 2077/* pclose() reported not to work on SunOS 4.1.3 */
2083# if defined (__sun__) /* TODO: RESOLVE THIS */ 2078# if defined (__sun__) /* TODO: RESOLVE THIS */
2084/* pclose works provided SIGCHLD handler uses waitpid */ 2079/* pclose works provided SIGCHLD handler uses waitpid */
… …
2089} 2084}
2090 2085
2091/* 2086/*
2092 * simulate attached vt100 printer 2087 * simulate attached vt100 printer
2093 */ 2088 */
2094/* INTPROTO */
2095void 2089void
2096rxvt_process_print_pipe(pR) 2090rxvt_term::process_print_pipe ()
2097{ 2091{
2098 int done; 2092 int done;
2099 FILE *fd; 2093 FILE *fd;
2100 2094
2101 if ((fd = rxvt_popen_printer(aR)) == NULL) 2095 if ((fd = popen_printer ()) == NULL)
2102 return; 2096 return;
2103 2097
2104/* 2098/*
2105 * Send all input to the printer until either ESC[4i or ESC[?4i 2099 * Send all input to the printer until either ESC[4i or ESC[?4i
2106 * is received. 2100 * is received.
… …
2108 for (done = 0; !done;) { 2102 for (done = 0; !done;) {
2109 unsigned char buf[8]; 2103 unsigned char buf[8];
2110 unsigned char ch; 2104 unsigned char ch;
2111 unsigned int i, len; 2105 unsigned int i, len;
2112 2106
2113 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2107 if ((ch = cmd_getc ()) != C0_ESC) {
2114 if (putc(ch, fd) == EOF) 2108 if (putc(ch, fd) == EOF)
2115 break; /* done = 1 */ 2109 break; /* done = 1 */
2116 } else { 2110 } else {
2117 len = 0; 2111 len = 0;
2118 buf[len++] = ch; 2112 buf[len++] = ch;
2119 2113
2120 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2114 if ((buf[len++] = cmd_getc ()) == '[') {
2121 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2115 if ((ch = cmd_getc ()) == '?') {
2122 buf[len++] = '?'; 2116 buf[len++] = '?';
2123 ch = rxvt_cmd_getc(aR); 2117 ch = cmd_getc ();
2124 } 2118 }
2125 if ((buf[len++] = ch) == '4') { 2119 if ((buf[len++] = ch) == '4') {
2126 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2120 if ((buf[len++] = cmd_getc ()) == 'i')
2127 break; /* done = 1 */ 2121 break; /* done = 1 */
2128 } 2122 }
2129 } 2123 }
2130 for (i = 0; i < len; i++) 2124 for (i = 0; i < len; i++)
2131 if (putc(buf[i], fd) == EOF) { 2125 if (putc(buf[i], fd) == EOF) {
2132 done = 1; 2126 done = 1;
2133 break; 2127 break;
2134 } 2128 }
2135 } 2129 }
2136 } 2130 }
2137 rxvt_pclose_printer(fd); 2131 pclose_printer (fd);
2138} 2132}
2139#endif /* PRINTPIPE */ 2133#endif /* PRINTPIPE */
2140/*}}} */ 2134/*}}} */
2141 2135
2142/* *INDENT-OFF* */ 2136/* *INDENT-OFF* */
… …
2148 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2142 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2149}; 2143};
2150/* *INDENT-ON* */ 2144/* *INDENT-ON* */
2151 2145
2152/*{{{ process non-printing single characters */ 2146/*{{{ process non-printing single characters */
2153/* INTPROTO */
2154void 2147void
2155rxvt_process_nonprinting(pR_ unsigned char ch) 2148rxvt_term::process_nonprinting (unsigned char ch)
2156{ 2149{
2157 switch (ch) { 2150 switch (ch) {
2158 case C0_ENQ: /* terminal Status */ 2151 case C0_ENQ: /* terminal Status */
2159 if (R->rs[Rs_answerbackstring]) 2152 if (rs[Rs_answerbackstring])
2160 R->tt_write( 2153 tt_write(
2161 (const unsigned char *)R->rs[Rs_answerbackstring], 2154 (const unsigned char *)rs[Rs_answerbackstring],
2162 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2155 (unsigned int)STRLEN(rs[Rs_answerbackstring]));
2163 else 2156 else
2164 R->tt_write((unsigned char *)VT100_ANS, 2157 tt_write((unsigned char *)VT100_ANS,
2165 (unsigned int)STRLEN(VT100_ANS)); 2158 (unsigned int)STRLEN(VT100_ANS));
2166 break; 2159 break;
2167 case C0_BEL: /* bell */ 2160 case C0_BEL: /* bell */
2168 rxvt_scr_bell(aR); 2161 scr_bell ();
2169 break; 2162 break;
2170 case C0_BS: /* backspace */ 2163 case C0_BS: /* backspace */
2171 rxvt_scr_backspace(aR); 2164 scr_backspace ();
2172 break; 2165 break;
2173 case C0_HT: /* tab */ 2166 case C0_HT: /* tab */
2174 rxvt_scr_tab(aR_ 1); 2167 scr_tab (1);
2175 break; 2168 break;
2176 case C0_CR: /* carriage return */ 2169 case C0_CR: /* carriage return */
2177 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2170 scr_gotorc (0, 0, R_RELATIVE);
2178 break; 2171 break;
2179 case C0_VT: /* vertical tab, form feed */ 2172 case C0_VT: /* vertical tab, form feed */
2180 case C0_FF: 2173 case C0_FF:
2181 case C0_LF: /* line feed */ 2174 case C0_LF: /* line feed */
2182 rxvt_scr_index(aR_ UP); 2175 scr_index (UP);
2183 break; 2176 break;
2184 case C0_SO: /* shift out - acs */ 2177 case C0_SO: /* shift out - acs */
2185 rxvt_scr_charset_choose(aR_ 1); 2178 scr_charset_choose (1);
2186 break; 2179 break;
2187 case C0_SI: /* shift in - acs */ 2180 case C0_SI: /* shift in - acs */
2188 rxvt_scr_charset_choose(aR_ 0); 2181 scr_charset_choose (0);
2189 break; 2182 break;
2190 } 2183 }
2191} 2184}
2192/*}}} */ 2185/*}}} */
2193 2186
2194 2187
2195/*{{{ process VT52 escape sequences */ 2188/*{{{ process VT52 escape sequences */
2196/* INTPROTO */
2197void 2189void
2198rxvt_process_escape_vt52(pR_ unsigned char ch) 2190rxvt_term::process_escape_vt52 (unsigned char ch)
2199{ 2191{
2200 int row, col; 2192 int row, col;
2201 2193
2202 switch (ch) { 2194 switch (ch) {
2203 case 'A': /* cursor up */ 2195 case 'A': /* cursor up */
2204 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2196 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2205 break; 2197 break;
2206 case 'B': /* cursor down */ 2198 case 'B': /* cursor down */
2207 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2199 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2208 break; 2200 break;
2209 case 'C': /* cursor right */ 2201 case 'C': /* cursor right */
2210 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2202 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2211 break; 2203 break;
2212 case 'D': /* cursor left */ 2204 case 'D': /* cursor left */
2213 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2205 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2214 break; 2206 break;
2215 case 'H': /* cursor home */ 2207 case 'H': /* cursor home */
2216 rxvt_scr_gotorc(aR_ 0, 0, 0); 2208 scr_gotorc (0, 0, 0);
2217 break; 2209 break;
2218 case 'I': /* cursor up and scroll down if needed */ 2210 case 'I': /* cursor up and scroll down if needed */
2219 rxvt_scr_index(aR_ DN); 2211 scr_index (DN);
2220 break; 2212 break;
2221 case 'J': /* erase to end of screen */ 2213 case 'J': /* erase to end of screen */
2222 R->scr_erase_screen (0); 2214 scr_erase_screen (0);
2223 break; 2215 break;
2224 case 'K': /* erase to end of line */ 2216 case 'K': /* erase to end of line */
2225 rxvt_scr_erase_line(aR_ 0); 2217 scr_erase_line (0);
2226 break; 2218 break;
2227 case 'Y': /* move to specified row and col */ 2219 case 'Y': /* move to specified row and col */
2228 /* full command is 'ESC Y row col' where row and col 2220 /* full command is 'ESC Y row col' where row and col
2229 * are encoded by adding 32 and sending the ascii 2221 * are encoded by adding 32 and sending the ascii
2230 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2222 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2231 * etc. */ 2223 * etc. */
2232 row = rxvt_cmd_getc(aR) - ' '; 2224 row = cmd_getc () - ' ';
2233 col = rxvt_cmd_getc(aR) - ' '; 2225 col = cmd_getc () - ' ';
2234 rxvt_scr_gotorc(aR_ row, col, 0); 2226 scr_gotorc (row, col, 0);
2235 break; 2227 break;
2236 case 'Z': /* identify the terminal type */ 2228 case 'Z': /* identify the terminal type */
2237 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2229 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2238 break; 2230 break;
2239 case '<': /* turn off VT52 mode */ 2231 case '<': /* turn off VT52 mode */
2240 PrivMode(0, PrivMode_vt52); 2232 PrivMode(0, PrivMode_vt52);
2241 break; 2233 break;
2242 case 'F': /* use special graphics character set */ 2234 case 'F': /* use special graphics character set */
… …
2251} 2243}
2252/*}}} */ 2244/*}}} */
2253 2245
2254 2246
2255/*{{{ process escape sequences */ 2247/*{{{ process escape sequences */
2256/* INTPROTO */
2257void 2248void
2258rxvt_process_escape_seq(pR) 2249rxvt_term::process_escape_seq ()
2259{ 2250{
2260 unsigned char ch = rxvt_cmd_getc(aR); 2251 unsigned char ch = cmd_getc ();
2261 2252
2262 if (R->PrivateModes & PrivMode_vt52) { 2253 if (PrivateModes & PrivMode_vt52) {
2263 rxvt_process_escape_vt52(aR_ ch); 2254 process_escape_vt52 (ch);
2264 return; 2255 return;
2265 } 2256 }
2266 2257
2267 switch (ch) { 2258 switch (ch) {
2268 /* case 1: do_tek_mode (); break; */ 2259 /* case 1: do_tek_mode (); break; */
2269 case '#': 2260 case '#':
2270 if (rxvt_cmd_getc(aR) == '8') 2261 if (cmd_getc () == '8')
2271 rxvt_scr_E(aR); 2262 scr_E ();
2272 break; 2263 break;
2273 case '(': 2264 case '(':
2274 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2265 scr_charset_set (0, (unsigned int)cmd_getc ());
2275 break; 2266 break;
2276 case ')': 2267 case ')':
2277 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2268 scr_charset_set (1, (unsigned int)cmd_getc ());
2278 break; 2269 break;
2279 case '*': 2270 case '*':
2280 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2271 scr_charset_set (2, (unsigned int)cmd_getc ());
2281 break; 2272 break;
2282 case '+': 2273 case '+':
2283 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2274 scr_charset_set (3, (unsigned int)cmd_getc ());
2284 break; 2275 break;
2285#ifdef MULTICHAR_SET 2276#ifdef MULTICHAR_SET
2286 case '$': 2277 case '$':
2287 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2278 scr_charset_set (-2, (unsigned int)cmd_getc ());
2288 break; 2279 break;
2289#endif 2280#endif
2290#ifndef NO_FRILLS 2281#ifndef NO_FRILLS
2291 case '6': 2282 case '6':
2292 rxvt_scr_backindex(aR); 2283 scr_backindex ();
2293 break; 2284 break;
2294#endif 2285#endif
2295 case '7': 2286 case '7':
2296 rxvt_scr_cursor(aR_ SAVE); 2287 scr_cursor (SAVE);
2297 break; 2288 break;
2298 case '8': 2289 case '8':
2299 rxvt_scr_cursor(aR_ RESTORE); 2290 scr_cursor (RESTORE);
2300 break; 2291 break;
2301#ifndef NO_FRILLS 2292#ifndef NO_FRILLS
2302 case '9': 2293 case '9':
2303 rxvt_scr_forwardindex(aR); 2294 scr_forwardindex ();
2304 break; 2295 break;
2305#endif 2296#endif
2306 case '=': 2297 case '=':
2307 case '>': 2298 case '>':
2308 PrivMode((ch == '='), PrivMode_aplKP); 2299 PrivMode((ch == '='), PrivMode_aplKP);
2309 break; 2300 break;
2310 2301
2311 case C1_40: 2302 case C1_40:
2312 rxvt_cmd_getc(aR); 2303 cmd_getc ();
2313 break; 2304 break;
2314 case C1_44: 2305 case C1_44:
2315 rxvt_scr_index(aR_ UP); 2306 scr_index (UP);
2316 break; 2307 break;
2317 2308
2318 /* 8.3.87: NEXT LINE */ 2309 /* 8.3.87: NEXT LINE */
2319 case C1_NEL: /* ESC E */ 2310 case C1_NEL: /* ESC E */
2320 { 2311 {
2321 uint32_t nlcr[] = { '\n', '\r' }; 2312 uint32_t nlcr[] = { '\n', '\r' };
2322 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2313 scr_add_lines (nlcr, 1, 2);
2323 } 2314 }
2324 break; 2315 break;
2325 2316
2326 /* kidnapped escape sequence: Should be 8.3.48 */ 2317 /* kidnapped escape sequence: Should be 8.3.48 */
2327 case C1_ESA: /* ESC G */ 2318 case C1_ESA: /* ESC G */
2328 rxvt_process_graphics(aR); 2319 process_graphics ();
2329 break; 2320 break;
2330 2321
2331 /* 8.3.63: CHARACTER TABULATION SET */ 2322 /* 8.3.63: CHARACTER TABULATION SET */
2332 case C1_HTS: /* ESC H */ 2323 case C1_HTS: /* ESC H */
2333 rxvt_scr_set_tab(aR_ 1); 2324 scr_set_tab (1);
2334 break; 2325 break;
2335 2326
2336 /* 8.3.105: REVERSE LINE FEED */ 2327 /* 8.3.105: REVERSE LINE FEED */
2337 case C1_RI: /* ESC M */ 2328 case C1_RI: /* ESC M */
2338 rxvt_scr_index(aR_ DN); 2329 scr_index (DN);
2339 break; 2330 break;
2340 2331
2341 /* 8.3.142: SINGLE-SHIFT TWO */ 2332 /* 8.3.142: SINGLE-SHIFT TWO */
2342 /*case C1_SS2: scr_single_shift (2); break; */ 2333 /*case C1_SS2: scr_single_shift (2); break; */
2343 2334
2344 /* 8.3.143: SINGLE-SHIFT THREE */ 2335 /* 8.3.143: SINGLE-SHIFT THREE */
2345 /*case C1_SS3: scr_single_shift (3); break; */ 2336 /*case C1_SS3: scr_single_shift (3); break; */
2346 2337
2347 /* 8.3.27: DEVICE CONTROL STRING */ 2338 /* 8.3.27: DEVICE CONTROL STRING */
2348 case C1_DCS: /* ESC P */ 2339 case C1_DCS: /* ESC P */
2349 rxvt_process_dcs_seq(aR); 2340 process_dcs_seq ();
2350 break; 2341 break;
2351 2342
2352 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2343 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2353 case C1_SCI: /* ESC Z */ 2344 case C1_SCI: /* ESC Z */
2354 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2345 tt_write((const unsigned char *)ESCZ_ANSWER,
2355 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2346 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2356 break; /* steal obsolete ESC [ c */ 2347 break; /* steal obsolete ESC [ c */
2357 2348
2358 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2349 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2359 case C1_CSI: /* ESC [ */ 2350 case C1_CSI: /* ESC [ */
2360 rxvt_process_csi_seq(aR); 2351 process_csi_seq ();
2361 break; 2352 break;
2362 2353
2363 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2354 /* 8.3.90: OPERATING SYSTEM COMMAND */
2364 case C1_OSC: /* ESC ] */ 2355 case C1_OSC: /* ESC ] */
2365 rxvt_process_osc_seq(aR); 2356 process_osc_seq ();
2366 break; 2357 break;
2367 2358
2368 /* 8.3.106: RESET TO INITIAL STATE */ 2359 /* 8.3.106: RESET TO INITIAL STATE */
2369 case 'c': 2360 case 'c':
2370 rxvt_scr_poweron(aR); 2361 scr_poweron ();
2371 rxvt_scrollbar_show(aR_ 1); 2362 scrollbar_show (1);
2372 break; 2363 break;
2373 2364
2374 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2365 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2375 case 'n': 2366 case 'n':
2376 rxvt_scr_charset_choose(aR_ 2); 2367 scr_charset_choose (2);
2377 break; 2368 break;
2378 2369
2379 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2370 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2380 case 'o': 2371 case 'o':
2381 rxvt_scr_charset_choose(aR_ 3); 2372 scr_charset_choose (3);
2382 break; 2373 break;
2383 } 2374 }
2384} 2375}
2385/*}}} */ 2376/*}}} */
2386 2377
… …
2414 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2405 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2415 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2406 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2416}; 2407};
2417/* *INDENT-ON* */ 2408/* *INDENT-ON* */
2418 2409
2419/* INTPROTO */
2420void 2410void
2421rxvt_process_csi_seq(pR) 2411rxvt_term::process_csi_seq ()
2422{ 2412{
2423 unsigned char ch, priv, i; 2413 unsigned char ch, priv, i;
2424 unsigned int nargs, p; 2414 unsigned int nargs, p;
2425 int n, ndef; 2415 int n, ndef;
2426 int arg[ESC_ARGS]; 2416 int arg[ESC_ARGS];
2427 2417
2428 for (nargs = ESC_ARGS; nargs > 0;) 2418 for (nargs = ESC_ARGS; nargs > 0;)
2429 arg[--nargs] = 0; 2419 arg[--nargs] = 0;
2430 2420
2431 priv = 0; 2421 priv = 0;
2432 ch = rxvt_cmd_getc(aR); 2422 ch = cmd_getc ();
2433 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */ 2423 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2434 priv = ch; 2424 priv = ch;
2435 ch = rxvt_cmd_getc(aR); 2425 ch = cmd_getc ();
2436 } 2426 }
2437/* read any numerical arguments */ 2427/* read any numerical arguments */
2438 for (n = -1; ch < CSI_ICH; ) { 2428 for (n = -1; ch < CSI_ICH; ) {
2439 if (isdigit(ch)) { 2429 if (isdigit(ch)) {
2440 if (n < 0) 2430 if (n < 0)
… …
2444 } else if (ch == ';') { 2434 } else if (ch == ';') {
2445 if (nargs < ESC_ARGS) 2435 if (nargs < ESC_ARGS)
2446 arg[nargs++] = n; 2436 arg[nargs++] = n;
2447 n = -1; 2437 n = -1;
2448 } else if (ch == '\b') { 2438 } else if (ch == '\b') {
2449 rxvt_scr_backspace(aR); 2439 scr_backspace ();
2450 } else if (ch == C0_ESC) { 2440 } else if (ch == C0_ESC) {
2451 rxvt_process_escape_seq(aR); 2441 process_escape_seq ();
2452 return; 2442 return;
2453 } else if (ch < ' ') { 2443 } else if (ch < ' ') {
2454 rxvt_process_nonprinting(aR_ ch); 2444 process_nonprinting (ch);
2455 } 2445 }
2456 ch = rxvt_cmd_getc(aR); 2446 ch = cmd_getc ();
2457 } 2447 }
2458 2448
2459 if (ch > CSI_7F) 2449 if (ch > CSI_7F)
2460 return; 2450 return;
2461 2451
… …
2480 */ 2470 */
2481 if (priv) { 2471 if (priv) {
2482 switch (priv) { 2472 switch (priv) {
2483 case '>': 2473 case '>':
2484 if (ch == CSI_DA) /* secondary device attributes */ 2474 if (ch == CSI_DA) /* secondary device attributes */
2485 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2475 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2486 break; 2476 break;
2487 case '?': 2477 case '?':
2488 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2478 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2489 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2479 process_terminal_mode (ch, priv, nargs, arg);
2490 break; 2480 break;
2491 } 2481 }
2492 return; 2482 return;
2493 } 2483 }
2494 2484
… …
2498 */ 2488 */
2499#ifdef PRINTPIPE 2489#ifdef PRINTPIPE
2500 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2490 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2501 switch (arg[0]) { 2491 switch (arg[0]) {
2502 case 0: /* initiate transfer to primary aux device */ 2492 case 0: /* initiate transfer to primary aux device */
2503 rxvt_scr_printscreen(aR_ 0); 2493 scr_printscreen (0);
2504 break; 2494 break;
2505 case 5: /* start relay to primary aux device */ 2495 case 5: /* start relay to primary aux device */
2506 rxvt_process_print_pipe(aR); 2496 process_print_pipe ();
2507 break; 2497 break;
2508 } 2498 }
2509 break; 2499 break;
2510#endif 2500#endif
2511 2501
… …
2513 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2503 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2514 arg[0] = -arg[0]; 2504 arg[0] = -arg[0];
2515 /* FALLTHROUGH */ 2505 /* FALLTHROUGH */
2516 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2506 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2517 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2507 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2518 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2508 scr_gotorc (arg[0], 0, RELATIVE);
2519 break; 2509 break;
2520 2510
2521 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2511 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2522 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2512 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2523#ifdef ISO6429 2513#ifdef ISO6429
… …
2527#endif 2517#endif
2528 /* FALLTHROUGH */ 2518 /* FALLTHROUGH */
2529 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2519 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2530 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2520 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2531#ifdef ISO6429 2521#ifdef ISO6429
2532 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2522 scr_gotorc (0, arg[0], RELATIVE);
2533#else /* emulate common DEC VTs */ 2523#else /* emulate common DEC VTs */
2534 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2524 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2535#endif 2525#endif
2536 break; 2526 break;
2537 2527
2538 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2528 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2539 arg[0] = -arg[0]; 2529 arg[0] = -arg[0];
2540 /* FALLTHROUGH */ 2530 /* FALLTHROUGH */
2541 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2531 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2542 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2532 scr_gotorc (arg[0], 0, R_RELATIVE);
2543 break; 2533 break;
2544 2534
2545 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2535 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2546 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2536 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2547 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2537 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2548 break; 2538 break;
2549 2539
2550 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2540 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2551 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2541 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2552 break; 2542 break;
2553 2543
2554 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2544 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2555 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2545 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2556 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2546 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2557 break; 2547 break;
2558 2548
2559 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2549 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2560 arg[0] = -arg[0]; 2550 arg[0] = -arg[0];
2561 /* FALLTHROUGH */ 2551 /* FALLTHROUGH */
2562 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2552 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2563 rxvt_scr_tab(aR_ arg[0]); 2553 scr_tab (arg[0]);
2564 break; 2554 break;
2565 2555
2566 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2556 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2567 R->scr_erase_screen (arg[0]); 2557 scr_erase_screen (arg[0]);
2568 break; 2558 break;
2569 2559
2570 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2560 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2571 rxvt_scr_erase_line(aR_ arg[0]); 2561 scr_erase_line (arg[0]);
2572 break; 2562 break;
2573 2563
2574 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2564 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2575 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2565 scr_insdel_chars (arg[0], INSERT);
2576 break; 2566 break;
2577 2567
2578 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2568 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2579 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2569 scr_insdel_lines (arg[0], INSERT);
2580 break; 2570 break;
2581 2571
2582 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2572 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2583 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2573 scr_insdel_lines (arg[0], DELETE);
2584 break; 2574 break;
2585 2575
2586 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2576 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2587 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2577 scr_insdel_chars (arg[0], ERASE);
2588 break; 2578 break;
2589 2579
2590 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2580 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2591 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2581 scr_insdel_chars (arg[0], DELETE);
2592 break; 2582 break;
2593 2583
2594 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2584 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2595 arg[0] = -arg[0]; 2585 arg[0] = -arg[0];
2596 /* FALLTHROUGH */ 2586 /* FALLTHROUGH */
2597 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2587 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2598 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2588 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2599 break; 2589 break;
2600 2590
2601 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2591 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2602 R->tt_write((const unsigned char *)VT100_ANS, 2592 tt_write((const unsigned char *)VT100_ANS,
2603 (unsigned int)(sizeof(VT100_ANS) - 1)); 2593 (unsigned int)(sizeof(VT100_ANS) - 1));
2604 break; 2594 break;
2605 2595
2606 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2596 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2607 rxvt_process_sgr_mode(aR_ nargs, arg); 2597 process_sgr_mode (nargs, arg);
2608 break; 2598 break;
2609 2599
2610 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2600 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2611 switch (arg[0]) { 2601 switch (arg[0]) {
2612 case 5: /* DSR requested */ 2602 case 5: /* DSR requested */
2613 R->tt_printf("\033[0n"); 2603 tt_printf("\033[0n");
2614 break; 2604 break;
2615 case 6: /* CPR requested */ 2605 case 6: /* CPR requested */
2616 rxvt_scr_report_position(aR); 2606 scr_report_position ();
2617 break; 2607 break;
2618#if defined (ENABLE_DISPLAY_ANSWER) 2608#if defined (ENABLE_DISPLAY_ANSWER)
2619 case 7: /* unofficial extension */ 2609 case 7: /* unofficial extension */
2620 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2610 tt_printf("%-.250s\n", rs[Rs_display_name]);
2621 break; 2611 break;
2622#endif 2612#endif
2623 case 8: /* unofficial extension */ 2613 case 8: /* unofficial extension */
2624 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2614 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2625 break; 2615 break;
2626 } 2616 }
2627 break; 2617 break;
2628 2618
2629 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2619 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2630 switch (arg[0]) { 2620 switch (arg[0]) {
2631 case 0: /* char tab stop cleared at active position */ 2621 case 0: /* char tab stop cleared at active position */
2632 rxvt_scr_set_tab(aR_ 0); 2622 scr_set_tab (0);
2633 break; 2623 break;
2634 /* case 1: */ /* line tab stop cleared in active line */ 2624 /* case 1: */ /* line tab stop cleared in active line */
2635 /* case 2: */ /* char tab stops cleared in active line */ 2625 /* case 2: */ /* char tab stops cleared in active line */
2636 case 3: /* all char tab stops are cleared */ 2626 case 3: /* all char tab stops are cleared */
2637 /* case 4: */ /* all line tab stops are cleared */ 2627 /* case 4: */ /* all line tab stops are cleared */
2638 case 5: /* all tab stops are cleared */ 2628 case 5: /* all tab stops are cleared */
2639 rxvt_scr_set_tab(aR_ -1); 2629 scr_set_tab (-1);
2640 break; 2630 break;
2641 } 2631 }
2642 break; 2632 break;
2643 2633
2644 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2634 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2645 switch (arg[0]) { 2635 switch (arg[0]) {
2646 case 0: /* char tab stop set at active position */ 2636 case 0: /* char tab stop set at active position */
2647 rxvt_scr_set_tab(aR_ 1); 2637 scr_set_tab (1);
2648 break; /* = ESC H */ 2638 break; /* = ESC H */
2649 /* case 1: */ /* line tab stop set at active line */ 2639 /* case 1: */ /* line tab stop set at active line */
2650 case 2: /* char tab stop cleared at active position */ 2640 case 2: /* char tab stop cleared at active position */
2651 rxvt_scr_set_tab(aR_ 0); 2641 scr_set_tab (0);
2652 break; /* = ESC [ 0 g */ 2642 break; /* = ESC [ 0 g */
2653 /* case 3: */ /* line tab stop cleared at active line */ 2643 /* case 3: */ /* line tab stop cleared at active line */
2654 /* case 4: */ /* char tab stops cleared at active line */ 2644 /* case 4: */ /* char tab stops cleared at active line */
2655 case 5: /* all char tab stops are cleared */ 2645 case 5: /* all char tab stops are cleared */
2656 rxvt_scr_set_tab(aR_ -1); 2646 scr_set_tab (-1);
2657 break; /* = ESC [ 3 g */ 2647 break; /* = ESC [ 3 g */
2658 /* case 6: */ /* all line tab stops are cleared */ 2648 /* case 6: */ /* all line tab stops are cleared */
2659 } 2649 }
2660 break; 2650 break;
2661 2651
2662 case CSI_RM: /* 8.3.107: RESET MODE */ 2652 case CSI_RM: /* 8.3.107: RESET MODE */
2663 if (arg[0] == 4) 2653 if (arg[0] == 4)
2664 rxvt_scr_insert_mode(aR_ 0); 2654 scr_insert_mode (0);
2665 break; 2655 break;
2666 2656
2667 case CSI_SM: /* 8.3.126: SET MODE */ 2657 case CSI_SM: /* 8.3.126: SET MODE */
2668 if (arg[0] == 4) 2658 if (arg[0] == 4)
2669 rxvt_scr_insert_mode(aR_ 1); 2659 scr_insert_mode (1);
2670 break; 2660 break;
2671 2661
2672/* 2662/*
2673 * PRIVATE USE beyond this point. All CSI_7? sequences here 2663 * PRIVATE USE beyond this point. All CSI_7? sequences here
2674 */ 2664 */
2675 case CSI_72: /* DECSTBM: set top and bottom margins */ 2665 case CSI_72: /* DECSTBM: set top and bottom margins */
2676 if (nargs == 1) 2666 if (nargs == 1)
2677 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2667 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2678 else if (nargs == 0 || arg[0] >= arg[1]) 2668 else if (nargs == 0 || arg[0] >= arg[1])
2679 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2669 scr_scroll_region (0, MAX_ROWS - 1);
2680 else 2670 else
2681 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2671 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2682 break; 2672 break;
2683 2673
2684 case CSI_73: 2674 case CSI_73:
2685 rxvt_scr_cursor(aR_ SAVE); 2675 scr_cursor (SAVE);
2686 break; 2676 break;
2687 case CSI_75: 2677 case CSI_75:
2688 rxvt_scr_cursor(aR_ RESTORE); 2678 scr_cursor (RESTORE);
2689 break; 2679 break;
2690 2680
2691#ifndef NO_FRILLS 2681#ifndef NO_FRILLS
2692 case CSI_74: 2682 case CSI_74:
2693 rxvt_process_window_ops(aR_ arg, nargs); 2683 process_window_ops (arg, nargs);
2694 break; 2684 break;
2695#endif 2685#endif
2696 2686
2697 case CSI_78: /* DECREQTPARM */ 2687 case CSI_78: /* DECREQTPARM */
2698 if (arg[0] == 0 || arg[0] == 1) 2688 if (arg[0] == 0 || arg[0] == 1)
2699 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2689 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2700 /* FALLTHROUGH */ 2690 /* FALLTHROUGH */
2701 2691
2702 default: 2692 default:
2703 break; 2693 break;
2704 } 2694 }
2705} 2695}
2706/*}}} */ 2696/*}}} */
2707 2697
2708#ifndef NO_FRILLS 2698#ifndef NO_FRILLS
2709/* ARGSUSED */ 2699/* ARGSUSED */
2710/* INTPROTO */
2711void 2700void
2712rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2701rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2713{ 2702{
2714 int x, y; 2703 int x, y;
2715#if 0 2704#if 0
2716 char *s; 2705 char *s;
2717#endif 2706#endif
… …
2723 switch (args[0]) { 2712 switch (args[0]) {
2724 /* 2713 /*
2725 * commands 2714 * commands
2726 */ 2715 */
2727 case 1: /* deiconify window */ 2716 case 1: /* deiconify window */
2728 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2717 XMapWindow(Xdisplay, TermWin.parent[0]);
2729 break; 2718 break;
2730 case 2: /* iconify window */ 2719 case 2: /* iconify window */
2731 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2720 XIconifyWindow(Xdisplay, TermWin.parent[0],
2732 DefaultScreen(R->Xdisplay)); 2721 DefaultScreen(Xdisplay));
2733 break; 2722 break;
2734 case 3: /* set position (pixels) */ 2723 case 3: /* set position (pixels) */
2735 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2724 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]);
2736 break; 2725 break;
2737 case 4: /* set size (pixels) */ 2726 case 4: /* set size (pixels) */
2738 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2727 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2739 break; 2728 break;
2740 case 5: /* raise window */ 2729 case 5: /* raise window */
2741 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2730 XRaiseWindow(Xdisplay, TermWin.parent[0]);
2742 break; 2731 break;
2743 case 6: /* lower window */ 2732 case 6: /* lower window */
2744 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2733 XLowerWindow(Xdisplay, TermWin.parent[0]);
2745 break; 2734 break;
2746 case 7: /* refresh window */ 2735 case 7: /* refresh window */
2747 R->scr_touch (true); 2736 scr_touch (true);
2748 break; 2737 break;
2749 case 8: /* set size (chars) */ 2738 case 8: /* set size (chars) */
2750 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2739 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth),
2751 (unsigned int)(args[1] * R->TermWin.fheight)); 2740 (unsigned int)(args[1] * TermWin.fheight));
2752 break; 2741 break;
2753 default: 2742 default:
2754 if (args[0] >= 24) /* set height (chars) */ 2743 if (args[0] >= 24) /* set height (chars) */
2755 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2744 set_widthheight ((unsigned int)TermWin.width,
2756 (unsigned int)(args[1] * R->TermWin.fheight)); 2745 (unsigned int)(args[1] * TermWin.fheight));
2757 break; 2746 break;
2758 /* 2747 /*
2759 * reports - some output format copied from XTerm 2748 * reports - some output format copied from XTerm
2760 */ 2749 */
2761 case 11: /* report window state */ 2750 case 11: /* report window state */
2762 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2751 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
2763 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2752 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2764 break; 2753 break;
2765 case 13: /* report window position */ 2754 case 13: /* report window position */
2766 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2755 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
2767 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2756 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root,
2768 -wattr.border_width, -wattr.border_width, 2757 -wattr.border_width, -wattr.border_width,
2769 &x, &y, &wdummy); 2758 &x, &y, &wdummy);
2770 R->tt_printf("\033[3;%d;%dt", x, y); 2759 tt_printf("\033[3;%d;%dt", x, y);
2771 break; 2760 break;
2772 case 14: /* report window size (pixels) */ 2761 case 14: /* report window size (pixels) */
2773 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2762 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
2774 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2763 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2775 break; 2764 break;
2776 case 18: /* report window size (chars) */ 2765 case 18: /* report window size (chars) */
2777 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2766 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2778 break; 2767 break;
2779#if 0 /* XXX: currently disabled due to security concerns */ 2768#if 0 /* XXX: currently disabled due to security concerns */
2780 case 20: /* report icon label */ 2769 case 20: /* report icon label */
2781 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2770 XGetIconName(Xdisplay, TermWin.parent[0], &s);
2782 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2771 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2783 break; 2772 break;
2784 case 21: /* report window title */ 2773 case 21: /* report window title */
2785 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2774 XFetchName(Xdisplay, TermWin.parent[0], &s);
2786 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2775 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2787 break; 2776 break;
2788#endif 2777#endif
2789 } 2778 }
2790} 2779}
2791#endif 2780#endif
… …
2793/*----------------------------------------------------------------------*/ 2782/*----------------------------------------------------------------------*/
2794/* 2783/*
2795 * get input up until STRING TERMINATOR (or BEL) 2784 * get input up until STRING TERMINATOR (or BEL)
2796 * ends_how is terminator used. returned input must be free()d 2785 * ends_how is terminator used. returned input must be free()d
2797 */ 2786 */
2798/* INTPROTO */
2799unsigned char * 2787unsigned char *
2800rxvt_get_to_st(pR_ unsigned char *ends_how) 2788rxvt_term::get_to_st (unsigned char *ends_how)
2801{ 2789{
2802 int seen_esc = 0; /* seen escape? */ 2790 int seen_esc = 0; /* seen escape? */
2803 unsigned int n = 0; 2791 unsigned int n = 0;
2804 unsigned char *s; 2792 unsigned char *s;
2805 unsigned char ch, string[STRING_MAX]; 2793 unsigned char ch, string[STRING_MAX];
2806 2794
2807 for (; (ch = rxvt_cmd_getc(aR));) { 2795 for (; (ch = cmd_getc ());) {
2808 if (ch == C0_BEL 2796 if (ch == C0_BEL
2809 || ch == CHAR_ST 2797 || ch == CHAR_ST
2810 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2798 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2811 break; 2799 break;
2812 if (ch == C0_ESC) { 2800 if (ch == C0_ESC) {
… …
2830 2818
2831/*----------------------------------------------------------------------*/ 2819/*----------------------------------------------------------------------*/
2832/* 2820/*
2833 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2821 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2834 */ 2822 */
2835/* INTPROTO */
2836void 2823void
2837rxvt_process_dcs_seq(pR) 2824rxvt_term::process_dcs_seq ()
2838{ 2825{
2839 unsigned char eh, *s; 2826 unsigned char eh, *s;
2840/* 2827/*
2841 * Not handled yet 2828 * Not handled yet
2842 */ 2829 */
2843 s = rxvt_get_to_st(aR_ &eh); 2830 s = get_to_st (&eh);
2844 if (s) 2831 if (s)
2845 free(s); 2832 free(s);
2846 return; 2833 return;
2847} 2834}
2848 2835
2849/*----------------------------------------------------------------------*/ 2836/*----------------------------------------------------------------------*/
2850/* 2837/*
2851 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2838 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2852 */ 2839 */
2853/* INTPROTO */
2854void 2840void
2855rxvt_process_osc_seq(pR) 2841rxvt_term::process_osc_seq ()
2856{ 2842{
2857 unsigned char ch, eh, *s; 2843 unsigned char ch, eh, *s;
2858 int arg; 2844 int arg;
2859 2845
2860 ch = rxvt_cmd_getc(aR); 2846 ch = cmd_getc ();
2861 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2847 for (arg = 0; isdigit(ch); ch = cmd_getc ())
2862 arg = arg * 10 + (ch - '0'); 2848 arg = arg * 10 + (ch - '0');
2863 2849
2864 if (ch == ';') { 2850 if (ch == ';') {
2865 s = rxvt_get_to_st(aR_ &eh); 2851 s = get_to_st (&eh);
2866 if (s) { 2852 if (s) {
2867 /* 2853 /*
2868 * rxvt_menubar_dispatch() violates the constness of the string, 2854 * rxvt_menubar_dispatch() violates the constness of the string,
2869 * so do it here 2855 * so do it here
2870 */ 2856 */
2871 if (arg == XTerm_Menu) 2857 if (arg == XTerm_Menu)
2872#if 0 /* XXX: currently disabled due to security concerns */ 2858#if 0 /* XXX: currently disabled due to security concerns */
2873 rxvt_menubar_dispatch(aR_ (char *)s); 2859 menubar_dispatch ((char *)s);
2874#else 2860#else
2875 0; 2861 (void)0;
2876#endif 2862#endif
2877 else 2863 else
2878 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2864 xterm_seq (arg, (char *)s, eh);
2879 free(s); 2865 free(s);
2880 } 2866 }
2881 } 2867 }
2882} 2868}
2883/* 2869/*
… …
2899 * 20 = bg pixmap 2885 * 20 = bg pixmap
2900 * 39 = change default fg color 2886 * 39 = change default fg color
2901 * 49 = change default bg color 2887 * 49 = change default bg color
2902 * 55 = dump scrollback buffer and all of screen 2888 * 55 = dump scrollback buffer and all of screen
2903 */ 2889 */
2904/* EXTPROTO */
2905void 2890void
2906rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 2891rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused)))
2907{ 2892{
2908 int changed = 0; 2893 int changed = 0;
2909 int color; 2894 int color;
2910 char *buf, *name; 2895 char *buf, *name;
2911 2896
2912 assert(str != NULL); 2897 assert(str != NULL);
2913 switch (op) { 2898 switch (op) {
2914 case XTerm_name: 2899 case XTerm_name:
2915 rxvt_set_title(aR_ str); 2900 set_title (str);
2916 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2917 case XTerm_iconName: 2902 case XTerm_iconName:
2918 rxvt_set_iconName(aR_ str); 2903 set_iconName (str);
2919 break; 2904 break;
2920 case XTerm_title: 2905 case XTerm_title:
2921 rxvt_set_title(aR_ str); 2906 set_title (str);
2922 break; 2907 break;
2923 case XTerm_Color: 2908 case XTerm_Color:
2924 for (buf = (char *)str; buf && *buf;) { 2909 for (buf = (char *)str; buf && *buf;) {
2925 if ((name = STRCHR(buf, ';')) == NULL) 2910 if ((name = STRCHR(buf, ';')) == NULL)
2926 break; 2911 break;
… …
2928 color = atoi(buf); 2913 color = atoi(buf);
2929 if (color < 0 || color >= TOTAL_COLORS) 2914 if (color < 0 || color >= TOTAL_COLORS)
2930 break; 2915 break;
2931 if ((buf = STRCHR(name, ';')) != NULL) 2916 if ((buf = STRCHR(name, ';')) != NULL)
2932 *buf++ = '\0'; 2917 *buf++ = '\0';
2933 rxvt_set_window_color(aR_ color + minCOLOR, name); 2918 set_window_color (color + minCOLOR, name);
2934 } 2919 }
2935 break; 2920 break;
2936#ifndef NO_CURSORCOLOR 2921#ifndef NO_CURSORCOLOR
2937 case XTerm_Color_cursor: 2922 case XTerm_Color_cursor:
2938 rxvt_set_window_color(aR_ Color_cursor, str); 2923 set_window_color (Color_cursor, str);
2939 break; 2924 break;
2940#endif 2925#endif
2941 case XTerm_Color_pointer: 2926 case XTerm_Color_pointer:
2942 rxvt_set_window_color(aR_ Color_pointer, str); 2927 set_window_color (Color_pointer, str);
2943 break; 2928 break;
2944#ifndef NO_BOLD_UNDERLINE_REVERSE 2929#ifndef NO_BOLD_UNDERLINE_REVERSE
2945 case XTerm_Color_BD: 2930 case XTerm_Color_BD:
2946 rxvt_set_window_color(aR_ Color_BD, str); 2931 set_window_color (Color_BD, str);
2947 break; 2932 break;
2948 case XTerm_Color_UL: 2933 case XTerm_Color_UL:
2949 rxvt_set_window_color(aR_ Color_UL, str); 2934 set_window_color (Color_UL, str);
2950 break; 2935 break;
2951 case XTerm_Color_RV: 2936 case XTerm_Color_RV:
2952 rxvt_set_window_color(aR_ Color_RV, str); 2937 set_window_color (Color_RV, str);
2953 break; 2938 break;
2954#endif 2939#endif
2955 2940
2956 case XTerm_Menu: 2941 case XTerm_Menu:
2957 /* 2942 /*
… …
2960 */ 2945 */
2961 break; 2946 break;
2962 case XTerm_Pixmap: 2947 case XTerm_Pixmap:
2963 if (*str != ';') { 2948 if (*str != ';') {
2964#if XPM_BACKGROUND 2949#if XPM_BACKGROUND
2965 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2950 scale_pixmap (""); /* reset to default scaling */
2966 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2951 set_bgPixmap (str); /* change pixmap */
2967#endif 2952#endif
2968 R->scr_touch (true); 2953 scr_touch (true);
2969 } 2954 }
2970 while ((str = STRCHR(str, ';')) != NULL) { 2955 while ((str = STRCHR(str, ';')) != NULL) {
2971 str++; 2956 str++;
2972#if XPM_BACKGROUND 2957#if XPM_BACKGROUND
2973 changed += rxvt_scale_pixmap(aR_ str); 2958 changed += scale_pixmap (str);
2974#endif 2959#endif
2975 } 2960 }
2976 if (changed) { 2961 if (changed) {
2977#ifdef XPM_BACKGROUND 2962#ifdef XPM_BACKGROUND
2978 rxvt_resize_pixmap(aR); 2963 resize_pixmap ();
2979#endif 2964#endif
2980 R->scr_touch (true); 2965 scr_touch (true);
2981 } 2966 }
2982 break; 2967 break;
2983 2968
2984 case XTerm_restoreFG: 2969 case XTerm_restoreFG:
2985 rxvt_set_window_color(aR_ Color_fg, str); 2970 set_window_color (Color_fg, str);
2986 break; 2971 break;
2987 case XTerm_restoreBG: 2972 case XTerm_restoreBG:
2988 rxvt_set_window_color(aR_ Color_bg, str); 2973 set_window_color (Color_bg, str);
2989 break; 2974 break;
2990 case XTerm_logfile: 2975 case XTerm_logfile:
2991 break; 2976 break;
2992 case XTerm_font: 2977 case XTerm_font:
2993 rxvt_change_font(aR_ 0, str); 2978 change_font (0, str);
2994 break; 2979 break;
2995#if 0 2980#if 0
2996 case XTerm_dumpscreen: /* no error notices */ 2981 case XTerm_dumpscreen: /* no error notices */
2997 { 2982 {
2998 int fd; 2983 int fd;
2999 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 2984 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) {
3000 rxvt_scr_dump(aR_ fd); 2985 scr_dump (fd);
3001 close(fd); 2986 close(fd);
3002 } 2987 }
3003 } 2988 }
3004 break; 2989 break;
3005#endif 2990#endif
… …
3015 * 's' = save 3000 * 's' = save
3016 * 'r' = restore 3001 * 'r' = restore
3017 * 't' = toggle 3002 * 't' = toggle
3018 * so no need for fancy checking 3003 * so no need for fancy checking
3019 */ 3004 */
3020/* INTPROTO */
3021int 3005int
3022rxvt_privcases(pR_ int mode, unsigned long bit) 3006rxvt_term::privcases (int mode, unsigned long bit)
3023{ 3007{
3024 int state; 3008 int state;
3025 3009
3026 if (mode == 's') { 3010 if (mode == 's') {
3027 R->SavedModes |= (R->PrivateModes & bit); 3011 SavedModes |= (PrivateModes & bit);
3028 return -1; 3012 return -1;
3029 } else { 3013 } else {
3030 if (mode == 'r') 3014 if (mode == 'r')
3031 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3015 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3032 else 3016 else
3033 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3017 state = (mode == 't') ? !(PrivateModes & bit) : mode;
3034 PrivMode(state, bit); 3018 PrivMode(state, bit);
3035 } 3019 }
3036 return state; 3020 return state;
3037} 3021}
3038 3022
3039/* we're not using priv _yet_ */ 3023/* we're not using priv _yet_ */
3040/* INTPROTO */
3041void 3024void
3042rxvt_process_terminal_mode(pR_ int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3025rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg)
3043{ 3026{
3044 unsigned int i, j; 3027 unsigned int i, j;
3045 int state; 3028 int state;
3046 static const struct { 3029 static const struct {
3047 const int argval; 3030 const int argval;
… …
3071#endif 3054#endif
3072 { 1000, PrivMode_MouseX11 }, 3055 { 1000, PrivMode_MouseX11 },
3073 { 1010, PrivMode_TtyOutputInh }, 3056 { 1010, PrivMode_TtyOutputInh },
3074 { 1011, PrivMode_Keypress }, 3057 { 1011, PrivMode_Keypress },
3075 { 1047, PrivMode_Screen }, 3058 { 1047, PrivMode_Screen },
3059 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3076 }; 3060 };
3077 3061
3078 if (nargs == 0) 3062 if (nargs == 0)
3079 return; 3063 return;
3080 3064
… …
3088 state = -1; 3072 state = -1;
3089 3073
3090 /* basic handling */ 3074 /* basic handling */
3091 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3075 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++)
3092 if (argtopriv[j].argval == arg[i]) { 3076 if (argtopriv[j].argval == arg[i]) {
3093 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3077 state = privcases (mode, argtopriv[j].bit);
3094 break; 3078 break;
3095 } 3079 }
3096 3080
3097 /* extra handling for values with state unkept */ 3081 /* extra handling for values with state unkept */
3098 if (state == -1) 3082 if (state == -1)
3099 switch (arg[i]) { 3083 switch (arg[i]) {
3100 case 1048: /* alternative cursor save */ 3084 case 1048: /* alternative cursor save */
3101 if (mode == 0) 3085 if (mode == 0)
3102 rxvt_scr_cursor(aR_ RESTORE); 3086 scr_cursor (RESTORE);
3103 else if (mode == 1) 3087 else if (mode == 1)
3104 rxvt_scr_cursor(aR_ SAVE); 3088 scr_cursor (SAVE);
3105 /* FALLTHROUGH */ 3089 /* FALLTHROUGH */
3106 default: 3090 default:
3107 continue; /* for(;i;) */ 3091 continue; /* for(;i;) */
3108 } 3092 }
3109 3093
… …
3116 * within VT52 mode 3100 * within VT52 mode
3117 */ 3101 */
3118 PrivMode(1, PrivMode_vt52); 3102 PrivMode(1, PrivMode_vt52);
3119 break; 3103 break;
3120 case 3: /* 80/132 */ 3104 case 3: /* 80/132 */
3121 if (R->PrivateModes & PrivMode_132OK) 3105 if (PrivateModes & PrivMode_132OK)
3122 rxvt_set_widthheight(aR_
3123 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3106 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth),
3124 (unsigned int)R->TermWin.height); 3107 (unsigned int)TermWin.height);
3125 break; 3108 break;
3126 case 4: /* smooth scrolling */ 3109 case 4: /* smooth scrolling */
3127 if (state) 3110 if (state)
3128 R->Options &= ~Opt_jumpScroll; 3111 Options &= ~Opt_jumpScroll;
3129 else 3112 else
3130 R->Options |= Opt_jumpScroll; 3113 Options |= Opt_jumpScroll;
3131 break; 3114 break;
3132 case 5: /* reverse video */ 3115 case 5: /* reverse video */
3133 rxvt_scr_rvideo_mode(aR_ state); 3116 scr_rvideo_mode (state);
3134 break; 3117 break;
3135 case 6: /* relative/absolute origins */ 3118 case 6: /* relative/absolute origins */
3136 rxvt_scr_relative_origin(aR_ state); 3119 scr_relative_origin (state);
3137 break; 3120 break;
3138 case 7: /* autowrap */ 3121 case 7: /* autowrap */
3139 rxvt_scr_autowrap(aR_ state); 3122 scr_autowrap (state);
3140 break; 3123 break;
3141 /* case 8: - auto repeat, can't do on a per window basis */ 3124 /* case 8: - auto repeat, can't do on a per window basis */
3142 case 9: /* X10 mouse reporting */ 3125 case 9: /* X10 mouse reporting */
3143 if (state) /* orthogonal */ 3126 if (state) /* orthogonal */
3144 R->PrivateModes &= ~(PrivMode_MouseX11); 3127 PrivateModes &= ~(PrivMode_MouseX11);
3145 break; 3128 break;
3146#ifdef menuBar_esc 3129#ifdef menuBar_esc
3147 case menuBar_esc: 3130 case menuBar_esc:
3148#ifdef MENUBAR 3131#ifdef MENUBAR
3149 rxvt_map_menuBar(aR_ state); 3132 map_menuBar (state);
3150#endif 3133#endif
3151 break; 3134 break;
3152#endif 3135#endif
3153#ifdef scrollBar_esc 3136#ifdef scrollBar_esc
3154 case scrollBar_esc: 3137 case scrollBar_esc:
3155 if (rxvt_scrollbar_mapping(aR_ state)) { 3138 if (scrollbar_mapping (state)) {
3156 R->resize_all_windows (0, 0, 0); 3139 resize_all_windows (0, 0, 0);
3157 R->scr_touch (true); 3140 scr_touch (true);
3158 } 3141 }
3159 break; 3142 break;
3160#endif 3143#endif
3161 case 25: /* visible/invisible cursor */ 3144 case 25: /* visible/invisible cursor */
3162 rxvt_scr_cursor_visible(aR_ state); 3145 scr_cursor_visible (state);
3163 break; 3146 break;
3164 /* case 35: - shift keys */ 3147 /* case 35: - shift keys */
3165 /* case 40: - 80 <--> 132 mode */ 3148 /* case 40: - 80 <--> 132 mode */
3166 case 47: /* secondary screen */ 3149 case 47: /* secondary screen */
3167 rxvt_scr_change_screen(aR_ state); 3150 scr_change_screen (state);
3168 break; 3151 break;
3169 /* case 66: - application key pad */ 3152 /* case 66: - application key pad */
3170 /* case 67: - backspace key */ 3153 /* case 67: - backspace key */
3171 case 1000: /* X11 mouse reporting */ 3154 case 1000: /* X11 mouse reporting */
3172 if (state) /* orthogonal */ 3155 if (state) /* orthogonal */
3173 R->PrivateModes &= ~(PrivMode_MouseX10); 3156 PrivateModes &= ~(PrivMode_MouseX10);
3174 break; 3157 break;
3175#if 0 3158#if 0
3176 case 1001: 3159 case 1001:
3177 break; /* X11 mouse highlighting */ 3160 break; /* X11 mouse highlighting */
3178#endif 3161#endif
3179 case 1010: /* scroll to bottom on TTY output inhibit */ 3162 case 1010: /* scroll to bottom on TTY output inhibit */
3180 if (state) 3163 if (state)
3181 R->Options &= ~Opt_scrollTtyOutput; 3164 Options &= ~Opt_scrollTtyOutput;
3182 else 3165 else
3183 R->Options |= Opt_scrollTtyOutput; 3166 Options |= Opt_scrollTtyOutput;
3184 break; 3167 break;
3185 case 1011: /* scroll to bottom on key press */ 3168 case 1011: /* scroll to bottom on key press */
3186 if (state) 3169 if (state)
3187 R->Options |= Opt_scrollTtyKeypress; 3170 Options |= Opt_scrollTtyKeypress;
3188 else 3171 else
3189 R->Options &= ~Opt_scrollTtyKeypress; 3172 Options &= ~Opt_scrollTtyKeypress;
3190 break; 3173 break;
3191 case 1047: /* secondary screen w/ clearing */ 3174 case 1047: /* secondary screen w/ clearing */
3175 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3192 if (R->current_screen != PRIMARY) 3176 if (current_screen != PRIMARY)
3193 R->scr_erase_screen (2); 3177 scr_erase_screen (2);
3194 rxvt_scr_change_screen(aR_ state); 3178 scr_change_screen (state);
3195 /* FALLTHROUGH */ 3179 /* FALLTHROUGH */
3196 default: 3180 default:
3197 break; 3181 break;
3198 } 3182 }
3199 } 3183 }
3200} 3184}
3201/*}}} */ 3185/*}}} */
3202 3186
3203/*{{{ process sgr sequences */ 3187/*{{{ process sgr sequences */
3204/* INTPROTO */
3205void 3188void
3206rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3189rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3207{ 3190{
3208 unsigned int i; 3191 unsigned int i;
3209 short rendset; 3192 short rendset;
3210 int rendstyle; 3193 int rendstyle;
3211 3194
3212 if (nargs == 0) { 3195 if (nargs == 0) {
3213 rxvt_scr_rendition(aR_ 0, ~RS_None); 3196 scr_rendition (0, ~RS_None);
3214 return; 3197 return;
3215 } 3198 }
3216 for (i = 0; i < nargs; i++) { 3199 for (i = 0; i < nargs; i++) {
3217 rendset = -1; 3200 rendset = -1;
3218 switch (arg[i]) { 3201 switch (arg[i]) {
… …
3243 case 27: 3226 case 27:
3244 rendset = 0, rendstyle = RS_RVid; 3227 rendset = 0, rendstyle = RS_RVid;
3245 break; 3228 break;
3246 } 3229 }
3247 if (rendset != -1) { 3230 if (rendset != -1) {
3248 rxvt_scr_rendition(aR_ rendset, rendstyle); 3231 scr_rendition (rendset, rendstyle);
3249 continue; /* for(;i;) */ 3232 continue; /* for(;i;) */
3250 } 3233 }
3251 3234
3252 switch (arg[i]) { 3235 switch (arg[i]) {
3253 case 30: 3236 case 30:
… …
3256 case 33: 3239 case 33:
3257 case 34: 3240 case 34:
3258 case 35: 3241 case 35:
3259 case 36: 3242 case 36:
3260 case 37: 3243 case 37:
3261 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3244 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)),
3262 Color_fg); 3245 Color_fg);
3263 break; 3246 break;
3264#ifdef TTY_256COLOR 3247#ifdef TTY_256COLOR
3265 case 38: 3248 case 38:
3266 if (nargs > i + 2 && arg[i + 1] == 5) { 3249 if (nargs > i + 2 && arg[i + 1] == 5) {
3267 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3250 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3268 Color_fg); 3251 Color_fg);
3269 i += 2; 3252 i += 2;
3270 } 3253 }
3271 break; 3254 break;
3272#endif 3255#endif
3273 case 39: /* default fg */ 3256 case 39: /* default fg */
3274 rxvt_scr_color(aR_ Color_fg, Color_fg); 3257 scr_color (Color_fg, Color_fg);
3275 break; 3258 break;
3276 3259
3277 case 40: 3260 case 40:
3278 case 41: /* set bg color */ 3261 case 41: /* set bg color */
3279 case 42: 3262 case 42:
3280 case 43: 3263 case 43:
3281 case 44: 3264 case 44:
3282 case 45: 3265 case 45:
3283 case 46: 3266 case 46:
3284 case 47: 3267 case 47:
3285 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3268 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)),
3286 Color_bg); 3269 Color_bg);
3287 break; 3270 break;
3288#ifdef TTY_256COLOR 3271#ifdef TTY_256COLOR
3289 case 48: 3272 case 48:
3290 if (nargs > i + 2 && arg[i + 1] == 5) { 3273 if (nargs > i + 2 && arg[i + 1] == 5) {
3291 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3274 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3292 Color_bg); 3275 Color_bg);
3293 i += 2; 3276 i += 2;
3294 } 3277 }
3295 break; 3278 break;
3296#endif 3279#endif
3297 case 49: /* default bg */ 3280 case 49: /* default bg */
3298 rxvt_scr_color(aR_ Color_bg, Color_bg); 3281 scr_color (Color_bg, Color_bg);
3299 break; 3282 break;
3300 3283
3301#ifndef NO_BRIGHTCOLOR 3284#ifndef NO_BRIGHTCOLOR
3302 case 90: 3285 case 90:
3303 case 91: /* set bright fg color */ 3286 case 91: /* set bright fg color */
… …
3305 case 93: 3288 case 93:
3306 case 94: 3289 case 94:
3307 case 95: 3290 case 95:
3308 case 96: 3291 case 96:
3309 case 97: 3292 case 97:
3310 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3293 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)),
3311 Color_fg); 3294 Color_fg);
3312 break; 3295 break;
3313 case 100: 3296 case 100:
3314 case 101: /* set bright bg color */ 3297 case 101: /* set bright bg color */
3315 case 102: 3298 case 102:
3316 case 103: 3299 case 103:
3317 case 104: 3300 case 104:
3318 case 105: 3301 case 105:
3319 case 106: 3302 case 106:
3320 case 107: 3303 case 107:
3321 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3304 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)),
3322 Color_bg); 3305 Color_bg);
3323 break; 3306 break;
3324#endif 3307#endif
3325 } 3308 }
3326 } 3309 }
3327} 3310}
3328/*}}} */ 3311/*}}} */
3329 3312
3330/*{{{ process Rob Nation's own graphics mode sequences */ 3313/*{{{ process Rob Nation's own graphics mode sequences */
3331/* INTPROTO */
3332void 3314void
3333rxvt_process_graphics(pR) 3315rxvt_term::process_graphics ()
3334{ 3316{
3335 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3317 unsigned char ch, cmd = cmd_getc ();
3336 3318
3337#ifndef RXVT_GRAPHICS 3319#ifndef RXVT_GRAPHICS
3338 if (cmd == 'Q') { /* query graphics */ 3320 if (cmd == 'Q') { /* query graphics */
3339 R->tt_printf("\033G0\n"); /* no graphics */ 3321 tt_printf("\033G0\n"); /* no graphics */
3340 return; 3322 return;
3341 } 3323 }
3342/* swallow other graphics sequences until terminating ':' */ 3324/* swallow other graphics sequences until terminating ':' */
3343 do 3325 do
3344 ch = rxvt_cmd_getc(aR); 3326 ch = cmd_getc ();
3345 while (ch != ':'); 3327 while (ch != ':');
3346#else 3328#else
3347 unsigned int nargs; 3329 unsigned int nargs;
3348 int args[NGRX_PTS]; 3330 int args[NGRX_PTS];
3349 unsigned char *text = NULL; 3331 unsigned char *text = NULL;
3350 3332
3351 if (cmd == 'Q') { /* query graphics */ 3333 if (cmd == 'Q') { /* query graphics */
3352 R->tt_printf("\033G1\n"); /* yes, graphics (color) */ 3334 tt_printf("\033G1\n"); /* yes, graphics (color) */
3353 return; 3335 return;
3354 } 3336 }
3355 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3337 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3356 int neg; 3338 int neg;
3357 3339
3358 ch = rxvt_cmd_getc(aR); 3340 ch = cmd_getc ();
3359 neg = (ch == '-'); 3341 neg = (ch == '-');
3360 if (neg || ch == '+') 3342 if (neg || ch == '+')
3361 ch = rxvt_cmd_getc(aR); 3343 ch = cmd_getc ();
3362 3344
3363 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 3345 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3364 args[nargs] = args[nargs] * 10 + (ch - '0'); 3346 args[nargs] = args[nargs] * 10 + (ch - '0');
3365 if (neg) 3347 if (neg)
3366 args[nargs] = -args[nargs]; 3348 args[nargs] = -args[nargs];
3367 3349
3368 nargs++; 3350 nargs++;
… …
3376 3358
3377 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3359 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3378 3360
3379 if (text != NULL) { 3361 if (text != NULL) {
3380 for (i = 0; i < len; i++) 3362 for (i = 0; i < len; i++)
3381 text[i] = rxvt_cmd_getc(aR); 3363 text[i] = cmd_getc ();
3382 text[len] = '\0'; 3364 text[len] = '\0';
3383 } 3365 }
3384 } 3366 }
3385 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text); 3367 Gr_do_graphics (cmd, nargs, args, text);
3386#endif 3368#endif
3387} 3369}
3388/*}}} */ 3370/*}}} */
3389 3371
3390/* ------------------------------------------------------------------------- */ 3372/* ------------------------------------------------------------------------- */
… …
3416 3398
3417 if (len) 3399 if (len)
3418 { 3400 {
3419 if (v_buflen == 0) 3401 if (v_buflen == 0)
3420 { 3402 {
3421 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3403 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3404
3422 if (written == len) 3405 if ((unsigned int)written == len)
3423 return; 3406 return;
3424 3407
3425 data += written; 3408 data += written;
3426 len -= written; 3409 len -= written;
3427 } 3410 }

Diff Legend

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