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.15 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.34 by pcg, Sat Jan 31 00:20:21 2004 UTC

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

Diff Legend

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