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.31 by pcg, Thu Jan 29 23:26:01 2004 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.31 2004/01/29 23:26:01 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}
… …
745#endif 737#endif
746 738
747#ifdef USE_XIM 739#ifdef USE_XIM
748 if (!XFilterEvent (&xev, xev.xany.window)) 740 if (!XFilterEvent (&xev, xev.xany.window))
749#endif 741#endif
750 rxvt_process_x_event (this, &xev); 742 process_x_event (&xev);
751 } 743 }
752 while (XPending (Xdisplay)); 744 while (XPending (Xdisplay));
753} 745}
754 746
755#ifdef CURSOR_BLINK 747#ifdef CURSOR_BLINK
… …
881 break; 873 break;
882 } 874 }
883 } 875 }
884 } 876 }
885 877
886 rxvt_scr_add_lines (this, buf, nlines, str - buf); 878 scr_add_lines (buf, nlines, str - buf);
887 879
888 /* 880 /*
889 * 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
890 * 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.
891 * the number of pages between refreshes is refresh_limit, which 883 * the number of pages between refreshes is refresh_limit, which
… …
906 else 898 else
907 { 899 {
908 switch (ch) 900 switch (ch)
909 { 901 {
910 default: 902 default:
911 rxvt_process_nonprinting (this, ch); 903 process_nonprinting (ch);
912 break; 904 break;
913 case C0_ESC: /* escape char */ 905 case C0_ESC: /* escape char */
914 rxvt_process_escape_seq (this); 906 process_escape_seq ();
915 break; 907 break;
916 /*case 0x9b: */ /* CSI */ 908 /*case 0x9b: */ /* CSI */
917 /* rxvt_process_csi_seq (this); */ 909 /* process_csi_seq (); */
918 } 910 }
919 911
920 ch = NOCHAR; 912 ch = NOCHAR;
921 } 913 }
922 } 914 }
… …
933 { 925 {
934 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
935 return *cmdbuf_ptr++; 927 return *cmdbuf_ptr++;
936 928
937 wchar_t wc; 929 wchar_t wc;
938 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);
939 931
940 if (len == (size_t)-2) 932 if (len == (size_t)-2)
941 return NOCHAR; 933 return NOCHAR;
942 934
943 if (len == (size_t)-1) 935 if (len == (size_t)-1)
… …
954/* rxvt_cmd_getc() - Return next input character */ 946/* rxvt_cmd_getc() - Return next input character */
955/* 947/*
956 * Return the next input character after first passing any keyboard input 948 * Return the next input character after first passing any keyboard input
957 * to the command. 949 * to the command.
958 */ 950 */
959/* INTPROTO */
960uint32_t 951uint32_t
961rxvt_cmd_getc(pR) 952rxvt_term::cmd_getc ()
962{ 953{
963 for (;;) 954 for (;;)
964 { 955 {
965 uint32_t c = R->next_char (); 956 uint32_t c = next_char ();
966 if (c != NOCHAR) 957 if (c != NOCHAR)
967 return c; 958 return c;
968 959
969 // incomplete sequences should occur rarely, still, a better solution 960 // incomplete sequences should occur rarely, still, a better solution
970 // would be preferred. either setjmp/longjmp or better design. 961 // would be preferred. either setjmp/longjmp or better design.
971 fcntl (R->cmd_fd, F_SETFL, 0); 962 fcntl (cmd_fd, F_SETFL, 0);
972 R->pty_fill (); 963 pty_fill ();
973 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 964 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
974 } 965 }
975 966
976#if 0 967#if 0
977#define TIMEOUT_USEC 5000 968#define TIMEOUT_USEC 5000
978 fd_set readfds; 969 fd_set readfds;
… …
984#endif 975#endif
985 976
986 for (;;) { 977 for (;;) {
987 /* loop until we can return something */ 978 /* loop until we can return something */
988 979
989 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 980 if (v_bufstr < v_bufptr) /* output any pending chars */
990 R->tt_write(NULL, 0); 981 tt_write(NULL, 0);
991 982
992#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
993 if (R->mouse_slip_wheel_speed) { 984 if (mouse_slip_wheel_speed) {
994 quick_timeout = 1; 985 quick_timeout = 1;
995 if (!R->mouse_slip_wheel_delay-- 986 if (!mouse_slip_wheel_delay--
996 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN, 987 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
997 abs(R->mouse_slip_wheel_speed))) { 988 abs(mouse_slip_wheel_speed))) {
998 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 989 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
999 R->refresh_type |= SMOOTH_REFRESH; 990 refresh_type |= SMOOTH_REFRESH;
1000 R->want_refresh = 1; 991 want_refresh = 1;
1001 } 992 }
1002 } 993 }
1003#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */ 994#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
1004#ifdef SELECTION_SCROLLING 995#ifdef SELECTION_SCROLLING
1005 if (R->pending_scroll_selection) { 996 if (pending_scroll_selection) {
1006 quick_timeout = 1; 997 quick_timeout = 1;
1007 if (!R->scroll_selection_delay-- 998 if (!scroll_selection_delay--
1008 && rxvt_scr_page(aR_ R->scroll_selection_dir, 999 && scr_page (scroll_selection_dir,
1009 R->scroll_selection_lines)) { 1000 scroll_selection_lines)) {
1010 R->selection_extend (R->selection_save_x, 1001 selection_extend (selection_save_x,
1011 R->selection_save_y, R->selection_save_state); 1002 selection_save_y, selection_save_state);
1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1003 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1013 R->refresh_type |= SMOOTH_REFRESH; 1004 refresh_type |= SMOOTH_REFRESH;
1014 R->want_refresh = 1; 1005 want_refresh = 1;
1015 } 1006 }
1016 } 1007 }
1017#endif 1008#endif
1018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1019 if (scrollbar_isUp() || scrollbar_isDn()) { 1010 if (scrollbar_isUp() || scrollbar_isDn()) {
1020 quick_timeout = 1; 1011 quick_timeout = 1;
1021 if (!R->scroll_arrow_delay-- 1012 if (!scroll_arrow_delay--
1022 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) { 1013 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1023 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY; 1014 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1024 R->refresh_type |= SMOOTH_REFRESH; 1015 refresh_type |= SMOOTH_REFRESH;
1025 R->want_refresh = 1; 1016 want_refresh = 1;
1026 } 1017 }
1027 } 1018 }
1028#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1029 1020
1030#ifdef TRANSPARENT 1021#ifdef TRANSPARENT
1031 quick_timeout |= R->want_full_refresh; 1022 quick_timeout |= want_full_refresh;
1032#endif 1023#endif
1033#endif 1024#endif
1034} 1025}
1035 1026
1036#ifdef POINTER_BLANK 1027#ifdef POINTER_BLANK
… …
1066 1057
1067 pointer_blank (); 1058 pointer_blank ();
1068} 1059}
1069#endif 1060#endif
1070 1061
1071/* INTPROTO */
1072void 1062void
1073rxvt_mouse_report(pR_ const XButtonEvent *ev) 1063rxvt_term::mouse_report (const XButtonEvent *ev)
1074{ 1064{
1075 int button_number, key_state = 0; 1065 int button_number, key_state = 0;
1076 int x, y; 1066 int x, y;
1077 1067
1078 x = ev->x; 1068 x = ev->x;
1079 y = ev->y; 1069 y = ev->y;
1080 R->pixel_position (&x, &y); 1070 pixel_position (&x, &y);
1081 1071
1082 if (R->MEvent.button == AnyButton) { 1072 if (MEvent.button == AnyButton) {
1083 button_number = 3; 1073 button_number = 3;
1084 } else { 1074 } else {
1085 button_number = R->MEvent.button - Button1; 1075 button_number = MEvent.button - Button1;
1086 /* add 0x3D for wheel events, like xterm does */ 1076 /* add 0x3D for wheel events, like xterm does */
1087 if (button_number >= 3) 1077 if (button_number >= 3)
1088 button_number += (64 - 3); 1078 button_number += (64 - 3);
1089 } 1079 }
1090 1080
1091 if (R->PrivateModes & PrivMode_MouseX10) { 1081 if (PrivateModes & PrivMode_MouseX10) {
1092 /* 1082 /*
1093 * do not report ButtonRelease 1083 * do not report ButtonRelease
1094 * no state info allowed 1084 * no state info allowed
1095 */ 1085 */
1096 key_state = 0; 1086 key_state = 0;
… …
1102 * 8 = Meta 1092 * 8 = Meta
1103 * 16 = Control 1093 * 16 = Control
1104 * plus will add in our own Double-Click reporting 1094 * plus will add in our own Double-Click reporting
1105 * 32 = Double Click 1095 * 32 = Double Click
1106 */ 1096 */
1107 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1097 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1108 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1098 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1109 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1099 + ((MEvent.state & ControlMask) ? 16 : 0);
1110#ifdef MOUSE_REPORT_DOUBLECLICK 1100#ifdef MOUSE_REPORT_DOUBLECLICK
1111 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1101 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1112#endif 1102#endif
1113 } 1103 }
1114 1104
1115#ifdef DEBUG_MOUSEREPORT 1105#ifdef DEBUG_MOUSEREPORT
1116 fprintf(stderr, "Mouse ["); 1106 fprintf(stderr, "Mouse [");
… …
1125 fprintf(stderr, "]: <%d>, %d/%d\n", 1115 fprintf(stderr, "]: <%d>, %d/%d\n",
1126 button_number, 1116 button_number,
1127 x + 1, 1117 x + 1,
1128 y + 1); 1118 y + 1);
1129#else 1119#else
1130 R->tt_printf("\033[M%c%c%c", 1120 tt_printf("\033[M%c%c%c",
1131 (32 + button_number + key_state), 1121 (32 + button_number + key_state),
1132 (32 + x + 1), 1122 (32 + x + 1),
1133 (32 + y + 1)); 1123 (32 + y + 1));
1134#endif 1124#endif
1135} 1125}
1136 1126
1137#ifdef USING_W11LIB 1127#ifdef USING_W11LIB
1138/* EXTPROTO */
1139void 1128void
1140rxvt_W11_process_x_event(XEvent *ev) 1129rxvt_W11_process_x_event(XEvent *ev)
1141{ 1130{
1142 rxvt_t *r = rxvt_get_r(); 1131 rxvt_t *r = rxvt_get_r();
1143 1132
1144 rxvt_process_x_event(aR_ ev); 1133 process_x_event (ev);
1145} 1134}
1146#endif 1135#endif
1147 1136
1148/*{{{ process an X event */ 1137/*{{{ process an X event */
1149/* INTPROTO */
1150void 1138void
1151rxvt_process_x_event(pR_ XEvent *ev) 1139rxvt_term::process_x_event (XEvent *ev)
1152{ 1140{
1153 int i, want_timeout;
1154 Window unused_root, unused_child; 1141 Window unused_root, unused_child;
1155 int unused_root_x, unused_root_y; 1142 int unused_root_x, unused_root_y;
1156 unsigned int unused_mask; 1143 unsigned int unused_mask;
1157 1144
1158#ifdef DEBUG_X 1145#ifdef DEBUG_X
… …
1199#ifdef DEBUG_X 1186#ifdef DEBUG_X
1200 struct timeval tp; 1187 struct timeval tp;
1201 struct tm *ltt; 1188 struct tm *ltt;
1202 (void)gettimeofday(&tp, NULL); 1189 (void)gettimeofday(&tp, NULL);
1203 ltt = localtime(&(tp.tv_sec)); 1190 ltt = localtime(&(tp.tv_sec));
1204 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));
1205#endif 1192#endif
1206 1193
1207 switch (ev->type) { 1194 switch (ev->type) {
1208 case KeyPress: 1195 case KeyPress:
1209 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1196 lookup_key ((XKeyEvent *)ev);
1210 break; 1197 break;
1211 1198
1212#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1199#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1213 case KeyRelease: 1200 case KeyRelease:
1214 { 1201 {
1215 if (!(ev->xkey.state & ControlMask)) 1202 if (!(ev->xkey.state & ControlMask))
1216 R->mouse_slip_wheel_speed = 0; 1203 mouse_slip_wheel_speed = 0;
1217 else { 1204 else {
1218 KeySym ks; 1205 KeySym ks;
1219 1206
1220 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1207 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1221 if (ks == XK_Control_L || ks == XK_Control_R) 1208 if (ks == XK_Control_L || ks == XK_Control_R)
1222 R->mouse_slip_wheel_speed = 0; 1209 mouse_slip_wheel_speed = 0;
1223 } 1210 }
1224 break; 1211 break;
1225 } 1212 }
1226#endif 1213#endif
1227 1214
1228 case ButtonPress: 1215 case ButtonPress:
1229 rxvt_button_press(aR_ (XButtonEvent *)ev); 1216 button_press ((XButtonEvent *)ev);
1230 break; 1217 break;
1231 1218
1232 case ButtonRelease: 1219 case ButtonRelease:
1233 rxvt_button_release(aR_ (XButtonEvent *)ev); 1220 button_release ((XButtonEvent *)ev);
1234 break; 1221 break;
1235 1222
1236 case ClientMessage: 1223 case ClientMessage:
1237 if (ev->xclient.format == 32 1224 if (ev->xclient.format == 32
1238 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1225 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1239 R->destroy (); 1226 destroy ();
1240#ifdef OFFIX_DND 1227#ifdef OFFIX_DND
1241 /* OffiX Dnd (drag 'n' drop) protocol */ 1228 /* OffiX Dnd (drag 'n' drop) protocol */
1242 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1229 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL]
1243 && (ev->xclient.data.l[0] == DndFile 1230 && (ev->xclient.data.l[0] == DndFile
1244 || ev->xclient.data.l[0] == DndDir 1231 || ev->xclient.data.l[0] == DndDir
1245 || ev->xclient.data.l[0] == DndLink)) { 1232 || ev->xclient.data.l[0] == DndLink)) {
1246 /* Get Dnd data */ 1233 /* Get Dnd data */
1247 Atom ActualType; 1234 Atom ActualType;
1248 int ActualFormat; 1235 int ActualFormat;
1249 unsigned char *data; 1236 unsigned char *data;
1250 unsigned long Size, RemainingBytes; 1237 unsigned long Size, RemainingBytes;
1251 1238
1252 XGetWindowProperty(R->Xdisplay, Xroot, 1239 XGetWindowProperty(Xdisplay, Xroot,
1253 R->xa[XA_DNDSELECTION], 1240 xa[XA_DNDSELECTION],
1254 0L, 1000000L, 1241 0L, 1000000L,
1255 False, AnyPropertyType, 1242 False, AnyPropertyType,
1256 &ActualType, &ActualFormat, 1243 &ActualType, &ActualFormat,
1257 &Size, &RemainingBytes, 1244 &Size, &RemainingBytes,
1258 &data); 1245 &data);
1259 XChangeProperty(R->Xdisplay, Xroot, 1246 XChangeProperty(Xdisplay, Xroot,
1260 XA_CUT_BUFFER0, XA_STRING, 1247 XA_CUT_BUFFER0, XA_STRING,
1261 8, PropModeReplace, 1248 8, PropModeReplace,
1262 data, STRLEN(data)); 1249 data, STRLEN(data));
1263 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1250 selection_paste (Xroot, XA_CUT_BUFFER0, True);
1264 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1251 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime);
1265 } 1252 }
1266#endif /* OFFIX_DND */ 1253#endif /* OFFIX_DND */
1267 break; 1254 break;
1268 1255
1269 case MappingNotify: 1256 case MappingNotify:
… …
1282 */ 1269 */
1283 case VisibilityNotify: 1270 case VisibilityNotify:
1284 switch (ev->xvisibility.state) 1271 switch (ev->xvisibility.state)
1285 { 1272 {
1286 case VisibilityUnobscured: 1273 case VisibilityUnobscured:
1287 R->refresh_type = FAST_REFRESH; 1274 refresh_type = FAST_REFRESH;
1288 break; 1275 break;
1289 case VisibilityPartiallyObscured: 1276 case VisibilityPartiallyObscured:
1290 R->refresh_type = SLOW_REFRESH; 1277 refresh_type = SLOW_REFRESH;
1291 break; 1278 break;
1292 default: 1279 default:
1293 R->refresh_type = NO_REFRESH; 1280 refresh_type = NO_REFRESH;
1294 break; 1281 break;
1295 } 1282 }
1296 break; 1283 break;
1297 1284
1298 case FocusIn: 1285 case FocusIn:
1299 if (!R->TermWin.focus) { 1286 if (!TermWin.focus) {
1300 R->TermWin.focus = 1; 1287 TermWin.focus = 1;
1301 R->want_refresh = 1; 1288 want_refresh = 1;
1302#ifdef USE_XIM 1289#ifdef USE_XIM
1303 if (R->Input_Context != NULL) 1290 if (Input_Context != NULL)
1304 XSetICFocus(R->Input_Context); 1291 XSetICFocus(Input_Context);
1305#endif 1292#endif
1306#ifdef CURSOR_BLINK 1293#ifdef CURSOR_BLINK
1307 if (R->Options & Opt_cursorBlink) 1294 if (Options & Opt_cursorBlink)
1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1295 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1309#endif 1296#endif
1310 } 1297 }
1311 break; 1298 break;
1312 1299
1313 case FocusOut: 1300 case FocusOut:
1314 if (R->TermWin.focus) { 1301 if (TermWin.focus) {
1315 R->TermWin.focus = 0; 1302 TermWin.focus = 0;
1316 R->want_refresh = 1; 1303 want_refresh = 1;
1317#ifdef USE_XIM 1304#ifdef USE_XIM
1318 if (R->Input_Context != NULL) 1305 if (Input_Context != NULL)
1319 XUnsetICFocus(R->Input_Context); 1306 XUnsetICFocus(Input_Context);
1320#endif 1307#endif
1321#ifdef CURSOR_BLINK 1308#ifdef CURSOR_BLINK
1322 if (R->Options & Opt_cursorBlink) 1309 if (Options & Opt_cursorBlink)
1323 R->cursor_blink_ev.stop (); 1310 cursor_blink_ev.stop ();
1324 R->hidden_cursor = 0; 1311 hidden_cursor = 0;
1325#endif 1312#endif
1326 } 1313 }
1327 break; 1314 break;
1328 1315
1329 case ConfigureNotify: 1316 case ConfigureNotify:
1330 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1317 if (ev->xconfigure.window == TermWin.parent[0]) {
1331 int height, width; 1318 int height, width;
1332 1319
1333 do { /* Wrap lots of configures into one */ 1320 do { /* Wrap lots of configures into one */
1334 width = ev->xconfigure.width; 1321 width = ev->xconfigure.width;
1335 height = ev->xconfigure.height; 1322 height = ev->xconfigure.height;
1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1323 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1324 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window,
1338 ConfigureNotify, ev)); 1325 ConfigureNotify, ev));
1339 if (R->szHint.width != width || R->szHint.height != height) { 1326 if (szHint.width != width || szHint.height != height) {
1340 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));
1341 R->resize_all_windows (width, height, 1); 1328 resize_all_windows (width, height, 1);
1342 } 1329 }
1343#ifdef DEBUG_SIZE 1330#ifdef DEBUG_SIZE
1344 else { 1331 else {
1345 D_SIZE((stderr, "Size: Not resizing")); 1332 D_SIZE((stderr, "Size: Not resizing"));
1346 } 1333 }
1347#endif 1334#endif
1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1349 if (R->Options & Opt_transparent) { 1336 if (Options & Opt_transparent) {
1350 rxvt_check_our_parents(aR); 1337 check_our_parents ();
1351 if (R->am_transparent) 1338 if (am_transparent)
1352 R->want_full_refresh = 1; 1339 want_full_refresh = 1;
1353 } 1340 }
1354#endif 1341#endif
1355 } 1342 }
1356 break; 1343 break;
1357 1344
1358 case SelectionClear: 1345 case SelectionClear:
1359 rxvt_selection_clear(aR); 1346 selection_clear ();
1360 break; 1347 break;
1361 1348
1362 case SelectionNotify: 1349 case SelectionNotify:
1363 if (R->selection_wait == Sel_normal) 1350 if (selection_wait == Sel_normal)
1364 rxvt_selection_paste(aR_ ev->xselection.requestor, 1351 selection_paste (ev->xselection.requestor,
1365 ev->xselection.property, True); 1352 ev->xselection.property, True);
1366 break; 1353 break;
1367 1354
1368 case SelectionRequest: 1355 case SelectionRequest:
1369 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1356 selection_send (&(ev->xselectionrequest));
1370 break; 1357 break;
1371 1358
1372 case UnmapNotify: 1359 case UnmapNotify:
1373 R->TermWin.mapped = 0; 1360 TermWin.mapped = 0;
1374#ifdef TEXT_BLINK 1361#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop (); 1362 text_blink_ev.stop ();
1376#endif 1363#endif
1377 break; 1364 break;
1378 1365
1379 case MapNotify: 1366 case MapNotify:
1380 R->TermWin.mapped = 1; 1367 TermWin.mapped = 1;
1381#ifdef TEXT_BLINK 1368#ifdef TEXT_BLINK
1382 R->text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1369 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1383#endif 1370#endif
1384 break; 1371 break;
1385 1372
1386 case PropertyNotify: 1373 case PropertyNotify:
1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1374 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) {
1388 if (ev->xproperty.state == PropertyNewValue) 1375 if (ev->xproperty.state == PropertyNewValue)
1389 rxvt_selection_property(aR_ ev->xproperty.window, 1376 selection_property (ev->xproperty.window,
1390 ev->xproperty.atom); 1377 ev->xproperty.atom);
1391 break; 1378 break;
1392 } 1379 }
1393#ifdef TRANSPARENT 1380#ifdef TRANSPARENT
1394 /* 1381 /*
1395 * 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,
1396 * 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.
1397 */ 1384 */
1398 if (R->xa[XA_XROOTPMAPID] == 0) 1385 if (xa[XA_XROOTPMAPID] == 0)
1399 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay, 1386 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1400 "_XROOTPMAP_ID", False); 1387 "_XROOTPMAP_ID", False);
1401 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID]) 1388 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1402 break; 1389 break;
1403 /* FALLTHROUGH */ 1390 /* FALLTHROUGH */
1404 case ReparentNotify: 1391 case ReparentNotify:
1405 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1392 if ((Options & Opt_transparent) && check_our_parents ()) {
1406 if (R->am_transparent) 1393 if (am_transparent)
1407 R->want_full_refresh = 1; 1394 want_full_refresh = 1;
1408 } 1395 }
1409#endif /* TRANSPARENT */ 1396#endif /* TRANSPARENT */
1410 break; 1397 break;
1411 1398
1412 case GraphicsExpose: 1399 case GraphicsExpose:
1413 case Expose: 1400 case Expose:
1414 if (ev->xany.window == R->TermWin.vt) { 1401 if (ev->xany.window == TermWin.vt) {
1415#ifdef NO_SLOW_LINK_SUPPORT 1402#ifdef NO_SLOW_LINK_SUPPORT
1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1403 scr_expose (ev->xexpose.x, ev->xexpose.y,
1417 ev->xexpose.width, ev->xexpose.height, False); 1404 ev->xexpose.width, ev->xexpose.height, False);
1418#else 1405#else
1419 // don't understand this, so commented it out 1406 // don't understand this, so commented it out
1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1407 scr_expose (ev->xexpose.x, ev->xexpose.y,
1421 ev->xexpose.width, ev->xexpose.height, False); 1408 ev->xexpose.width, ev->xexpose.height, False);
1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1409 //scr_expose (ev->xexpose.x, 0,
1423 // ev->xexpose.width, R->TermWin.height, False); 1410 // ev->xexpose.width, TermWin.height, False);
1424#endif 1411#endif
1425 R->want_refresh = 1; 1412 want_refresh = 1;
1426 } else { 1413 } else {
1427 XEvent unused_xevent; 1414 XEvent unused_xevent;
1428 1415
1429 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1416 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window,
1430 Expose, 1417 Expose,
1431 &unused_xevent)) ; 1418 &unused_xevent)) ;
1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1419 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window,
1433 GraphicsExpose, 1420 GraphicsExpose,
1434 &unused_xevent)) ; 1421 &unused_xevent)) ;
1435 if (isScrollbarWindow(ev->xany.window)) { 1422 if (isScrollbarWindow(ev->xany.window)) {
1436 R->scrollBar.setIdle(); 1423 scrollBar.setIdle();
1437 rxvt_scrollbar_show(aR_ 0); 1424 scrollbar_show (0);
1438 } 1425 }
1439#ifdef MENUBAR 1426#ifdef MENUBAR
1440 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1427 if (menubar_visible () && isMenuBarWindow(ev->xany.window))
1441 rxvt_menubar_expose(aR); 1428 menubar_expose ();
1442#endif 1429#endif
1443#ifdef RXVT_GRAPHICS 1430#ifdef RXVT_GRAPHICS
1444 rxvt_Gr_expose(aR_ ev->xany.window); 1431 Gr_expose (ev->xany.window);
1445#endif 1432#endif
1446 } 1433 }
1447 break; 1434 break;
1448 1435
1449 case MotionNotify: 1436 case MotionNotify:
1450#ifdef POINTER_BLANK 1437#ifdef POINTER_BLANK
1451 if (R->hidden_pointer) 1438 if (hidden_pointer)
1452 R->pointer_unblank (); 1439 pointer_unblank ();
1453#endif 1440#endif
1454#if MENUBAR 1441#if MENUBAR
1455 if (isMenuBarWindow(ev->xany.window)) { 1442 if (isMenuBarWindow(ev->xany.window)) {
1456 rxvt_menubar_control(aR_ &(ev->xbutton)); 1443 menubar_control (&(ev->xbutton));
1457 break; 1444 break;
1458 } 1445 }
1459#endif 1446#endif
1460 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1447 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate))
1461 break; 1448 break;
1462 1449
1463 if (ev->xany.window == R->TermWin.vt) { 1450 if (ev->xany.window == TermWin.vt) {
1464 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1451 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) {
1465 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1452 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt,
1466 MotionNotify, ev)) ; 1453 MotionNotify, ev)) ;
1467 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1454 XQueryPointer(Xdisplay, TermWin.vt,
1468 &unused_root, &unused_child, 1455 &unused_root, &unused_child,
1469 &unused_root_x, &unused_root_y, 1456 &unused_root_x, &unused_root_y,
1470 &(ev->xbutton.x), &(ev->xbutton.y), 1457 &(ev->xbutton.x), &(ev->xbutton.y),
1471 &unused_mask); 1458 &unused_mask);
1472#ifdef MOUSE_THRESHOLD 1459#ifdef MOUSE_THRESHOLD
1473 /* deal with a `jumpy' mouse */ 1460 /* deal with a `jumpy' mouse */
1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1461 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) {
1475#endif 1462#endif
1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1463 selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1477 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1464 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1478#ifdef SELECTION_SCROLLING 1465#ifdef SELECTION_SCROLLING
1479 if (ev->xbutton.y<R->TermWin.int_bwidth || 1466 if (ev->xbutton.y < TermWin.int_bwidth
1480 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1467 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) {
1481 int dist; 1468 int dist;
1482 1469
1483 R->pending_scroll_selection=1; 1470 pending_scroll_selection=1;
1484 1471
1485 /* don't clobber the current delay if we are 1472 /* don't clobber the current delay if we are
1486 * already in the middle of scrolling. 1473 * already in the middle of scrolling.
1487 */ 1474 */
1488 if (R->scroll_selection_delay<=0) 1475 if (scroll_selection_delay<=0)
1489 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1476 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1490 1477
1491 /* save the event params so we can highlight 1478 /* save the event params so we can highlight
1492 * the selection in the pending-scroll loop 1479 * the selection in the pending-scroll loop
1493 */ 1480 */
1494 R->selection_save_x=ev->xbutton.x; 1481 selection_save_x=ev->xbutton.x;
1495 R->selection_save_y=ev->xbutton.y; 1482 selection_save_y=ev->xbutton.y;
1496 R->selection_save_state= 1483 selection_save_state=
1497 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1484 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1498 1485
1499 /* calc number of lines to scroll */ 1486 /* calc number of lines to scroll */
1500 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1487 if (ev->xbutton.y<TermWin.int_bwidth) {
1501 R->scroll_selection_dir = UP; 1488 scroll_selection_dir = UP;
1502 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1489 dist = TermWin.int_bwidth - ev->xbutton.y;
1503 } 1490 }
1504 else { 1491 else {
1505 R->scroll_selection_dir = DN; 1492 scroll_selection_dir = DN;
1506 dist = ev->xbutton.y - 1493 dist = ev->xbutton.y -
1507 (R->TermWin.int_bwidth + R->TermWin.height); 1494 (TermWin.int_bwidth + TermWin.height);
1508 } 1495 }
1509 R->scroll_selection_lines=(Pixel2Height(dist)/ 1496 scroll_selection_lines=(Pixel2Height(dist)/
1510 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1497 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1511 MIN_IT(R->scroll_selection_lines, 1498 MIN_IT(scroll_selection_lines,
1512 SELECTION_SCROLL_MAX_LINES); 1499 SELECTION_SCROLL_MAX_LINES);
1513 } 1500 }
1514 else { 1501 else {
1515 /* we are within the text window, so we 1502 /* we are within the text window, so we
1516 * shouldn't be scrolling 1503 * shouldn't be scrolling
1517 */ 1504 */
1518 R->pending_scroll_selection = 0; 1505 pending_scroll_selection = 0;
1519 } 1506 }
1520#endif 1507#endif
1521#ifdef MOUSE_THRESHOLD 1508#ifdef MOUSE_THRESHOLD
1522 } 1509 }
1523#endif 1510#endif
1524 } 1511 }
1525 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) { 1512 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1526 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win, 1513 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1527 MotionNotify, ev)) ; 1514 MotionNotify, ev)) ;
1528 XQueryPointer(R->Xdisplay, R->scrollBar.win, 1515 XQueryPointer(Xdisplay, scrollBar.win,
1529 &unused_root, &unused_child, 1516 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1517 &unused_root_x, &unused_root_y,
1531 &(ev->xbutton.x), &(ev->xbutton.y), 1518 &(ev->xbutton.x), &(ev->xbutton.y),
1532 &unused_mask); 1519 &unused_mask);
1533 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1520 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1534 scrollbar_size()); 1521 scrollbar_size());
1535 R->scr_refresh (R->refresh_type); 1522 scr_refresh (refresh_type);
1536 R->refresh_limit = 0; 1523 refresh_limit = 0;
1537 rxvt_scrollbar_show(aR_ 1); 1524 scrollbar_show (1);
1538 } 1525 }
1539 break; 1526 break;
1540 } 1527 }
1541} 1528}
1542 1529
1543/* INTPROTO */
1544void 1530void
1545rxvt_button_press(pR_ XButtonEvent *ev) 1531rxvt_term::button_press (XButtonEvent *ev)
1546{ 1532{
1547 int reportmode = 0, clickintime; 1533 int reportmode = 0, clickintime;
1548 1534
1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1535 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1550 if (!R->bypass_keystate) 1536 if (!bypass_keystate)
1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1537 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1552/* 1538/*
1553 * VT window processing of button press 1539 * VT window processing of button press
1554 */ 1540 */
1555 if (ev->window == R->TermWin.vt) 1541 if (ev->window == TermWin.vt)
1556 { 1542 {
1557#if RXVT_GRAPHICS 1543#if RXVT_GRAPHICS
1558 if (ev->subwindow != None) 1544 if (ev->subwindow != None)
1559 rxvt_Gr_ButtonPress (ev->x, ev->y); 1545 rxvt_Gr_ButtonPress (ev->x, ev->y);
1560 else 1546 else
1561#endif 1547#endif
1562 { 1548 {
1563 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1549 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1564 if (reportmode) 1550 if (reportmode)
1565 { 1551 {
1566 /* mouse report from vt window */ 1552 /* mouse report from vt window */
1567 /* save the xbutton state (for ButtonRelease) */ 1553 /* save the xbutton state (for ButtonRelease) */
1568 R->MEvent.state = ev->state; 1554 MEvent.state = ev->state;
1569#ifdef MOUSE_REPORT_DOUBLECLICK 1555#ifdef MOUSE_REPORT_DOUBLECLICK
1570 if (ev->button == R->MEvent.button && clickintime) 1556 if (ev->button == MEvent.button && clickintime)
1571 { 1557 {
1572 /* same button, within alloted time */ 1558 /* same button, within alloted time */
1573 R->MEvent.clicks++; 1559 MEvent.clicks++;
1574 if (R->MEvent.clicks > 1) 1560 if (MEvent.clicks > 1)
1575 { 1561 {
1576 /* only report double clicks */ 1562 /* only report double clicks */
1577 R->MEvent.clicks = 2; 1563 MEvent.clicks = 2;
1578 rxvt_mouse_report(aR_ ev); 1564 mouse_report (ev);
1579 1565
1580 /* don't report the release */ 1566 /* don't report the release */
1581 R->MEvent.clicks = 0; 1567 MEvent.clicks = 0;
1582 R->MEvent.button = AnyButton; 1568 MEvent.button = AnyButton;
1583 } 1569 }
1584 } 1570 }
1585 else 1571 else
1586 { 1572 {
1587 /* different button, or time expired */ 1573 /* different button, or time expired */
1588 R->MEvent.clicks = 1; 1574 MEvent.clicks = 1;
1589 R->MEvent.button = ev->button; 1575 MEvent.button = ev->button;
1590 rxvt_mouse_report(aR_ ev); 1576 mouse_report (ev);
1591 } 1577 }
1592#else 1578#else
1593 R->MEvent.button = ev->button; 1579 MEvent.button = ev->button;
1594 rxvt_mouse_report(aR_ ev); 1580 mouse_report (ev);
1595#endif /* MOUSE_REPORT_DOUBLECLICK */ 1581#endif /* MOUSE_REPORT_DOUBLECLICK */
1596 } 1582 }
1597 else 1583 else
1598 { 1584 {
1599 if (ev->button != R->MEvent.button) 1585 if (ev->button != MEvent.button)
1600 R->MEvent.clicks = 0; 1586 MEvent.clicks = 0;
1601 switch (ev->button) 1587 switch (ev->button)
1602 { 1588 {
1603 case Button1: 1589 case Button1:
1604 /* allow shift+left click to extend selection */ 1590 /* allow shift+left click to extend selection */
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report)) 1591 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report))
1606 { 1592 {
1607 if (R->MEvent.button == Button1 && clickintime) 1593 if (MEvent.button == Button1 && clickintime)
1608 R->selection_rotate (ev->x, ev->y); 1594 selection_rotate (ev->x, ev->y);
1609 else 1595 else
1610 R->selection_extend (ev->x, ev->y, 1); 1596 selection_extend (ev->x, ev->y, 1);
1611 } 1597 }
1612 else 1598 else
1613 { 1599 {
1614 if (R->MEvent.button == Button1 && clickintime) 1600 if (MEvent.button == Button1 && clickintime)
1615 R->MEvent.clicks++; 1601 MEvent.clicks++;
1616 else 1602 else
1617 R->MEvent.clicks = 1; 1603 MEvent.clicks = 1;
1618 1604
1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y); 1605 selection_click (MEvent.clicks, ev->x, ev->y);
1620 } 1606 }
1621 1607
1622 R->MEvent.button = Button1; 1608 MEvent.button = Button1;
1623 break; 1609 break;
1624 1610
1625 case Button3: 1611 case Button3:
1626 if (R->MEvent.button == Button3 && clickintime) 1612 if (MEvent.button == Button3 && clickintime)
1627 R->selection_rotate (ev->x, ev->y); 1613 selection_rotate (ev->x, ev->y);
1628 else 1614 else
1629 R->selection_extend (ev->x, ev->y, 1); 1615 selection_extend (ev->x, ev->y, 1);
1630 R->MEvent.button = Button3; 1616 MEvent.button = Button3;
1631 break; 1617 break;
1632 } 1618 }
1633 } 1619 }
1634 R->MEvent.time = ev->time; 1620 MEvent.time = ev->time;
1635 return; 1621 return;
1636 } 1622 }
1637 } 1623 }
1638 1624
1639/* 1625/*
1640 * Scrollbar window processing of button press 1626 * Scrollbar window processing of button press
1641 */ 1627 */
1642 if (isScrollbarWindow(ev->window)) 1628 if (isScrollbarWindow(ev->window))
1643 { 1629 {
1644 R->scrollBar.setIdle (); 1630 scrollBar.setIdle ();
1645 /* 1631 /*
1646 * Rxvt-style scrollbar: 1632 * Rxvt-style scrollbar:
1647 * move up if mouse is above slider 1633 * move up if mouse is above slider
1648 * move dn if mouse is below slider 1634 * move dn if mouse is below slider
1649 * 1635 *
… …
1657 /* 1643 /*
1658 * Mouse report disabled scrollbar: 1644 * Mouse report disabled scrollbar:
1659 * arrow buttons - send up/down 1645 * arrow buttons - send up/down
1660 * click on scrollbar - send pageup/down 1646 * click on scrollbar - send pageup/down
1661 */ 1647 */
1662 if ((R->scrollBar.style == R_SB_NEXT 1648 if ((scrollBar.style == R_SB_NEXT
1663 && scrollbarnext_upButton(ev->y)) 1649 && scrollbarnext_upButton(ev->y))
1664 || (R->scrollBar.style == R_SB_RXVT 1650 || (scrollBar.style == R_SB_RXVT
1665 && scrollbarrxvt_upButton(ev->y))) 1651 && scrollbarrxvt_upButton(ev->y)))
1666 R->tt_printf("\033[A"); 1652 tt_printf("\033[A");
1667 else if ((R->scrollBar.style == R_SB_NEXT 1653 else if ((scrollBar.style == R_SB_NEXT
1668 && scrollbarnext_dnButton(ev->y)) 1654 && scrollbarnext_dnButton(ev->y))
1669 || (R->scrollBar.style == R_SB_RXVT 1655 || (scrollBar.style == R_SB_RXVT
1670 && scrollbarrxvt_dnButton(ev->y))) 1656 && scrollbarrxvt_dnButton(ev->y)))
1671 R->tt_printf("\033[B"); 1657 tt_printf("\033[B");
1672 else 1658 else
1673 switch (ev->button) { 1659 switch (ev->button) {
1674 case Button2: 1660 case Button2:
1675 R->tt_printf("\014"); 1661 tt_printf("\014");
1676 break; 1662 break;
1677 case Button1: 1663 case Button1:
1678 R->tt_printf("\033[6~"); 1664 tt_printf("\033[6~");
1679 break; 1665 break;
1680 case Button3: 1666 case Button3:
1681 R->tt_printf("\033[5~"); 1667 tt_printf("\033[5~");
1682 break; 1668 break;
1683 } 1669 }
1684 } 1670 }
1685 else 1671 else
1686#endif /* NO_SCROLLBAR_REPORT */ 1672#endif /* NO_SCROLLBAR_REPORT */
1687 { 1673 {
1688 char upordown = 0; 1674 char upordown = 0;
1689 1675
1690 if (R->scrollBar.style == R_SB_NEXT) { 1676 if (scrollBar.style == R_SB_NEXT) {
1691 if (scrollbarnext_upButton(ev->y)) 1677 if (scrollbarnext_upButton(ev->y))
1692 upordown = -1; /* up */ 1678 upordown = -1; /* up */
1693 else if (scrollbarnext_dnButton(ev->y)) 1679 else if (scrollbarnext_dnButton(ev->y))
1694 upordown = 1; /* down */ 1680 upordown = 1; /* down */
1695 } else if (R->scrollBar.style == R_SB_RXVT) { 1681 } else if (scrollBar.style == R_SB_RXVT) {
1696 if (scrollbarrxvt_upButton(ev->y)) 1682 if (scrollbarrxvt_upButton(ev->y))
1697 upordown = -1; /* up */ 1683 upordown = -1; /* up */
1698 else if (scrollbarrxvt_dnButton(ev->y)) 1684 else if (scrollbarrxvt_dnButton(ev->y))
1699 upordown = 1; /* down */ 1685 upordown = 1; /* down */
1700 } 1686 }
1701 if (upordown) { 1687 if (upordown) {
1702#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1688#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1703 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1689 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1704#endif 1690#endif
1705 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1691 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1706 if (upordown < 0) 1692 if (upordown < 0)
1707 R->scrollBar.setUp (); 1693 scrollBar.setUp ();
1708 else 1694 else
1709 R->scrollBar.setDn (); 1695 scrollBar.setDn ();
1710 } 1696 }
1711 } else 1697 } else
1712 switch (ev->button) { 1698 switch (ev->button) {
1713 case Button2: 1699 case Button2:
1714 switch (R->scrollbar_align) { 1700 switch (scrollbar_align) {
1715 case R_SB_ALIGN_TOP: 1701 case R_SB_ALIGN_TOP:
1716 R->csrO = 0; 1702 csrO = 0;
1717 break; 1703 break;
1718 case R_SB_ALIGN_CENTRE: 1704 case R_SB_ALIGN_CENTRE:
1719 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2; 1705 csrO = (scrollBar.bot - scrollBar.top) / 2;
1720 break; 1706 break;
1721 case R_SB_ALIGN_BOTTOM: 1707 case R_SB_ALIGN_BOTTOM:
1722 R->csrO = R->scrollBar.bot - R->scrollBar.top; 1708 csrO = scrollBar.bot - scrollBar.top;
1723 break; 1709 break;
1724 } 1710 }
1725 if (R->scrollBar.style == R_SB_XTERM 1711 if (scrollBar.style == R_SB_XTERM
1726 || scrollbar_above_slider(ev->y) 1712 || scrollbar_above_slider(ev->y)
1727 || scrollbar_below_slider(ev->y)) 1713 || scrollbar_below_slider(ev->y))
1728 rxvt_scr_move_to(aR_
1729 scrollbar_position(ev->y) - R->csrO, 1714 scr_move_to ( scrollbar_position(ev->y) - csrO,
1730 scrollbar_size()); 1715 scrollbar_size());
1731 R->scrollBar.setMotion (); 1716 scrollBar.setMotion ();
1732 break; 1717 break;
1733 1718
1734 case Button1: 1719 case Button1:
1735 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1720 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1736 R->csrO = ev->y - R->scrollBar.top; 1721 csrO = ev->y - scrollBar.top;
1737 /* FALLTHROUGH */ 1722 /* FALLTHROUGH */
1738 1723
1739 case Button3: 1724 case Button3:
1740 if (R->scrollBar.style != R_SB_XTERM) { 1725 if (scrollBar.style != R_SB_XTERM) {
1741 if (scrollbar_above_slider(ev->y)) 1726 if (scrollbar_above_slider(ev->y))
1742# ifdef RXVT_SCROLL_FULL 1727# ifdef RXVT_SCROLL_FULL
1743 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1); 1728 scr_page (UP, TermWin.nrow - 1);
1744# else 1729# else
1745 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4); 1730 scr_page (UP, TermWin.nrow / 4);
1746# endif 1731# endif
1747 else if (scrollbar_below_slider(ev->y)) 1732 else if (scrollbar_below_slider(ev->y))
1748# ifdef RXVT_SCROLL_FULL 1733# ifdef RXVT_SCROLL_FULL
1749 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1734 scr_page (DN, TermWin.nrow - 1);
1750# else 1735# else
1751 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1736 scr_page (DN, TermWin.nrow / 4);
1752# endif 1737# endif
1753 else 1738 else
1754 R->scrollBar.setMotion (); 1739 scrollBar.setMotion ();
1755 } else { 1740 } else {
1756 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1741 scr_page ((ev->button == Button1 ? DN : UP),
1757 (R->TermWin.nrow 1742 (TermWin.nrow
1758 * scrollbar_position(ev->y) 1743 * scrollbar_position(ev->y)
1759 / scrollbar_size())); 1744 / scrollbar_size()));
1760 } 1745 }
1761 break; 1746 break;
1762 } 1747 }
… …
1766#if MENUBAR 1751#if MENUBAR
1767 /* 1752 /*
1768 * Menubar window processing of button press 1753 * Menubar window processing of button press
1769 */ 1754 */
1770 if (isMenuBarWindow(ev->window)) 1755 if (isMenuBarWindow(ev->window))
1771 rxvt_menubar_control(aR_ ev); 1756 menubar_control (ev);
1772#endif 1757#endif
1773} 1758}
1774 1759
1775/* INTPROTO */
1776void 1760void
1777rxvt_button_release(pR_ XButtonEvent *ev) 1761rxvt_term::button_release (XButtonEvent *ev)
1778{ 1762{
1779 int reportmode = 0; 1763 int reportmode = 0;
1780 1764
1781 R->csrO = 0; /* reset csr Offset */ 1765 csrO = 0; /* reset csr Offset */
1782 if (!R->bypass_keystate) 1766 if (!bypass_keystate)
1783 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1767 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1784 1768
1785 if (scrollbar_isUpDn()) { 1769 if (scrollbar_isUpDn()) {
1786 R->scrollBar.setIdle (); 1770 scrollBar.setIdle ();
1787 rxvt_scrollbar_show(aR_ 0); 1771 scrollbar_show (0);
1788#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1772#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1789 R->refresh_type &= ~SMOOTH_REFRESH; 1773 refresh_type &= ~SMOOTH_REFRESH;
1790#endif 1774#endif
1791 } 1775 }
1792#ifdef SELECTION_SCROLLING 1776#ifdef SELECTION_SCROLLING
1793 R->pending_scroll_selection=0; 1777 pending_scroll_selection=0;
1794#endif 1778#endif
1795 if (ev->window == R->TermWin.vt) 1779 if (ev->window == TermWin.vt)
1796 { 1780 {
1797#ifdef RXVT_GRAPHICS 1781#ifdef RXVT_GRAPHICS
1798 if (ev->subwindow != None) 1782 if (ev->subwindow != None)
1799 rxvt_Gr_ButtonRelease(ev->x, ev->y); 1783 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1800 else 1784 else
… …
1806 /* don't report release of wheel "buttons" */ 1790 /* don't report release of wheel "buttons" */
1807 if (ev->button >= 4) 1791 if (ev->button >= 4)
1808 return; 1792 return;
1809#ifdef MOUSE_REPORT_DOUBLECLICK 1793#ifdef MOUSE_REPORT_DOUBLECLICK
1810 /* only report the release of 'slow' single clicks */ 1794 /* only report the release of 'slow' single clicks */
1811 if (R->MEvent.button != AnyButton 1795 if (MEvent.button != AnyButton
1812 && (ev->button != R->MEvent.button 1796 && (ev->button != MEvent.button
1813 || (ev->time - R->MEvent.time 1797 || (ev->time - MEvent.time
1814 > MULTICLICK_TIME / 2))) 1798 > MULTICLICK_TIME / 2)))
1815 { 1799 {
1816 R->MEvent.clicks = 0; 1800 MEvent.clicks = 0;
1817 R->MEvent.button = AnyButton; 1801 MEvent.button = AnyButton;
1818 rxvt_mouse_report(aR_ ev); 1802 mouse_report (ev);
1819 } 1803 }
1820#else /* MOUSE_REPORT_DOUBLECLICK */ 1804#else /* MOUSE_REPORT_DOUBLECLICK */
1821 R->MEvent.button = AnyButton; 1805 MEvent.button = AnyButton;
1822 rxvt_mouse_report(aR_ ev); 1806 mouse_report (ev);
1823#endif /* MOUSE_REPORT_DOUBLECLICK */ 1807#endif /* MOUSE_REPORT_DOUBLECLICK */
1824 return; 1808 return;
1825 } 1809 }
1826 /* 1810 /*
1827 * dumb hack to compensate for the failure of click-and-drag 1811 * dumb hack to compensate for the failure of click-and-drag
1828 * when overriding mouse reporting 1812 * when overriding mouse reporting
1829 */ 1813 */
1830 if (R->PrivateModes & PrivMode_mouse_report 1814 if (PrivateModes & PrivMode_mouse_report
1831 && R->bypass_keystate 1815 && bypass_keystate
1832 && ev->button == Button1 && R->MEvent.clicks <= 1) 1816 && ev->button == Button1 && MEvent.clicks <= 1)
1833 R->selection_extend (ev->x, ev->y, 0); 1817 selection_extend (ev->x, ev->y, 0);
1834 1818
1835 switch (ev->button) { 1819 switch (ev->button) {
1836 case Button1: 1820 case Button1:
1837 case Button3: 1821 case Button3:
1838 rxvt_selection_make(aR_ ev->time); 1822 selection_make (ev->time);
1839 break; 1823 break;
1840 case Button2: 1824 case Button2:
1841 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1825 selection_request (ev->time, ev->x, ev->y);
1842 break; 1826 break;
1843#ifdef MOUSE_WHEEL 1827#ifdef MOUSE_WHEEL
1844 case Button4: 1828 case Button4:
1845 case Button5: 1829 case Button5:
1846 { 1830 {
… …
1848 page_dirn v; 1832 page_dirn v;
1849 1833
1850 v = (ev->button == Button4) ? UP : DN; 1834 v = (ev->button == Button4) ? UP : DN;
1851 if (ev->state & ShiftMask) 1835 if (ev->state & ShiftMask)
1852 i = 1; 1836 i = 1;
1853 else if ((R->Options & Opt_mouseWheelScrollPage)) 1837 else if ((Options & Opt_mouseWheelScrollPage))
1854 i = R->TermWin.nrow - 1; 1838 i = TermWin.nrow - 1;
1855 else 1839 else
1856 i = 5; 1840 i = 5;
1857# ifdef MOUSE_SLIP_WHEELING 1841# ifdef MOUSE_SLIP_WHEELING
1858 if (ev->state & ControlMask) 1842 if (ev->state & ControlMask)
1859 { 1843 {
1860 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1844 mouse_slip_wheel_speed += (v ? -1 : 1);
1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1845 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1862 } 1846 }
1863# endif 1847# endif
1864# ifdef JUMP_MOUSE_WHEEL 1848# ifdef JUMP_MOUSE_WHEEL
1865 rxvt_scr_page(aR_ v, i); 1849 scr_page (v, i);
1866 R->scr_refresh (SMOOTH_REFRESH); 1850 scr_refresh (SMOOTH_REFRESH);
1867 rxvt_scrollbar_show(aR_ 1); 1851 scrollbar_show (1);
1868# else 1852# else
1869 while (i--) 1853 while (i--)
1870 { 1854 {
1871 rxvt_scr_page(aR_ v, 1); 1855 scr_page (v, 1);
1872 R->scr_refresh (SMOOTH_REFRESH); 1856 scr_refresh (SMOOTH_REFRESH);
1873 rxvt_scrollbar_show(aR_ 1); 1857 scrollbar_show (1);
1874 } 1858 }
1875# endif 1859# endif
1876 } 1860 }
1877 break; 1861 break;
1878#endif 1862#endif
1879 } 1863 }
1880 } 1864 }
1881 } 1865 }
1882#ifdef MENUBAR 1866#ifdef MENUBAR
1883 else if (isMenuBarWindow(ev->window)) 1867 else if (isMenuBarWindow(ev->window))
1884 rxvt_menubar_control(aR_ ev); 1868 menubar_control (ev);
1885#endif 1869#endif
1886} 1870}
1887 1871
1888 1872
1889#ifdef TRANSPARENT 1873#ifdef TRANSPARENT
1890/* 1874/*
1891 * Check our parents are still who we think they are. 1875 * Check our parents are still who we think they are.
1892 * Do transparency updates if required 1876 * Do transparency updates if required
1893 */ 1877 */
1894/* EXTPROTO */
1895int 1878int
1896rxvt_check_our_parents(pR) 1879rxvt_term::check_our_parents ()
1897{ 1880{
1898 int i, pchanged, aformat, have_pixmap, rootdepth; 1881 int i, pchanged, aformat, have_pixmap, rootdepth;
1899 unsigned long nitems, bytes_after; 1882 unsigned long nitems, bytes_after;
1900 Atom atype; 1883 Atom atype;
1901 unsigned char *prop = NULL; 1884 unsigned char *prop = NULL;
… …
1903 Pixmap rootpixmap = None; 1886 Pixmap rootpixmap = None;
1904 XWindowAttributes wattr, wrootattr; 1887 XWindowAttributes wattr, wrootattr;
1905 1888
1906 pchanged = 0; 1889 pchanged = 0;
1907 1890
1908 if (!(R->Options & Opt_transparent)) 1891 if (!(Options & Opt_transparent))
1909 return pchanged; /* Don't try any more */ 1892 return pchanged; /* Don't try any more */
1910 1893
1911 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1894 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr);
1912 rootdepth = wrootattr.depth; 1895 rootdepth = wrootattr.depth;
1913 1896
1914 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1897 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
1915 if (rootdepth != wattr.depth) { 1898 if (rootdepth != wattr.depth) {
1916 if (R->am_transparent) { 1899 if (am_transparent) {
1917 pchanged = 1; 1900 pchanged = 1;
1918 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1901 XSetWindowBackground(Xdisplay, TermWin.vt,
1919 R->PixColors[Color_bg]); 1902 PixColors[Color_bg]);
1920 R->am_transparent = R->am_pixmap_trans = 0; 1903 am_transparent = am_pixmap_trans = 0;
1921 } 1904 }
1922 return pchanged; /* Don't try any more */ 1905 return pchanged; /* Don't try any more */
1923 } 1906 }
1924 1907
1925/* 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. */
1926 XSync(R->Xdisplay, False); 1909 XSync(Xdisplay, False);
1927 1910
1928/* 1911/*
1929 * Make the frame window set by the window manager have 1912 * Make the frame window set by the window manager have
1930 * the root background. Some window managers put multiple nested frame 1913 * the root background. Some window managers put multiple nested frame
1931 * 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.
1932 */ 1915 */
1933 i = (R->xa[XA_XROOTPMAPID] != 0 1916 i = (xa[XA_XROOTPMAPID] != 0
1934 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1917 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID],
1935 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1918 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1936 &nitems, &bytes_after, &prop) == Success)); 1919 &nitems, &bytes_after, &prop) == Success));
1937 if (!i || prop == NULL) 1920 if (!i || prop == NULL)
1938 have_pixmap = 0; 1921 have_pixmap = 0;
1939 else { 1922 else {
… …
1950 Window cr; 1933 Window cr;
1951 XImage *image; 1934 XImage *image;
1952 GC gc; 1935 GC gc;
1953 XGCValues gcvalue; 1936 XGCValues gcvalue;
1954 1937
1955 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1938 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot,
1956 0, 0, &sx, &sy, &cr); 1939 0, 0, &sx, &sy, &cr);
1957 nw = (unsigned int)R->szHint.width; 1940 nw = (unsigned int)szHint.width;
1958 nh = (unsigned int)R->szHint.height; 1941 nh = (unsigned int)szHint.height;
1959 nx = ny = 0; 1942 nx = ny = 0;
1960 if (sx < 0) { 1943 if (sx < 0) {
1961 nw += sx; 1944 nw += sx;
1962 nx = -sx; 1945 nx = -sx;
1963 sx = 0; 1946 sx = 0;
… …
1967 ny = -sy; 1950 ny = -sy;
1968 sy = 0; 1951 sy = 0;
1969 } 1952 }
1970 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1953 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1971 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1954 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1972 R->allowedxerror = -1; 1955 allowedxerror = -1;
1973 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1956 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes,
1974 ZPixmap); 1957 ZPixmap);
1975 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1958 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1976 /* XXX: may need a delay here? */ 1959 /* XXX: may need a delay here? */
1977 R->allowedxerror = 0; 1960 allowedxerror = 0;
1978 if (image == NULL) { 1961 if (image == NULL) {
1979 if (R->am_transparent && R->am_pixmap_trans) { 1962 if (am_transparent && am_pixmap_trans) {
1980 pchanged = 1; 1963 pchanged = 1;
1981 if (R->TermWin.pixmap != None) { 1964 if (TermWin.pixmap != None) {
1982 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1965 XFreePixmap(Xdisplay, TermWin.pixmap);
1983 R->TermWin.pixmap = None; 1966 TermWin.pixmap = None;
1984 } 1967 }
1985 } 1968 }
1986 R->am_pixmap_trans = 0; 1969 am_pixmap_trans = 0;
1987 } else { 1970 } else {
1988 if (R->TermWin.pixmap != None) 1971 if (TermWin.pixmap != None)
1989 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1972 XFreePixmap(Xdisplay, TermWin.pixmap);
1990 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 1973 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt,
1991 (unsigned int)R->szHint.width, 1974 (unsigned int)szHint.width,
1992 (unsigned int)R->szHint.height, 1975 (unsigned int)szHint.height,
1993 (unsigned int)image->depth); 1976 (unsigned int)image->depth);
1994 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue); 1977 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue);
1995 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0, 1978 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0,
1996 nx, ny, (unsigned int)image->width, 1979 nx, ny, (unsigned int)image->width,
1997 (unsigned int)image->height); 1980 (unsigned int)image->height);
1998 XFreeGC(R->Xdisplay, gc); 1981 XFreeGC(Xdisplay, gc);
1999 XDestroyImage(image); 1982 XDestroyImage(image);
2000 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 1983 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt,
2001 R->TermWin.pixmap); 1984 TermWin.pixmap);
2002 if (!R->am_transparent || !R->am_pixmap_trans) 1985 if (!am_transparent || !am_pixmap_trans)
2003 pchanged = 1; 1986 pchanged = 1;
2004 R->am_transparent = R->am_pixmap_trans = 1; 1987 am_transparent = am_pixmap_trans = 1;
2005 } 1988 }
2006 } 1989 }
2007 if (!R->am_pixmap_trans) { 1990 if (!am_pixmap_trans) {
2008 unsigned int n; 1991 unsigned int n;
2009/* 1992/*
2010 * InheritPixmap transparency 1993 * InheritPixmap transparency
2011 */ 1994 */
2012 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 1995 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot));
2013 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 1996 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window));
2014 i++) { 1997 i++) {
2015 oldp = R->TermWin.parent[i]; 1998 oldp = TermWin.parent[i];
2016 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 1999 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root,
2017 &R->TermWin.parent[i], &list, &n); 2000 &TermWin.parent[i], &list, &n);
2018 XFree(list); 2001 XFree(list);
2019 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2002 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2020 if (R->TermWin.parent[i] == Xroot) { 2003 if (TermWin.parent[i] == Xroot) {
2021 if (oldp != None) 2004 if (oldp != None)
2022 pchanged = 1; 2005 pchanged = 1;
2023 break; 2006 break;
2024 } 2007 }
2025 if (oldp != R->TermWin.parent[i]) 2008 if (oldp != TermWin.parent[i])
2026 pchanged = 1; 2009 pchanged = 1;
2027 } 2010 }
2028 n = 0; 2011 n = 0;
2029 if (pchanged) { 2012 if (pchanged) {
2030 for (; n < (unsigned int)i; n++) { 2013 for (; n < (unsigned int)i; n++) {
2031 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2014 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr);
2032 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"));
2033 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2016 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2034 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2017 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1;
2035 break; 2018 break;
2036 } 2019 }
2037 } 2020 }
2038 } 2021 }
2039 if (n > (int)(sizeof(R->TermWin.parent) 2022 if (n > (int)(sizeof(TermWin.parent)
2040 / sizeof(R->TermWin.parent[0]))) { 2023 / sizeof(TermWin.parent[0]))) {
2041 D_X((stderr, "InheritPixmap Turning off")); 2024 D_X((stderr, "InheritPixmap Turning off"));
2042 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2025 XSetWindowBackground(Xdisplay, TermWin.parent[0],
2043 R->PixColors[Color_fg]); 2026 PixColors[Color_fg]);
2044 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2027 XSetWindowBackground(Xdisplay, TermWin.vt,
2045 R->PixColors[Color_bg]); 2028 PixColors[Color_bg]);
2046 R->am_transparent = 0; 2029 am_transparent = 0;
2047 /* XXX: also turn off Opt_transparent? */ 2030 /* XXX: also turn off Opt_transparent? */
2048 } else { 2031 } else {
2049 /* wait (an arbitrary period) for the WM to do its thing 2032 /* wait (an arbitrary period) for the WM to do its thing
2050 * needed for fvwm2.2.2 (and before?) */ 2033 * needed for fvwm2.2.2 (and before?) */
2051# ifdef HAVE_NANOSLEEP 2034# ifdef HAVE_NANOSLEEP
… …
2057# else 2040# else
2058 sleep(1); 2041 sleep(1);
2059# endif 2042# endif
2060 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2043 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2061 for (n = 0; n < (unsigned int)i; n++) 2044 for (n = 0; n < (unsigned int)i; n++)
2062 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2045 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n],
2063 ParentRelative); 2046 ParentRelative);
2064 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2047 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt,
2065 ParentRelative); 2048 ParentRelative);
2066 R->am_transparent = 1; 2049 am_transparent = 1;
2067 } 2050 }
2068 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2051 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++)
2069 R->TermWin.parent[i] = None; 2052 TermWin.parent[i] = None;
2070 } 2053 }
2071 return pchanged; 2054 return pchanged;
2072} 2055}
2073#endif 2056#endif
2074 2057
2075/*}}} */ 2058/*}}} */
2076 2059
2077/*{{{ print pipe */ 2060/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2061/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2062#ifdef PRINTPIPE
2080/* EXTPROTO */ 2063FILE *
2081FILE *
2082rxvt_popen_printer(pR) 2064rxvt_term::popen_printer ()
2083{ 2065{
2084 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2066 FILE *stream = popen(rs[Rs_print_pipe], "w");
2085 2067
2086 if (stream == NULL) 2068 if (stream == NULL)
2087 rxvt_print_error("can't open printer pipe"); 2069 rxvt_print_error("can't open printer pipe");
2088 return stream; 2070 return stream;
2089} 2071}
2090 2072
2091/* EXTPROTO */
2092int 2073int
2093rxvt_pclose_printer (FILE *stream) 2074rxvt_term::pclose_printer (FILE *stream)
2094{ 2075{
2095 fflush (stream); 2076 fflush (stream);
2096/* pclose() reported not to work on SunOS 4.1.3 */ 2077/* pclose() reported not to work on SunOS 4.1.3 */
2097# if defined (__sun__) /* TODO: RESOLVE THIS */ 2078# if defined (__sun__) /* TODO: RESOLVE THIS */
2098/* pclose works provided SIGCHLD handler uses waitpid */ 2079/* pclose works provided SIGCHLD handler uses waitpid */
… …
2103} 2084}
2104 2085
2105/* 2086/*
2106 * simulate attached vt100 printer 2087 * simulate attached vt100 printer
2107 */ 2088 */
2108/* INTPROTO */
2109void 2089void
2110rxvt_process_print_pipe(pR) 2090rxvt_term::process_print_pipe ()
2111{ 2091{
2112 int done; 2092 int done;
2113 FILE *fd; 2093 FILE *fd;
2114 2094
2115 if ((fd = rxvt_popen_printer(aR)) == NULL) 2095 if ((fd = popen_printer ()) == NULL)
2116 return; 2096 return;
2117 2097
2118/* 2098/*
2119 * 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
2120 * is received. 2100 * is received.
… …
2122 for (done = 0; !done;) { 2102 for (done = 0; !done;) {
2123 unsigned char buf[8]; 2103 unsigned char buf[8];
2124 unsigned char ch; 2104 unsigned char ch;
2125 unsigned int i, len; 2105 unsigned int i, len;
2126 2106
2127 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2107 if ((ch = cmd_getc ()) != C0_ESC) {
2128 if (putc(ch, fd) == EOF) 2108 if (putc(ch, fd) == EOF)
2129 break; /* done = 1 */ 2109 break; /* done = 1 */
2130 } else { 2110 } else {
2131 len = 0; 2111 len = 0;
2132 buf[len++] = ch; 2112 buf[len++] = ch;
2133 2113
2134 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2114 if ((buf[len++] = cmd_getc ()) == '[') {
2135 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2115 if ((ch = cmd_getc ()) == '?') {
2136 buf[len++] = '?'; 2116 buf[len++] = '?';
2137 ch = rxvt_cmd_getc(aR); 2117 ch = cmd_getc ();
2138 } 2118 }
2139 if ((buf[len++] = ch) == '4') { 2119 if ((buf[len++] = ch) == '4') {
2140 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2120 if ((buf[len++] = cmd_getc ()) == 'i')
2141 break; /* done = 1 */ 2121 break; /* done = 1 */
2142 } 2122 }
2143 } 2123 }
2144 for (i = 0; i < len; i++) 2124 for (i = 0; i < len; i++)
2145 if (putc(buf[i], fd) == EOF) { 2125 if (putc(buf[i], fd) == EOF) {
2146 done = 1; 2126 done = 1;
2147 break; 2127 break;
2148 } 2128 }
2149 } 2129 }
2150 } 2130 }
2151 rxvt_pclose_printer(fd); 2131 pclose_printer (fd);
2152} 2132}
2153#endif /* PRINTPIPE */ 2133#endif /* PRINTPIPE */
2154/*}}} */ 2134/*}}} */
2155 2135
2156/* *INDENT-OFF* */ 2136/* *INDENT-OFF* */
… …
2162 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
2163}; 2143};
2164/* *INDENT-ON* */ 2144/* *INDENT-ON* */
2165 2145
2166/*{{{ process non-printing single characters */ 2146/*{{{ process non-printing single characters */
2167/* INTPROTO */
2168void 2147void
2169rxvt_process_nonprinting(pR_ unsigned char ch) 2148rxvt_term::process_nonprinting (unsigned char ch)
2170{ 2149{
2171 switch (ch) { 2150 switch (ch) {
2172 case C0_ENQ: /* terminal Status */ 2151 case C0_ENQ: /* terminal Status */
2173 if (R->rs[Rs_answerbackstring]) 2152 if (rs[Rs_answerbackstring])
2174 R->tt_write( 2153 tt_write(
2175 (const unsigned char *)R->rs[Rs_answerbackstring], 2154 (const unsigned char *)rs[Rs_answerbackstring],
2176 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2155 (unsigned int)STRLEN(rs[Rs_answerbackstring]));
2177 else 2156 else
2178 R->tt_write((unsigned char *)VT100_ANS, 2157 tt_write((unsigned char *)VT100_ANS,
2179 (unsigned int)STRLEN(VT100_ANS)); 2158 (unsigned int)STRLEN(VT100_ANS));
2180 break; 2159 break;
2181 case C0_BEL: /* bell */ 2160 case C0_BEL: /* bell */
2182 rxvt_scr_bell(aR); 2161 scr_bell ();
2183 break; 2162 break;
2184 case C0_BS: /* backspace */ 2163 case C0_BS: /* backspace */
2185 rxvt_scr_backspace(aR); 2164 scr_backspace ();
2186 break; 2165 break;
2187 case C0_HT: /* tab */ 2166 case C0_HT: /* tab */
2188 rxvt_scr_tab(aR_ 1); 2167 scr_tab (1);
2189 break; 2168 break;
2190 case C0_CR: /* carriage return */ 2169 case C0_CR: /* carriage return */
2191 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2170 scr_gotorc (0, 0, R_RELATIVE);
2192 break; 2171 break;
2193 case C0_VT: /* vertical tab, form feed */ 2172 case C0_VT: /* vertical tab, form feed */
2194 case C0_FF: 2173 case C0_FF:
2195 case C0_LF: /* line feed */ 2174 case C0_LF: /* line feed */
2196 rxvt_scr_index(aR_ UP); 2175 scr_index (UP);
2197 break; 2176 break;
2198 case C0_SO: /* shift out - acs */ 2177 case C0_SO: /* shift out - acs */
2199 rxvt_scr_charset_choose(aR_ 1); 2178 scr_charset_choose (1);
2200 break; 2179 break;
2201 case C0_SI: /* shift in - acs */ 2180 case C0_SI: /* shift in - acs */
2202 rxvt_scr_charset_choose(aR_ 0); 2181 scr_charset_choose (0);
2203 break; 2182 break;
2204 } 2183 }
2205} 2184}
2206/*}}} */ 2185/*}}} */
2207 2186
2208 2187
2209/*{{{ process VT52 escape sequences */ 2188/*{{{ process VT52 escape sequences */
2210/* INTPROTO */
2211void 2189void
2212rxvt_process_escape_vt52(pR_ unsigned char ch) 2190rxvt_term::process_escape_vt52 (unsigned char ch)
2213{ 2191{
2214 int row, col; 2192 int row, col;
2215 2193
2216 switch (ch) { 2194 switch (ch) {
2217 case 'A': /* cursor up */ 2195 case 'A': /* cursor up */
2218 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2196 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2219 break; 2197 break;
2220 case 'B': /* cursor down */ 2198 case 'B': /* cursor down */
2221 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2199 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2222 break; 2200 break;
2223 case 'C': /* cursor right */ 2201 case 'C': /* cursor right */
2224 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2202 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2225 break; 2203 break;
2226 case 'D': /* cursor left */ 2204 case 'D': /* cursor left */
2227 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2205 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2228 break; 2206 break;
2229 case 'H': /* cursor home */ 2207 case 'H': /* cursor home */
2230 rxvt_scr_gotorc(aR_ 0, 0, 0); 2208 scr_gotorc (0, 0, 0);
2231 break; 2209 break;
2232 case 'I': /* cursor up and scroll down if needed */ 2210 case 'I': /* cursor up and scroll down if needed */
2233 rxvt_scr_index(aR_ DN); 2211 scr_index (DN);
2234 break; 2212 break;
2235 case 'J': /* erase to end of screen */ 2213 case 'J': /* erase to end of screen */
2236 R->scr_erase_screen (0); 2214 scr_erase_screen (0);
2237 break; 2215 break;
2238 case 'K': /* erase to end of line */ 2216 case 'K': /* erase to end of line */
2239 rxvt_scr_erase_line(aR_ 0); 2217 scr_erase_line (0);
2240 break; 2218 break;
2241 case 'Y': /* move to specified row and col */ 2219 case 'Y': /* move to specified row and col */
2242 /* full command is 'ESC Y row col' where row and col 2220 /* full command is 'ESC Y row col' where row and col
2243 * are encoded by adding 32 and sending the ascii 2221 * are encoded by adding 32 and sending the ascii
2244 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2222 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2245 * etc. */ 2223 * etc. */
2246 row = rxvt_cmd_getc(aR) - ' '; 2224 row = cmd_getc () - ' ';
2247 col = rxvt_cmd_getc(aR) - ' '; 2225 col = cmd_getc () - ' ';
2248 rxvt_scr_gotorc(aR_ row, col, 0); 2226 scr_gotorc (row, col, 0);
2249 break; 2227 break;
2250 case 'Z': /* identify the terminal type */ 2228 case 'Z': /* identify the terminal type */
2251 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2229 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2252 break; 2230 break;
2253 case '<': /* turn off VT52 mode */ 2231 case '<': /* turn off VT52 mode */
2254 PrivMode(0, PrivMode_vt52); 2232 PrivMode(0, PrivMode_vt52);
2255 break; 2233 break;
2256 case 'F': /* use special graphics character set */ 2234 case 'F': /* use special graphics character set */
… …
2265} 2243}
2266/*}}} */ 2244/*}}} */
2267 2245
2268 2246
2269/*{{{ process escape sequences */ 2247/*{{{ process escape sequences */
2270/* INTPROTO */
2271void 2248void
2272rxvt_process_escape_seq(pR) 2249rxvt_term::process_escape_seq ()
2273{ 2250{
2274 unsigned char ch = rxvt_cmd_getc(aR); 2251 unsigned char ch = cmd_getc ();
2275 2252
2276 if (R->PrivateModes & PrivMode_vt52) { 2253 if (PrivateModes & PrivMode_vt52) {
2277 rxvt_process_escape_vt52(aR_ ch); 2254 process_escape_vt52 (ch);
2278 return; 2255 return;
2279 } 2256 }
2280 2257
2281 switch (ch) { 2258 switch (ch) {
2282 /* case 1: do_tek_mode (); break; */ 2259 /* case 1: do_tek_mode (); break; */
2283 case '#': 2260 case '#':
2284 if (rxvt_cmd_getc(aR) == '8') 2261 if (cmd_getc () == '8')
2285 rxvt_scr_E(aR); 2262 scr_E ();
2286 break; 2263 break;
2287 case '(': 2264 case '(':
2288 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2265 scr_charset_set (0, (unsigned int)cmd_getc ());
2289 break; 2266 break;
2290 case ')': 2267 case ')':
2291 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2268 scr_charset_set (1, (unsigned int)cmd_getc ());
2292 break; 2269 break;
2293 case '*': 2270 case '*':
2294 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2271 scr_charset_set (2, (unsigned int)cmd_getc ());
2295 break; 2272 break;
2296 case '+': 2273 case '+':
2297 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2274 scr_charset_set (3, (unsigned int)cmd_getc ());
2298 break; 2275 break;
2299#ifdef MULTICHAR_SET 2276#ifdef MULTICHAR_SET
2300 case '$': 2277 case '$':
2301 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2278 scr_charset_set (-2, (unsigned int)cmd_getc ());
2302 break; 2279 break;
2303#endif 2280#endif
2304#ifndef NO_FRILLS 2281#ifndef NO_FRILLS
2305 case '6': 2282 case '6':
2306 rxvt_scr_backindex(aR); 2283 scr_backindex ();
2307 break; 2284 break;
2308#endif 2285#endif
2309 case '7': 2286 case '7':
2310 rxvt_scr_cursor(aR_ SAVE); 2287 scr_cursor (SAVE);
2311 break; 2288 break;
2312 case '8': 2289 case '8':
2313 rxvt_scr_cursor(aR_ RESTORE); 2290 scr_cursor (RESTORE);
2314 break; 2291 break;
2315#ifndef NO_FRILLS 2292#ifndef NO_FRILLS
2316 case '9': 2293 case '9':
2317 rxvt_scr_forwardindex(aR); 2294 scr_forwardindex ();
2318 break; 2295 break;
2319#endif 2296#endif
2320 case '=': 2297 case '=':
2321 case '>': 2298 case '>':
2322 PrivMode((ch == '='), PrivMode_aplKP); 2299 PrivMode((ch == '='), PrivMode_aplKP);
2323 break; 2300 break;
2324 2301
2325 case C1_40: 2302 case C1_40:
2326 rxvt_cmd_getc(aR); 2303 cmd_getc ();
2327 break; 2304 break;
2328 case C1_44: 2305 case C1_44:
2329 rxvt_scr_index(aR_ UP); 2306 scr_index (UP);
2330 break; 2307 break;
2331 2308
2332 /* 8.3.87: NEXT LINE */ 2309 /* 8.3.87: NEXT LINE */
2333 case C1_NEL: /* ESC E */ 2310 case C1_NEL: /* ESC E */
2334 { 2311 {
2335 uint32_t nlcr[] = { '\n', '\r' }; 2312 uint32_t nlcr[] = { '\n', '\r' };
2336 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2313 scr_add_lines (nlcr, 1, 2);
2337 } 2314 }
2338 break; 2315 break;
2339 2316
2340 /* kidnapped escape sequence: Should be 8.3.48 */ 2317 /* kidnapped escape sequence: Should be 8.3.48 */
2341 case C1_ESA: /* ESC G */ 2318 case C1_ESA: /* ESC G */
2342 rxvt_process_graphics(aR); 2319 process_graphics ();
2343 break; 2320 break;
2344 2321
2345 /* 8.3.63: CHARACTER TABULATION SET */ 2322 /* 8.3.63: CHARACTER TABULATION SET */
2346 case C1_HTS: /* ESC H */ 2323 case C1_HTS: /* ESC H */
2347 rxvt_scr_set_tab(aR_ 1); 2324 scr_set_tab (1);
2348 break; 2325 break;
2349 2326
2350 /* 8.3.105: REVERSE LINE FEED */ 2327 /* 8.3.105: REVERSE LINE FEED */
2351 case C1_RI: /* ESC M */ 2328 case C1_RI: /* ESC M */
2352 rxvt_scr_index(aR_ DN); 2329 scr_index (DN);
2353 break; 2330 break;
2354 2331
2355 /* 8.3.142: SINGLE-SHIFT TWO */ 2332 /* 8.3.142: SINGLE-SHIFT TWO */
2356 /*case C1_SS2: scr_single_shift (2); break; */ 2333 /*case C1_SS2: scr_single_shift (2); break; */
2357 2334
2358 /* 8.3.143: SINGLE-SHIFT THREE */ 2335 /* 8.3.143: SINGLE-SHIFT THREE */
2359 /*case C1_SS3: scr_single_shift (3); break; */ 2336 /*case C1_SS3: scr_single_shift (3); break; */
2360 2337
2361 /* 8.3.27: DEVICE CONTROL STRING */ 2338 /* 8.3.27: DEVICE CONTROL STRING */
2362 case C1_DCS: /* ESC P */ 2339 case C1_DCS: /* ESC P */
2363 rxvt_process_dcs_seq(aR); 2340 process_dcs_seq ();
2364 break; 2341 break;
2365 2342
2366 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2343 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2367 case C1_SCI: /* ESC Z */ 2344 case C1_SCI: /* ESC Z */
2368 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2345 tt_write((const unsigned char *)ESCZ_ANSWER,
2369 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2346 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2370 break; /* steal obsolete ESC [ c */ 2347 break; /* steal obsolete ESC [ c */
2371 2348
2372 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2349 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2373 case C1_CSI: /* ESC [ */ 2350 case C1_CSI: /* ESC [ */
2374 rxvt_process_csi_seq(aR); 2351 process_csi_seq ();
2375 break; 2352 break;
2376 2353
2377 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2354 /* 8.3.90: OPERATING SYSTEM COMMAND */
2378 case C1_OSC: /* ESC ] */ 2355 case C1_OSC: /* ESC ] */
2379 rxvt_process_osc_seq(aR); 2356 process_osc_seq ();
2380 break; 2357 break;
2381 2358
2382 /* 8.3.106: RESET TO INITIAL STATE */ 2359 /* 8.3.106: RESET TO INITIAL STATE */
2383 case 'c': 2360 case 'c':
2384 rxvt_scr_poweron(aR); 2361 scr_poweron ();
2385 rxvt_scrollbar_show(aR_ 1); 2362 scrollbar_show (1);
2386 break; 2363 break;
2387 2364
2388 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2365 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2389 case 'n': 2366 case 'n':
2390 rxvt_scr_charset_choose(aR_ 2); 2367 scr_charset_choose (2);
2391 break; 2368 break;
2392 2369
2393 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2370 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2394 case 'o': 2371 case 'o':
2395 rxvt_scr_charset_choose(aR_ 3); 2372 scr_charset_choose (3);
2396 break; 2373 break;
2397 } 2374 }
2398} 2375}
2399/*}}} */ 2376/*}}} */
2400 2377
… …
2428 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, */
2429 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, {, |, }, ~, */
2430}; 2407};
2431/* *INDENT-ON* */ 2408/* *INDENT-ON* */
2432 2409
2433/* INTPROTO */
2434void 2410void
2435rxvt_process_csi_seq(pR) 2411rxvt_term::process_csi_seq ()
2436{ 2412{
2437 unsigned char ch, priv, i; 2413 unsigned char ch, priv, i;
2438 unsigned int nargs, p; 2414 unsigned int nargs, p;
2439 int n, ndef; 2415 int n, ndef;
2440 int arg[ESC_ARGS]; 2416 int arg[ESC_ARGS];
2441 2417
2442 for (nargs = ESC_ARGS; nargs > 0;) 2418 for (nargs = ESC_ARGS; nargs > 0;)
2443 arg[--nargs] = 0; 2419 arg[--nargs] = 0;
2444 2420
2445 priv = 0; 2421 priv = 0;
2446 ch = rxvt_cmd_getc(aR); 2422 ch = cmd_getc ();
2447 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */ 2423 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2448 priv = ch; 2424 priv = ch;
2449 ch = rxvt_cmd_getc(aR); 2425 ch = cmd_getc ();
2450 } 2426 }
2451/* read any numerical arguments */ 2427/* read any numerical arguments */
2452 for (n = -1; ch < CSI_ICH; ) { 2428 for (n = -1; ch < CSI_ICH; ) {
2453 if (isdigit(ch)) { 2429 if (isdigit(ch)) {
2454 if (n < 0) 2430 if (n < 0)
… …
2458 } else if (ch == ';') { 2434 } else if (ch == ';') {
2459 if (nargs < ESC_ARGS) 2435 if (nargs < ESC_ARGS)
2460 arg[nargs++] = n; 2436 arg[nargs++] = n;
2461 n = -1; 2437 n = -1;
2462 } else if (ch == '\b') { 2438 } else if (ch == '\b') {
2463 rxvt_scr_backspace(aR); 2439 scr_backspace ();
2464 } else if (ch == C0_ESC) { 2440 } else if (ch == C0_ESC) {
2465 rxvt_process_escape_seq(aR); 2441 process_escape_seq ();
2466 return; 2442 return;
2467 } else if (ch < ' ') { 2443 } else if (ch < ' ') {
2468 rxvt_process_nonprinting(aR_ ch); 2444 process_nonprinting (ch);
2469 } 2445 }
2470 ch = rxvt_cmd_getc(aR); 2446 ch = cmd_getc ();
2471 } 2447 }
2472 2448
2473 if (ch > CSI_7F) 2449 if (ch > CSI_7F)
2474 return; 2450 return;
2475 2451
… …
2494 */ 2470 */
2495 if (priv) { 2471 if (priv) {
2496 switch (priv) { 2472 switch (priv) {
2497 case '>': 2473 case '>':
2498 if (ch == CSI_DA) /* secondary device attributes */ 2474 if (ch == CSI_DA) /* secondary device attributes */
2499 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2475 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2500 break; 2476 break;
2501 case '?': 2477 case '?':
2502 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2478 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2503 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2479 process_terminal_mode (ch, priv, nargs, arg);
2504 break; 2480 break;
2505 } 2481 }
2506 return; 2482 return;
2507 } 2483 }
2508 2484
… …
2512 */ 2488 */
2513#ifdef PRINTPIPE 2489#ifdef PRINTPIPE
2514 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2490 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2515 switch (arg[0]) { 2491 switch (arg[0]) {
2516 case 0: /* initiate transfer to primary aux device */ 2492 case 0: /* initiate transfer to primary aux device */
2517 rxvt_scr_printscreen(aR_ 0); 2493 scr_printscreen (0);
2518 break; 2494 break;
2519 case 5: /* start relay to primary aux device */ 2495 case 5: /* start relay to primary aux device */
2520 rxvt_process_print_pipe(aR); 2496 process_print_pipe ();
2521 break; 2497 break;
2522 } 2498 }
2523 break; 2499 break;
2524#endif 2500#endif
2525 2501
… …
2527 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2503 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2528 arg[0] = -arg[0]; 2504 arg[0] = -arg[0];
2529 /* FALLTHROUGH */ 2505 /* FALLTHROUGH */
2530 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2506 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2531 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2507 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2532 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2508 scr_gotorc (arg[0], 0, RELATIVE);
2533 break; 2509 break;
2534 2510
2535 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2511 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2536 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2512 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2537#ifdef ISO6429 2513#ifdef ISO6429
… …
2541#endif 2517#endif
2542 /* FALLTHROUGH */ 2518 /* FALLTHROUGH */
2543 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2519 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2544 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2520 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2545#ifdef ISO6429 2521#ifdef ISO6429
2546 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2522 scr_gotorc (0, arg[0], RELATIVE);
2547#else /* emulate common DEC VTs */ 2523#else /* emulate common DEC VTs */
2548 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2524 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2549#endif 2525#endif
2550 break; 2526 break;
2551 2527
2552 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2528 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2553 arg[0] = -arg[0]; 2529 arg[0] = -arg[0];
2554 /* FALLTHROUGH */ 2530 /* FALLTHROUGH */
2555 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2531 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2556 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2532 scr_gotorc (arg[0], 0, R_RELATIVE);
2557 break; 2533 break;
2558 2534
2559 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2535 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2560 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2536 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2561 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2537 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2562 break; 2538 break;
2563 2539
2564 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2540 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2565 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2541 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2566 break; 2542 break;
2567 2543
2568 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2544 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2569 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 */
2570 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);
2571 break; 2547 break;
2572 2548
2573 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2549 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2574 arg[0] = -arg[0]; 2550 arg[0] = -arg[0];
2575 /* FALLTHROUGH */ 2551 /* FALLTHROUGH */
2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2552 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2577 rxvt_scr_tab(aR_ arg[0]); 2553 scr_tab (arg[0]);
2578 break; 2554 break;
2579 2555
2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2556 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2581 R->scr_erase_screen (arg[0]); 2557 scr_erase_screen (arg[0]);
2582 break; 2558 break;
2583 2559
2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2560 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2585 rxvt_scr_erase_line(aR_ arg[0]); 2561 scr_erase_line (arg[0]);
2586 break; 2562 break;
2587 2563
2588 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2564 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2589 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2565 scr_insdel_chars (arg[0], INSERT);
2590 break; 2566 break;
2591 2567
2592 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2568 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2593 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2569 scr_insdel_lines (arg[0], INSERT);
2594 break; 2570 break;
2595 2571
2596 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2572 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2597 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2573 scr_insdel_lines (arg[0], DELETE);
2598 break; 2574 break;
2599 2575
2600 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2576 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2601 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2577 scr_insdel_chars (arg[0], ERASE);
2602 break; 2578 break;
2603 2579
2604 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2580 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2605 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2581 scr_insdel_chars (arg[0], DELETE);
2606 break; 2582 break;
2607 2583
2608 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2584 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2609 arg[0] = -arg[0]; 2585 arg[0] = -arg[0];
2610 /* FALLTHROUGH */ 2586 /* FALLTHROUGH */
2611 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2587 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2612 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2588 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2613 break; 2589 break;
2614 2590
2615 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2591 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2616 R->tt_write((const unsigned char *)VT100_ANS, 2592 tt_write((const unsigned char *)VT100_ANS,
2617 (unsigned int)(sizeof(VT100_ANS) - 1)); 2593 (unsigned int)(sizeof(VT100_ANS) - 1));
2618 break; 2594 break;
2619 2595
2620 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2596 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2621 rxvt_process_sgr_mode(aR_ nargs, arg); 2597 process_sgr_mode (nargs, arg);
2622 break; 2598 break;
2623 2599
2624 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2600 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2625 switch (arg[0]) { 2601 switch (arg[0]) {
2626 case 5: /* DSR requested */ 2602 case 5: /* DSR requested */
2627 R->tt_printf("\033[0n"); 2603 tt_printf("\033[0n");
2628 break; 2604 break;
2629 case 6: /* CPR requested */ 2605 case 6: /* CPR requested */
2630 rxvt_scr_report_position(aR); 2606 scr_report_position ();
2631 break; 2607 break;
2632#if defined (ENABLE_DISPLAY_ANSWER) 2608#if defined (ENABLE_DISPLAY_ANSWER)
2633 case 7: /* unofficial extension */ 2609 case 7: /* unofficial extension */
2634 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2610 tt_printf("%-.250s\n", rs[Rs_display_name]);
2635 break; 2611 break;
2636#endif 2612#endif
2637 case 8: /* unofficial extension */ 2613 case 8: /* unofficial extension */
2638 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2614 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2639 break; 2615 break;
2640 } 2616 }
2641 break; 2617 break;
2642 2618
2643 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2619 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2644 switch (arg[0]) { 2620 switch (arg[0]) {
2645 case 0: /* char tab stop cleared at active position */ 2621 case 0: /* char tab stop cleared at active position */
2646 rxvt_scr_set_tab(aR_ 0); 2622 scr_set_tab (0);
2647 break; 2623 break;
2648 /* case 1: */ /* line tab stop cleared in active line */ 2624 /* case 1: */ /* line tab stop cleared in active line */
2649 /* case 2: */ /* char tab stops cleared in active line */ 2625 /* case 2: */ /* char tab stops cleared in active line */
2650 case 3: /* all char tab stops are cleared */ 2626 case 3: /* all char tab stops are cleared */
2651 /* case 4: */ /* all line tab stops are cleared */ 2627 /* case 4: */ /* all line tab stops are cleared */
2652 case 5: /* all tab stops are cleared */ 2628 case 5: /* all tab stops are cleared */
2653 rxvt_scr_set_tab(aR_ -1); 2629 scr_set_tab (-1);
2654 break; 2630 break;
2655 } 2631 }
2656 break; 2632 break;
2657 2633
2658 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2634 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2659 switch (arg[0]) { 2635 switch (arg[0]) {
2660 case 0: /* char tab stop set at active position */ 2636 case 0: /* char tab stop set at active position */
2661 rxvt_scr_set_tab(aR_ 1); 2637 scr_set_tab (1);
2662 break; /* = ESC H */ 2638 break; /* = ESC H */
2663 /* case 1: */ /* line tab stop set at active line */ 2639 /* case 1: */ /* line tab stop set at active line */
2664 case 2: /* char tab stop cleared at active position */ 2640 case 2: /* char tab stop cleared at active position */
2665 rxvt_scr_set_tab(aR_ 0); 2641 scr_set_tab (0);
2666 break; /* = ESC [ 0 g */ 2642 break; /* = ESC [ 0 g */
2667 /* case 3: */ /* line tab stop cleared at active line */ 2643 /* case 3: */ /* line tab stop cleared at active line */
2668 /* case 4: */ /* char tab stops cleared at active line */ 2644 /* case 4: */ /* char tab stops cleared at active line */
2669 case 5: /* all char tab stops are cleared */ 2645 case 5: /* all char tab stops are cleared */
2670 rxvt_scr_set_tab(aR_ -1); 2646 scr_set_tab (-1);
2671 break; /* = ESC [ 3 g */ 2647 break; /* = ESC [ 3 g */
2672 /* case 6: */ /* all line tab stops are cleared */ 2648 /* case 6: */ /* all line tab stops are cleared */
2673 } 2649 }
2674 break; 2650 break;
2675 2651
2676 case CSI_RM: /* 8.3.107: RESET MODE */ 2652 case CSI_RM: /* 8.3.107: RESET MODE */
2677 if (arg[0] == 4) 2653 if (arg[0] == 4)
2678 rxvt_scr_insert_mode(aR_ 0); 2654 scr_insert_mode (0);
2679 break; 2655 break;
2680 2656
2681 case CSI_SM: /* 8.3.126: SET MODE */ 2657 case CSI_SM: /* 8.3.126: SET MODE */
2682 if (arg[0] == 4) 2658 if (arg[0] == 4)
2683 rxvt_scr_insert_mode(aR_ 1); 2659 scr_insert_mode (1);
2684 break; 2660 break;
2685 2661
2686/* 2662/*
2687 * PRIVATE USE beyond this point. All CSI_7? sequences here 2663 * PRIVATE USE beyond this point. All CSI_7? sequences here
2688 */ 2664 */
2689 case CSI_72: /* DECSTBM: set top and bottom margins */ 2665 case CSI_72: /* DECSTBM: set top and bottom margins */
2690 if (nargs == 1) 2666 if (nargs == 1)
2691 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2667 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2692 else if (nargs == 0 || arg[0] >= arg[1]) 2668 else if (nargs == 0 || arg[0] >= arg[1])
2693 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2669 scr_scroll_region (0, MAX_ROWS - 1);
2694 else 2670 else
2695 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2671 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2696 break; 2672 break;
2697 2673
2698 case CSI_73: 2674 case CSI_73:
2699 rxvt_scr_cursor(aR_ SAVE); 2675 scr_cursor (SAVE);
2700 break; 2676 break;
2701 case CSI_75: 2677 case CSI_75:
2702 rxvt_scr_cursor(aR_ RESTORE); 2678 scr_cursor (RESTORE);
2703 break; 2679 break;
2704 2680
2705#ifndef NO_FRILLS 2681#ifndef NO_FRILLS
2706 case CSI_74: 2682 case CSI_74:
2707 rxvt_process_window_ops(aR_ arg, nargs); 2683 process_window_ops (arg, nargs);
2708 break; 2684 break;
2709#endif 2685#endif
2710 2686
2711 case CSI_78: /* DECREQTPARM */ 2687 case CSI_78: /* DECREQTPARM */
2712 if (arg[0] == 0 || arg[0] == 1) 2688 if (arg[0] == 0 || arg[0] == 1)
2713 R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2689 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2714 /* FALLTHROUGH */ 2690 /* FALLTHROUGH */
2715 2691
2716 default: 2692 default:
2717 break; 2693 break;
2718 } 2694 }
2719} 2695}
2720/*}}} */ 2696/*}}} */
2721 2697
2722#ifndef NO_FRILLS 2698#ifndef NO_FRILLS
2723/* ARGSUSED */ 2699/* ARGSUSED */
2724/* INTPROTO */
2725void 2700void
2726rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2701rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2727{ 2702{
2728 int x, y; 2703 int x, y;
2729#if 0 2704#if 0
2730 char *s; 2705 char *s;
2731#endif 2706#endif
… …
2737 switch (args[0]) { 2712 switch (args[0]) {
2738 /* 2713 /*
2739 * commands 2714 * commands
2740 */ 2715 */
2741 case 1: /* deiconify window */ 2716 case 1: /* deiconify window */
2742 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2717 XMapWindow(Xdisplay, TermWin.parent[0]);
2743 break; 2718 break;
2744 case 2: /* iconify window */ 2719 case 2: /* iconify window */
2745 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2720 XIconifyWindow(Xdisplay, TermWin.parent[0],
2746 DefaultScreen(R->Xdisplay)); 2721 DefaultScreen(Xdisplay));
2747 break; 2722 break;
2748 case 3: /* set position (pixels) */ 2723 case 3: /* set position (pixels) */
2749 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2724 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]);
2750 break; 2725 break;
2751 case 4: /* set size (pixels) */ 2726 case 4: /* set size (pixels) */
2752 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2727 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2753 break; 2728 break;
2754 case 5: /* raise window */ 2729 case 5: /* raise window */
2755 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2730 XRaiseWindow(Xdisplay, TermWin.parent[0]);
2756 break; 2731 break;
2757 case 6: /* lower window */ 2732 case 6: /* lower window */
2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2733 XLowerWindow(Xdisplay, TermWin.parent[0]);
2759 break; 2734 break;
2760 case 7: /* refresh window */ 2735 case 7: /* refresh window */
2761 R->scr_touch (true); 2736 scr_touch (true);
2762 break; 2737 break;
2763 case 8: /* set size (chars) */ 2738 case 8: /* set size (chars) */
2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2739 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth),
2765 (unsigned int)(args[1] * R->TermWin.fheight)); 2740 (unsigned int)(args[1] * TermWin.fheight));
2766 break; 2741 break;
2767 default: 2742 default:
2768 if (args[0] >= 24) /* set height (chars) */ 2743 if (args[0] >= 24) /* set height (chars) */
2769 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2744 set_widthheight ((unsigned int)TermWin.width,
2770 (unsigned int)(args[1] * R->TermWin.fheight)); 2745 (unsigned int)(args[1] * TermWin.fheight));
2771 break; 2746 break;
2772 /* 2747 /*
2773 * reports - some output format copied from XTerm 2748 * reports - some output format copied from XTerm
2774 */ 2749 */
2775 case 11: /* report window state */ 2750 case 11: /* report window state */
2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2751 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
2777 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2752 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2778 break; 2753 break;
2779 case 13: /* report window position */ 2754 case 13: /* report window position */
2780 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2755 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
2781 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2756 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root,
2782 -wattr.border_width, -wattr.border_width, 2757 -wattr.border_width, -wattr.border_width,
2783 &x, &y, &wdummy); 2758 &x, &y, &wdummy);
2784 R->tt_printf("\033[3;%d;%dt", x, y); 2759 tt_printf("\033[3;%d;%dt", x, y);
2785 break; 2760 break;
2786 case 14: /* report window size (pixels) */ 2761 case 14: /* report window size (pixels) */
2787 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2762 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
2788 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2763 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2789 break; 2764 break;
2790 case 18: /* report window size (chars) */ 2765 case 18: /* report window size (chars) */
2791 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2766 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2792 break; 2767 break;
2793#if 0 /* XXX: currently disabled due to security concerns */ 2768#if 0 /* XXX: currently disabled due to security concerns */
2794 case 20: /* report icon label */ 2769 case 20: /* report icon label */
2795 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2770 XGetIconName(Xdisplay, TermWin.parent[0], &s);
2796 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2771 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2797 break; 2772 break;
2798 case 21: /* report window title */ 2773 case 21: /* report window title */
2799 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2774 XFetchName(Xdisplay, TermWin.parent[0], &s);
2800 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2775 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2801 break; 2776 break;
2802#endif 2777#endif
2803 } 2778 }
2804} 2779}
2805#endif 2780#endif
… …
2807/*----------------------------------------------------------------------*/ 2782/*----------------------------------------------------------------------*/
2808/* 2783/*
2809 * get input up until STRING TERMINATOR (or BEL) 2784 * get input up until STRING TERMINATOR (or BEL)
2810 * ends_how is terminator used. returned input must be free()d 2785 * ends_how is terminator used. returned input must be free()d
2811 */ 2786 */
2812/* INTPROTO */
2813unsigned char * 2787unsigned char *
2814rxvt_get_to_st(pR_ unsigned char *ends_how) 2788rxvt_term::get_to_st (unsigned char *ends_how)
2815{ 2789{
2816 int seen_esc = 0; /* seen escape? */ 2790 int seen_esc = 0; /* seen escape? */
2817 unsigned int n = 0; 2791 unsigned int n = 0;
2818 unsigned char *s; 2792 unsigned char *s;
2819 unsigned char ch, string[STRING_MAX]; 2793 unsigned char ch, string[STRING_MAX];
2820 2794
2821 for (; (ch = rxvt_cmd_getc(aR));) { 2795 for (; (ch = cmd_getc ());) {
2822 if (ch == C0_BEL 2796 if (ch == C0_BEL
2823 || ch == CHAR_ST 2797 || ch == CHAR_ST
2824 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2798 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2825 break; 2799 break;
2826 if (ch == C0_ESC) { 2800 if (ch == C0_ESC) {
… …
2844 2818
2845/*----------------------------------------------------------------------*/ 2819/*----------------------------------------------------------------------*/
2846/* 2820/*
2847 * 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)'
2848 */ 2822 */
2849/* INTPROTO */
2850void 2823void
2851rxvt_process_dcs_seq(pR) 2824rxvt_term::process_dcs_seq ()
2852{ 2825{
2853 unsigned char eh, *s; 2826 unsigned char eh, *s;
2854/* 2827/*
2855 * Not handled yet 2828 * Not handled yet
2856 */ 2829 */
2857 s = rxvt_get_to_st(aR_ &eh); 2830 s = get_to_st (&eh);
2858 if (s) 2831 if (s)
2859 free(s); 2832 free(s);
2860 return; 2833 return;
2861} 2834}
2862 2835
2863/*----------------------------------------------------------------------*/ 2836/*----------------------------------------------------------------------*/
2864/* 2837/*
2865 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2838 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2866 */ 2839 */
2867/* INTPROTO */
2868void 2840void
2869rxvt_process_osc_seq(pR) 2841rxvt_term::process_osc_seq ()
2870{ 2842{
2871 unsigned char ch, eh, *s; 2843 unsigned char ch, eh, *s;
2872 int arg; 2844 int arg;
2873 2845
2874 ch = rxvt_cmd_getc(aR); 2846 ch = cmd_getc ();
2875 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2847 for (arg = 0; isdigit(ch); ch = cmd_getc ())
2876 arg = arg * 10 + (ch - '0'); 2848 arg = arg * 10 + (ch - '0');
2877 2849
2878 if (ch == ';') { 2850 if (ch == ';') {
2879 s = rxvt_get_to_st(aR_ &eh); 2851 s = get_to_st (&eh);
2880 if (s) { 2852 if (s) {
2881 /* 2853 /*
2882 * rxvt_menubar_dispatch() violates the constness of the string, 2854 * rxvt_menubar_dispatch() violates the constness of the string,
2883 * so do it here 2855 * so do it here
2884 */ 2856 */
2885 if (arg == XTerm_Menu) 2857 if (arg == XTerm_Menu)
2886#if 0 /* XXX: currently disabled due to security concerns */ 2858#if 0 /* XXX: currently disabled due to security concerns */
2887 rxvt_menubar_dispatch(aR_ (char *)s); 2859 menubar_dispatch ((char *)s);
2888#else 2860#else
2889 0; 2861 (void)0;
2890#endif 2862#endif
2891 else 2863 else
2892 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2864 xterm_seq (arg, (char *)s, eh);
2893 free(s); 2865 free(s);
2894 } 2866 }
2895 } 2867 }
2896} 2868}
2897/* 2869/*
… …
2913 * 20 = bg pixmap 2885 * 20 = bg pixmap
2914 * 39 = change default fg color 2886 * 39 = change default fg color
2915 * 49 = change default bg color 2887 * 49 = change default bg color
2916 * 55 = dump scrollback buffer and all of screen 2888 * 55 = dump scrollback buffer and all of screen
2917 */ 2889 */
2918/* EXTPROTO */
2919void 2890void
2920rxvt_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)))
2921{ 2892{
2922 int changed = 0; 2893 int changed = 0;
2923 int color; 2894 int color;
2924 char *buf, *name; 2895 char *buf, *name;
2925 2896
2926 assert(str != NULL); 2897 assert(str != NULL);
2927 switch (op) { 2898 switch (op) {
2928 case XTerm_name: 2899 case XTerm_name:
2929 rxvt_set_title(aR_ str); 2900 set_title (str);
2930 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2931 case XTerm_iconName: 2902 case XTerm_iconName:
2932 rxvt_set_iconName(aR_ str); 2903 set_iconName (str);
2933 break; 2904 break;
2934 case XTerm_title: 2905 case XTerm_title:
2935 rxvt_set_title(aR_ str); 2906 set_title (str);
2936 break; 2907 break;
2937 case XTerm_Color: 2908 case XTerm_Color:
2938 for (buf = (char *)str; buf && *buf;) { 2909 for (buf = (char *)str; buf && *buf;) {
2939 if ((name = STRCHR(buf, ';')) == NULL) 2910 if ((name = STRCHR(buf, ';')) == NULL)
2940 break; 2911 break;
… …
2942 color = atoi(buf); 2913 color = atoi(buf);
2943 if (color < 0 || color >= TOTAL_COLORS) 2914 if (color < 0 || color >= TOTAL_COLORS)
2944 break; 2915 break;
2945 if ((buf = STRCHR(name, ';')) != NULL) 2916 if ((buf = STRCHR(name, ';')) != NULL)
2946 *buf++ = '\0'; 2917 *buf++ = '\0';
2947 rxvt_set_window_color(aR_ color + minCOLOR, name); 2918 set_window_color (color + minCOLOR, name);
2948 } 2919 }
2949 break; 2920 break;
2950#ifndef NO_CURSORCOLOR 2921#ifndef NO_CURSORCOLOR
2951 case XTerm_Color_cursor: 2922 case XTerm_Color_cursor:
2952 rxvt_set_window_color(aR_ Color_cursor, str); 2923 set_window_color (Color_cursor, str);
2953 break; 2924 break;
2954#endif 2925#endif
2955 case XTerm_Color_pointer: 2926 case XTerm_Color_pointer:
2956 rxvt_set_window_color(aR_ Color_pointer, str); 2927 set_window_color (Color_pointer, str);
2957 break; 2928 break;
2958#ifndef NO_BOLD_UNDERLINE_REVERSE 2929#ifndef NO_BOLD_UNDERLINE_REVERSE
2959 case XTerm_Color_BD: 2930 case XTerm_Color_BD:
2960 rxvt_set_window_color(aR_ Color_BD, str); 2931 set_window_color (Color_BD, str);
2961 break; 2932 break;
2962 case XTerm_Color_UL: 2933 case XTerm_Color_UL:
2963 rxvt_set_window_color(aR_ Color_UL, str); 2934 set_window_color (Color_UL, str);
2964 break; 2935 break;
2965 case XTerm_Color_RV: 2936 case XTerm_Color_RV:
2966 rxvt_set_window_color(aR_ Color_RV, str); 2937 set_window_color (Color_RV, str);
2967 break; 2938 break;
2968#endif 2939#endif
2969 2940
2970 case XTerm_Menu: 2941 case XTerm_Menu:
2971 /* 2942 /*
… …
2974 */ 2945 */
2975 break; 2946 break;
2976 case XTerm_Pixmap: 2947 case XTerm_Pixmap:
2977 if (*str != ';') { 2948 if (*str != ';') {
2978#if XPM_BACKGROUND 2949#if XPM_BACKGROUND
2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2950 scale_pixmap (""); /* reset to default scaling */
2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2951 set_bgPixmap (str); /* change pixmap */
2981#endif 2952#endif
2982 R->scr_touch (true); 2953 scr_touch (true);
2983 } 2954 }
2984 while ((str = STRCHR(str, ';')) != NULL) { 2955 while ((str = STRCHR(str, ';')) != NULL) {
2985 str++; 2956 str++;
2986#if XPM_BACKGROUND 2957#if XPM_BACKGROUND
2987 changed += rxvt_scale_pixmap(aR_ str); 2958 changed += scale_pixmap (str);
2988#endif 2959#endif
2989 } 2960 }
2990 if (changed) { 2961 if (changed) {
2991#ifdef XPM_BACKGROUND 2962#ifdef XPM_BACKGROUND
2992 rxvt_resize_pixmap(aR); 2963 resize_pixmap ();
2993#endif 2964#endif
2994 R->scr_touch (true); 2965 scr_touch (true);
2995 } 2966 }
2996 break; 2967 break;
2997 2968
2998 case XTerm_restoreFG: 2969 case XTerm_restoreFG:
2999 rxvt_set_window_color(aR_ Color_fg, str); 2970 set_window_color (Color_fg, str);
3000 break; 2971 break;
3001 case XTerm_restoreBG: 2972 case XTerm_restoreBG:
3002 rxvt_set_window_color(aR_ Color_bg, str); 2973 set_window_color (Color_bg, str);
3003 break; 2974 break;
3004 case XTerm_logfile: 2975 case XTerm_logfile:
3005 break; 2976 break;
3006 case XTerm_font: 2977 case XTerm_font:
3007 rxvt_change_font(aR_ 0, str); 2978 change_font (0, str);
3008 break; 2979 break;
3009#if 0 2980#if 0
3010 case XTerm_dumpscreen: /* no error notices */ 2981 case XTerm_dumpscreen: /* no error notices */
3011 { 2982 {
3012 int fd; 2983 int fd;
3013 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) {
3014 rxvt_scr_dump(aR_ fd); 2985 scr_dump (fd);
3015 close(fd); 2986 close(fd);
3016 } 2987 }
3017 } 2988 }
3018 break; 2989 break;
3019#endif 2990#endif
… …
3029 * 's' = save 3000 * 's' = save
3030 * 'r' = restore 3001 * 'r' = restore
3031 * 't' = toggle 3002 * 't' = toggle
3032 * so no need for fancy checking 3003 * so no need for fancy checking
3033 */ 3004 */
3034/* INTPROTO */
3035int 3005int
3036rxvt_privcases(pR_ int mode, unsigned long bit) 3006rxvt_term::privcases (int mode, unsigned long bit)
3037{ 3007{
3038 int state; 3008 int state;
3039 3009
3040 if (mode == 's') { 3010 if (mode == 's') {
3041 R->SavedModes |= (R->PrivateModes & bit); 3011 SavedModes |= (PrivateModes & bit);
3042 return -1; 3012 return -1;
3043 } else { 3013 } else {
3044 if (mode == 'r') 3014 if (mode == 'r')
3045 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3015 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3046 else 3016 else
3047 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3017 state = (mode == 't') ? !(PrivateModes & bit) : mode;
3048 PrivMode(state, bit); 3018 PrivMode(state, bit);
3049 } 3019 }
3050 return state; 3020 return state;
3051} 3021}
3052 3022
3053/* we're not using priv _yet_ */ 3023/* we're not using priv _yet_ */
3054/* INTPROTO */
3055void 3024void
3056rxvt_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)
3057{ 3026{
3058 unsigned int i, j; 3027 unsigned int i, j;
3059 int state; 3028 int state;
3060 static const struct { 3029 static const struct {
3061 const int argval; 3030 const int argval;
… …
3085#endif 3054#endif
3086 { 1000, PrivMode_MouseX11 }, 3055 { 1000, PrivMode_MouseX11 },
3087 { 1010, PrivMode_TtyOutputInh }, 3056 { 1010, PrivMode_TtyOutputInh },
3088 { 1011, PrivMode_Keypress }, 3057 { 1011, PrivMode_Keypress },
3089 { 1047, PrivMode_Screen }, 3058 { 1047, PrivMode_Screen },
3059 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3090 }; 3060 };
3091 3061
3092 if (nargs == 0) 3062 if (nargs == 0)
3093 return; 3063 return;
3094 3064
… …
3102 state = -1; 3072 state = -1;
3103 3073
3104 /* basic handling */ 3074 /* basic handling */
3105 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3075 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++)
3106 if (argtopriv[j].argval == arg[i]) { 3076 if (argtopriv[j].argval == arg[i]) {
3107 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3077 state = privcases (mode, argtopriv[j].bit);
3108 break; 3078 break;
3109 } 3079 }
3110 3080
3111 /* extra handling for values with state unkept */ 3081 /* extra handling for values with state unkept */
3112 if (state == -1) 3082 if (state == -1)
3113 switch (arg[i]) { 3083 switch (arg[i]) {
3114 case 1048: /* alternative cursor save */ 3084 case 1048: /* alternative cursor save */
3115 if (mode == 0) 3085 if (mode == 0)
3116 rxvt_scr_cursor(aR_ RESTORE); 3086 scr_cursor (RESTORE);
3117 else if (mode == 1) 3087 else if (mode == 1)
3118 rxvt_scr_cursor(aR_ SAVE); 3088 scr_cursor (SAVE);
3119 /* FALLTHROUGH */ 3089 /* FALLTHROUGH */
3120 default: 3090 default:
3121 continue; /* for(;i;) */ 3091 continue; /* for(;i;) */
3122 } 3092 }
3123 3093
… …
3130 * within VT52 mode 3100 * within VT52 mode
3131 */ 3101 */
3132 PrivMode(1, PrivMode_vt52); 3102 PrivMode(1, PrivMode_vt52);
3133 break; 3103 break;
3134 case 3: /* 80/132 */ 3104 case 3: /* 80/132 */
3135 if (R->PrivateModes & PrivMode_132OK) 3105 if (PrivateModes & PrivMode_132OK)
3136 rxvt_set_widthheight(aR_
3137 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3106 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth),
3138 (unsigned int)R->TermWin.height); 3107 (unsigned int)TermWin.height);
3139 break; 3108 break;
3140 case 4: /* smooth scrolling */ 3109 case 4: /* smooth scrolling */
3141 if (state) 3110 if (state)
3142 R->Options &= ~Opt_jumpScroll; 3111 Options &= ~Opt_jumpScroll;
3143 else 3112 else
3144 R->Options |= Opt_jumpScroll; 3113 Options |= Opt_jumpScroll;
3145 break; 3114 break;
3146 case 5: /* reverse video */ 3115 case 5: /* reverse video */
3147 rxvt_scr_rvideo_mode(aR_ state); 3116 scr_rvideo_mode (state);
3148 break; 3117 break;
3149 case 6: /* relative/absolute origins */ 3118 case 6: /* relative/absolute origins */
3150 rxvt_scr_relative_origin(aR_ state); 3119 scr_relative_origin (state);
3151 break; 3120 break;
3152 case 7: /* autowrap */ 3121 case 7: /* autowrap */
3153 rxvt_scr_autowrap(aR_ state); 3122 scr_autowrap (state);
3154 break; 3123 break;
3155 /* 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 */
3156 case 9: /* X10 mouse reporting */ 3125 case 9: /* X10 mouse reporting */
3157 if (state) /* orthogonal */ 3126 if (state) /* orthogonal */
3158 R->PrivateModes &= ~(PrivMode_MouseX11); 3127 PrivateModes &= ~(PrivMode_MouseX11);
3159 break; 3128 break;
3160#ifdef menuBar_esc 3129#ifdef menuBar_esc
3161 case menuBar_esc: 3130 case menuBar_esc:
3162#ifdef MENUBAR 3131#ifdef MENUBAR
3163 rxvt_map_menuBar(aR_ state); 3132 map_menuBar (state);
3164#endif 3133#endif
3165 break; 3134 break;
3166#endif 3135#endif
3167#ifdef scrollBar_esc 3136#ifdef scrollBar_esc
3168 case scrollBar_esc: 3137 case scrollBar_esc:
3169 if (rxvt_scrollbar_mapping(aR_ state)) { 3138 if (scrollbar_mapping (state)) {
3170 R->resize_all_windows (0, 0, 0); 3139 resize_all_windows (0, 0, 0);
3171 R->scr_touch (true); 3140 scr_touch (true);
3172 } 3141 }
3173 break; 3142 break;
3174#endif 3143#endif
3175 case 25: /* visible/invisible cursor */ 3144 case 25: /* visible/invisible cursor */
3176 rxvt_scr_cursor_visible(aR_ state); 3145 scr_cursor_visible (state);
3177 break; 3146 break;
3178 /* case 35: - shift keys */ 3147 /* case 35: - shift keys */
3179 /* case 40: - 80 <--> 132 mode */ 3148 /* case 40: - 80 <--> 132 mode */
3180 case 47: /* secondary screen */ 3149 case 47: /* secondary screen */
3181 rxvt_scr_change_screen(aR_ state); 3150 scr_change_screen (state);
3182 break; 3151 break;
3183 /* case 66: - application key pad */ 3152 /* case 66: - application key pad */
3184 /* case 67: - backspace key */ 3153 /* case 67: - backspace key */
3185 case 1000: /* X11 mouse reporting */ 3154 case 1000: /* X11 mouse reporting */
3186 if (state) /* orthogonal */ 3155 if (state) /* orthogonal */
3187 R->PrivateModes &= ~(PrivMode_MouseX10); 3156 PrivateModes &= ~(PrivMode_MouseX10);
3188 break; 3157 break;
3189#if 0 3158#if 0
3190 case 1001: 3159 case 1001:
3191 break; /* X11 mouse highlighting */ 3160 break; /* X11 mouse highlighting */
3192#endif 3161#endif
3193 case 1010: /* scroll to bottom on TTY output inhibit */ 3162 case 1010: /* scroll to bottom on TTY output inhibit */
3194 if (state) 3163 if (state)
3195 R->Options &= ~Opt_scrollTtyOutput; 3164 Options &= ~Opt_scrollTtyOutput;
3196 else 3165 else
3197 R->Options |= Opt_scrollTtyOutput; 3166 Options |= Opt_scrollTtyOutput;
3198 break; 3167 break;
3199 case 1011: /* scroll to bottom on key press */ 3168 case 1011: /* scroll to bottom on key press */
3200 if (state) 3169 if (state)
3201 R->Options |= Opt_scrollTtyKeypress; 3170 Options |= Opt_scrollTtyKeypress;
3202 else 3171 else
3203 R->Options &= ~Opt_scrollTtyKeypress; 3172 Options &= ~Opt_scrollTtyKeypress;
3204 break; 3173 break;
3205 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 */
3206 if (R->current_screen != PRIMARY) 3176 if (current_screen != PRIMARY)
3207 R->scr_erase_screen (2); 3177 scr_erase_screen (2);
3208 rxvt_scr_change_screen(aR_ state); 3178 scr_change_screen (state);
3209 /* FALLTHROUGH */ 3179 /* FALLTHROUGH */
3210 default: 3180 default:
3211 break; 3181 break;
3212 } 3182 }
3213 } 3183 }
3214} 3184}
3215/*}}} */ 3185/*}}} */
3216 3186
3217/*{{{ process sgr sequences */ 3187/*{{{ process sgr sequences */
3218/* INTPROTO */
3219void 3188void
3220rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3189rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3221{ 3190{
3222 unsigned int i; 3191 unsigned int i;
3223 short rendset; 3192 short rendset;
3224 int rendstyle; 3193 int rendstyle;
3225 3194
3226 if (nargs == 0) { 3195 if (nargs == 0) {
3227 rxvt_scr_rendition(aR_ 0, ~RS_None); 3196 scr_rendition (0, ~RS_None);
3228 return; 3197 return;
3229 } 3198 }
3230 for (i = 0; i < nargs; i++) { 3199 for (i = 0; i < nargs; i++) {
3231 rendset = -1; 3200 rendset = -1;
3232 switch (arg[i]) { 3201 switch (arg[i]) {
… …
3257 case 27: 3226 case 27:
3258 rendset = 0, rendstyle = RS_RVid; 3227 rendset = 0, rendstyle = RS_RVid;
3259 break; 3228 break;
3260 } 3229 }
3261 if (rendset != -1) { 3230 if (rendset != -1) {
3262 rxvt_scr_rendition(aR_ rendset, rendstyle); 3231 scr_rendition (rendset, rendstyle);
3263 continue; /* for(;i;) */ 3232 continue; /* for(;i;) */
3264 } 3233 }
3265 3234
3266 switch (arg[i]) { 3235 switch (arg[i]) {
3267 case 30: 3236 case 30:
… …
3270 case 33: 3239 case 33:
3271 case 34: 3240 case 34:
3272 case 35: 3241 case 35:
3273 case 36: 3242 case 36:
3274 case 37: 3243 case 37:
3275 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3244 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)),
3276 Color_fg); 3245 Color_fg);
3277 break; 3246 break;
3278#ifdef TTY_256COLOR 3247#ifdef TTY_256COLOR
3279 case 38: 3248 case 38:
3280 if (nargs > i + 2 && arg[i + 1] == 5) { 3249 if (nargs > i + 2 && arg[i + 1] == 5) {
3281 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3250 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3282 Color_fg); 3251 Color_fg);
3283 i += 2; 3252 i += 2;
3284 } 3253 }
3285 break; 3254 break;
3286#endif 3255#endif
3287 case 39: /* default fg */ 3256 case 39: /* default fg */
3288 rxvt_scr_color(aR_ Color_fg, Color_fg); 3257 scr_color (Color_fg, Color_fg);
3289 break; 3258 break;
3290 3259
3291 case 40: 3260 case 40:
3292 case 41: /* set bg color */ 3261 case 41: /* set bg color */
3293 case 42: 3262 case 42:
3294 case 43: 3263 case 43:
3295 case 44: 3264 case 44:
3296 case 45: 3265 case 45:
3297 case 46: 3266 case 46:
3298 case 47: 3267 case 47:
3299 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3268 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)),
3300 Color_bg); 3269 Color_bg);
3301 break; 3270 break;
3302#ifdef TTY_256COLOR 3271#ifdef TTY_256COLOR
3303 case 48: 3272 case 48:
3304 if (nargs > i + 2 && arg[i + 1] == 5) { 3273 if (nargs > i + 2 && arg[i + 1] == 5) {
3305 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3274 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3306 Color_bg); 3275 Color_bg);
3307 i += 2; 3276 i += 2;
3308 } 3277 }
3309 break; 3278 break;
3310#endif 3279#endif
3311 case 49: /* default bg */ 3280 case 49: /* default bg */
3312 rxvt_scr_color(aR_ Color_bg, Color_bg); 3281 scr_color (Color_bg, Color_bg);
3313 break; 3282 break;
3314 3283
3315#ifndef NO_BRIGHTCOLOR 3284#ifndef NO_BRIGHTCOLOR
3316 case 90: 3285 case 90:
3317 case 91: /* set bright fg color */ 3286 case 91: /* set bright fg color */
… …
3319 case 93: 3288 case 93:
3320 case 94: 3289 case 94:
3321 case 95: 3290 case 95:
3322 case 96: 3291 case 96:
3323 case 97: 3292 case 97:
3324 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3293 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)),
3325 Color_fg); 3294 Color_fg);
3326 break; 3295 break;
3327 case 100: 3296 case 100:
3328 case 101: /* set bright bg color */ 3297 case 101: /* set bright bg color */
3329 case 102: 3298 case 102:
3330 case 103: 3299 case 103:
3331 case 104: 3300 case 104:
3332 case 105: 3301 case 105:
3333 case 106: 3302 case 106:
3334 case 107: 3303 case 107:
3335 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3304 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)),
3336 Color_bg); 3305 Color_bg);
3337 break; 3306 break;
3338#endif 3307#endif
3339 } 3308 }
3340 } 3309 }
3341} 3310}
3342/*}}} */ 3311/*}}} */
3343 3312
3344/*{{{ process Rob Nation's own graphics mode sequences */ 3313/*{{{ process Rob Nation's own graphics mode sequences */
3345/* INTPROTO */
3346void 3314void
3347rxvt_process_graphics(pR) 3315rxvt_term::process_graphics ()
3348{ 3316{
3349 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3317 unsigned char ch, cmd = cmd_getc ();
3350 3318
3351#ifndef RXVT_GRAPHICS 3319#ifndef RXVT_GRAPHICS
3352 if (cmd == 'Q') { /* query graphics */ 3320 if (cmd == 'Q') { /* query graphics */
3353 R->tt_printf("\033G0\n"); /* no graphics */ 3321 tt_printf("\033G0\n"); /* no graphics */
3354 return; 3322 return;
3355 } 3323 }
3356/* swallow other graphics sequences until terminating ':' */ 3324/* swallow other graphics sequences until terminating ':' */
3357 do 3325 do
3358 ch = rxvt_cmd_getc(aR); 3326 ch = cmd_getc ();
3359 while (ch != ':'); 3327 while (ch != ':');
3360#else 3328#else
3361 unsigned int nargs; 3329 unsigned int nargs;
3362 int args[NGRX_PTS]; 3330 int args[NGRX_PTS];
3363 unsigned char *text = NULL; 3331 unsigned char *text = NULL;
3364 3332
3365 if (cmd == 'Q') { /* query graphics */ 3333 if (cmd == 'Q') { /* query graphics */
3366 R->tt_printf("\033G1\n"); /* yes, graphics (color) */ 3334 tt_printf("\033G1\n"); /* yes, graphics (color) */
3367 return; 3335 return;
3368 } 3336 }
3369 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3337 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3370 int neg; 3338 int neg;
3371 3339
3372 ch = rxvt_cmd_getc(aR); 3340 ch = cmd_getc ();
3373 neg = (ch == '-'); 3341 neg = (ch == '-');
3374 if (neg || ch == '+') 3342 if (neg || ch == '+')
3375 ch = rxvt_cmd_getc(aR); 3343 ch = cmd_getc ();
3376 3344
3377 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 3345 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3378 args[nargs] = args[nargs] * 10 + (ch - '0'); 3346 args[nargs] = args[nargs] * 10 + (ch - '0');
3379 if (neg) 3347 if (neg)
3380 args[nargs] = -args[nargs]; 3348 args[nargs] = -args[nargs];
3381 3349
3382 nargs++; 3350 nargs++;
… …
3390 3358
3391 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3359 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3392 3360
3393 if (text != NULL) { 3361 if (text != NULL) {
3394 for (i = 0; i < len; i++) 3362 for (i = 0; i < len; i++)
3395 text[i] = rxvt_cmd_getc(aR); 3363 text[i] = cmd_getc ();
3396 text[len] = '\0'; 3364 text[len] = '\0';
3397 } 3365 }
3398 } 3366 }
3399 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text); 3367 Gr_do_graphics (cmd, nargs, args, text);
3400#endif 3368#endif
3401} 3369}
3402/*}}} */ 3370/*}}} */
3403 3371
3404/* ------------------------------------------------------------------------- */ 3372/* ------------------------------------------------------------------------- */
… …
3430 3398
3431 if (len) 3399 if (len)
3432 { 3400 {
3433 if (v_buflen == 0) 3401 if (v_buflen == 0)
3434 { 3402 {
3435 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
3436 if (written == len) 3405 if ((unsigned int)written == len)
3437 return; 3406 return;
3438 3407
3439 data += written; 3408 data += written;
3440 len -= written; 3409 len -= written;
3441 } 3410 }

Diff Legend

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