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.14 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.35 by pcg, Sat Jan 31 03:27:45 2004 UTC

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

Diff Legend

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