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

Diff Legend

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