ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.26 by pcg, Sun Feb 1 01:34:41 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.3 2003/11/25 11:52:42 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
42 41
43#ifdef HAVE_TERMIOS_H 42#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43# include <termios.h>
45#endif 44#endif
46 45
47rxvt_term::rxvt_term() 46#include <cstring>
48: pty_ev(this, &rxvt_term::pty_cb), 47
49 x_ev (this, &rxvt_term::x_cb) 48static char curlocale[128];
49
50void
51rxvt_set_locale (const char *locale)
50{ 52{
51 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 53 if (locale && STRNCMP (locale, curlocale, 128))
54 {
55 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale);
57 }
52} 58}
53 59
54void * 60void *
55rxvt_term::operator new (size_t s) 61rxvt_term::operator new (size_t s)
56{ 62{
62 68
63void 69void
64rxvt_term::operator delete (void *p, size_t s) 70rxvt_term::operator delete (void *p, size_t s)
65{ 71{
66 free (p); 72 free (p);
73}
74
75rxvt_term::rxvt_term ()
76 :
77#ifdef CURSOR_BLINK
78 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
79#endif
80#ifdef TEXT_BLINK
81 text_blink_ev (this, &rxvt_term::text_blink_cb),
82#endif
83#ifdef POINTER_BLANK
84 pointer_ev (this, &rxvt_term::pointer_cb),
85#endif
86 check_ev (this, &rxvt_term::check_cb),
87 destroy_ev (this, &rxvt_term::destroy_cb),
88 pty_ev (this, &rxvt_term::pty_cb),
89 x_ev (this, &rxvt_term::x_cb),
90 incr_ev (this, &rxvt_term::incr_cb)
91{
92 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
93}
94
95rxvt_term::~rxvt_term ()
96{
97 scr_release ();
98
99 free (locale);
100 free (codeset);
101
102#ifndef NO_SETOWNER_TTYDEV
103 privileged_ttydev (RESTORE);
104#endif
105#ifdef UTMP_SUPPORT
106 privileged_utmp (RESTORE);
107#endif
108#ifdef USE_XIM
109 if (Input_Context != NULL)
110 {
111 XDestroyIC (Input_Context);
112 Input_Context = NULL;
113 }
114#endif
115
116 if (cmd_fd >= 0)
117 close (cmd_fd);
118
119 if (Xfd >= 0)
120 XCloseDisplay (Xdisplay);
121
122 delete PixColors;
123}
124
125void
126rxvt_term::destroy ()
127{
128 check_ev.stop ();
129 pty_ev.stop ();
130 x_ev.stop ();
131#ifdef CURSOR_BLINK
132 cursor_blink_ev.stop ();
133#endif
134#ifdef TEXT_BLINK
135 text_blink_ev.stop ();
136#endif
137#ifdef POINTER_BLANK
138 pointer_ev.stop ();
139#endif
140
141 destroy_ev.start (0);
142}
143
144void
145rxvt_term::destroy_cb (time_watcher &w)
146{
147 SET_R (this);
148
149 delete this;
67} 150}
68 151
69/*----------------------------------------------------------------------*/ 152/*----------------------------------------------------------------------*/
70/* rxvt_init() */ 153/* rxvt_init() */
71/* LIBPROTO */ 154/* LIBPROTO */
72rxvt_t 155rxvt_t
73rxvt_init(int argc, const char *const *argv) 156rxvt_init (int argc, const char *const *argv)
74{ 157{
75 const char **cmd_argv;
76
77 SET_R(new rxvt_term); 158 SET_R (new rxvt_term);
78 dR;
79 159
80 if (rxvt_init_vars(aR) < 0) 160 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
81 {
82 free(R);
83 return NULL;
84 } 161 {
162 delete GET_R;
163 SET_R (0);
164 }
85 165
86/* 166 return GET_R;
167}
168
169void
170rxvt_init_signals ()
171{
172 /* install exit handler for cleanup */
173#if 0
174#ifdef HAVE_ATEXIT
175 atexit(rxvt_clean_exit);
176#else
177#endif
178#endif
179
180 struct sigaction sa;
181
182 sigfillset (&sa.sa_mask);
183 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
184 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
185 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
186 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
187 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
188 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
189 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
190
191 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
192 /* signal (SIGURG, SIG_DFL); */
193
194 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
195 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
196}
197
198bool
199rxvt_term::init (int argc, const char *const *argv)
200{
201 /*
87 * Save and then give up any super-user privileges 202 * Save and then give up any super-user privileges
88 * If we need privileges in any area then we must specifically request it. 203 * If we need privileges in any area then we must specifically request it.
89 * We should only need to be root in these cases: 204 * We should only need to be root in these cases:
90 * 1. write utmp entries on some systems 205 * 1. write utmp entries on some systems
91 * 2. chown tty on some systems 206 * 2. chown tty on some systems
92 */ 207 */
93 rxvt_privileges(aR_ SAVE); 208 privileges (SAVE);
94 rxvt_privileges(aR_ IGNORE); 209 privileges (IGNORE);
95 210
96 rxvt_init_secondary(aR); 211 init_secondary ();
97 212
98 cmd_argv = rxvt_init_resources(aR_ argc, argv); 213 const char **cmd_argv = init_resources (argc, argv);
99 214
100 R->x_ev.start (ConnectionNumber (R->Xdisplay), EVENT_READ); 215 set_locale ("");
101 216
102#if (MENUBAR_MAX) 217#if (MENUBAR_MAX)
103 rxvt_menubar_read(aR_ R->rs[Rs_menu]); 218 menubar_read (rs[Rs_menu]);
104#endif 219#endif
105#ifdef HAVE_SCROLLBARS 220#ifdef HAVE_SCROLLBARS
106 if (R->Options & Opt_scrollBar) 221 if (Options & Opt_scrollBar)
107 scrollbar_setIdle(); /* set existence for size calculations */ 222 scrollBar.setIdle (); /* set existence for size calculations */
108#endif 223#endif
109 224
110 rxvt_Create_Windows(aR_ argc, argv); 225 create_windows (argc, argv);
111 226
112 rxvt_init_xlocale(aR); 227 init_xlocale ();
113 228
114 rxvt_scr_reset(aR); /* initialize screen */ 229 scr_reset (); /* initialize screen */
115#ifdef RXVT_GRAPHICS 230#ifdef RXVT_GRAPHICS
116 rxvt_Gr_reset(aR); /* reset graphics */ 231 Gr_reset (); /* reset graphics */
117#endif 232#endif
118 233
119#if 0 234#if 0
120#ifdef DEBUG_X 235#ifdef DEBUG_X
121 XSynchronize(R->Xdisplay, True); 236 XSynchronize(Xdisplay, True);
122 XSetErrorHandler((XErrorHandler) abort);
123#else
124 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
125#endif 237#endif
126#endif 238#endif
127 239
128#ifdef HAVE_SCROLLBARS 240#ifdef HAVE_SCROLLBARS
129 if (R->Options & Opt_scrollBar) 241 if (Options & Opt_scrollBar)
130 rxvt_Resize_scrollBar(aR); /* create and map scrollbar */ 242 resize_scrollbar (); /* create and map scrollbar */
131#endif 243#endif
132#if (MENUBAR_MAX) 244#if (MENUBAR_MAX)
133 if (menubar_visible(r)) 245 if (menubar_visible(r))
134 XMapWindow(R->Xdisplay, R->menuBar.win); 246 XMapWindow (Xdisplay, menuBar.win);
135#endif 247#endif
136#ifdef TRANSPARENT 248#ifdef TRANSPARENT
137 if (R->Options & Opt_transparent) 249 if (Options & Opt_transparent)
138 { 250 {
139 XSelectInput(R->Xdisplay, Xroot, PropertyChangeMask); 251 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
140 rxvt_check_our_parents(aR); 252 check_our_parents ();
141 } 253 }
142#endif 254#endif
143 XMapWindow(R->Xdisplay, R->TermWin.vt); 255 XMapWindow (Xdisplay, TermWin.vt);
144 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 256 XMapWindow (Xdisplay, TermWin.parent[0]);
145 257
146 rxvt_init_env(aR); 258 init_env ();
147 rxvt_init_command(aR_ cmd_argv); 259 init_command (cmd_argv);
148 260
261 x_ev.start (Xfd, EVENT_READ);
149 R->pty_ev.start (R->cmd_fd, EVENT_READ); 262 pty_ev.start (cmd_fd, EVENT_READ);
150 263
151 return R; 264 check_ev.start ();
265
266 process_x_events ();
267
268 return true;
152} 269}
153 270
154/* ------------------------------------------------------------------------- * 271/* ------------------------------------------------------------------------- *
155 * SIGNAL HANDLING & EXIT HANDLER * 272 * SIGNAL HANDLING & EXIT HANDLER *
156 * ------------------------------------------------------------------------- */ 273 * ------------------------------------------------------------------------- */
160/* ARGSUSED */ 277/* ARGSUSED */
161/* EXTPROTO */ 278/* EXTPROTO */
162RETSIGTYPE 279RETSIGTYPE
163rxvt_Child_signal(int sig __attribute__ ((unused))) 280rxvt_Child_signal(int sig __attribute__ ((unused)))
164{ 281{
165 dR;
166 int pid, save_errno = errno; 282 int pid, save_errno = errno;
167
168 do {
169 errno = 0;
170 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 283 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
171 284 ;
172 if (pid == R->cmd_pid)
173 exit(EXIT_SUCCESS);
174
175 errno = save_errno; 285 errno = save_errno;
176 signal(SIGCHLD, rxvt_Child_signal); 286
287#if 0
288 if (pid == cmd_pid)
289 exit (EXIT_SUCCESS);
290#endif
177} 291}
178 292
179/* 293/*
180 * Catch a fatal signal and tidy up before quitting 294 * Catch a fatal signal and tidy up before quitting
181 */ 295 */
182/* EXTPROTO */ 296/* EXTPROTO */
183RETSIGTYPE 297RETSIGTYPE
184rxvt_Exit_signal(int sig) 298rxvt_Exit_signal(int sig)
185{ 299{
186 signal(sig, SIG_DFL); 300 signal(sig, SIG_DFL);
187#ifdef DEBUG_CMD 301#ifdef DEBUG_CMD
188 rxvt_print_error("signal %d", sig); 302 rxvt_print_error("signal %d", sig);
189#endif 303#endif
190 rxvt_clean_exit(); 304 rxvt_clean_exit();
191 kill(getpid(), sig); 305 kill(getpid(), sig);
192} 306}
193 307
194/* ARGSUSED */ 308/* ARGSUSED */
195/* INTPROTO */ 309/* EXTPROTO */
196int 310int
197rxvt_xerror_handler(const Display * display 311rxvt_xerror_handler(const Display * display
198 __attribute__ ((unused)), const XErrorEvent * event) 312 __attribute__ ((unused)), const XErrorEvent * event)
199{ 313{
200 dR;
201
202 if (R->allowedxerror == -1) { 314 if (GET_R->allowedxerror == -1)
203 R->allowedxerror = event->error_code; 315 GET_R->allowedxerror = event->error_code;
204 return 0; /* ignored anyway */ 316 else
205 } 317 {
206 rxvt_print_error("XError: Request: %d . %d, Error: %d", 318 rxvt_print_error("XError: Request: %d . %d, Error: %d",
207 event->request_code, event->minor_code, 319 event->request_code, event->minor_code,
208 event->error_code); 320 event->error_code);
209/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 321
210 exit(EXIT_FAILURE); 322 GET_R->destroy ();
211/* NOTREACHED */ 323 }
324
325 return 0;
212} 326}
213 327
214/*----------------------------------------------------------------------*/ 328/*----------------------------------------------------------------------*/
215/* 329/*
216 * Exit gracefully, clearing the utmp entry and restoring tty attributes 330 * Exit gracefully, clearing the utmp entry and restoring tty attributes
217 * TODO: if debugging, this should free up any known resources if we can 331 * TODO: if debugging, this should free up any known resources if we can
218 */ 332 */
219/* EXTPROTO */ 333/* EXTPROTO */
220void 334void
221rxvt_clean_exit(void) 335rxvt_clean_exit ()
222{ 336{
223 dR; 337 GET_R->destroy ();
224
225#ifdef DEBUG_SCREEN
226 rxvt_scr_release(aR);
227#endif
228#ifndef NO_SETOWNER_TTYDEV
229 rxvt_privileged_ttydev(aR_ RESTORE);
230#endif
231#ifdef UTMP_SUPPORT
232 rxvt_privileged_utmp(aR_ RESTORE);
233#endif
234#ifdef USE_XIM
235 if (R->Input_Context != NULL) {
236 XDestroyIC(R->Input_Context);
237 R->Input_Context = NULL;
238 }
239#endif
240} 338}
241 339
242/* ------------------------------------------------------------------------- * 340/* ------------------------------------------------------------------------- *
243 * MEMORY ALLOCATION WRAPPERS * 341 * MEMORY ALLOCATION WRAPPERS *
244 * ------------------------------------------------------------------------- */ 342 * ------------------------------------------------------------------------- */
245/* EXTPROTO */ 343/* EXTPROTO */
246void * 344void *
247rxvt_malloc(size_t size) 345rxvt_malloc(size_t size)
248{ 346{
249 void *p; 347 void *p;
250 348
251 p = malloc(size); 349 p = malloc(size);
252 if (p) 350 if (p)
253 return p; 351 return p;
254 352
255 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 353 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
256 rxvt_clean_exit(); 354 rxvt_clean_exit();
257 exit(EXIT_FAILURE); 355 exit(EXIT_FAILURE);
258/* NOTREACHED */ 356 /* NOTREACHED */
259} 357}
260 358
261/* EXTPROTO */ 359/* EXTPROTO */
262void * 360void *
263rxvt_calloc(size_t number, size_t size) 361rxvt_calloc(size_t number, size_t size)
264{ 362{
265 void *p; 363 void *p;
266 364
267 p = calloc(number, size); 365 p = calloc(number, size);
268 if (p) 366 if (p)
269 return p; 367 return p;
270 368
271 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 369 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
272 rxvt_clean_exit(); 370 rxvt_clean_exit();
273 exit(EXIT_FAILURE); 371 exit(EXIT_FAILURE);
274/* NOTREACHED */ 372 /* NOTREACHED */
275} 373}
276 374
277/* EXTPROTO */ 375/* EXTPROTO */
278void * 376void *
279rxvt_realloc(void *ptr, size_t size) 377rxvt_realloc(void *ptr, size_t size)
280{ 378{
281 void *p; 379 void *p;
282 380
283 if (ptr) 381 if (ptr)
284 p = realloc(ptr, size); 382 p = realloc(ptr, size);
285 else 383 else
286 p = malloc(size); 384 p = malloc(size);
287 if (p) 385 if (p)
288 return p; 386 return p;
289 387
290 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 388 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
291 rxvt_clean_exit(); 389 rxvt_clean_exit();
292 exit(EXIT_FAILURE); 390 exit(EXIT_FAILURE);
293/* NOTREACHED */ 391 /* NOTREACHED */
294} 392}
295 393
296/* ------------------------------------------------------------------------- * 394/* ------------------------------------------------------------------------- *
297 * PRIVILEGED OPERATIONS * 395 * PRIVILEGED OPERATIONS *
298 * ------------------------------------------------------------------------- */ 396 * ------------------------------------------------------------------------- */
299/* take care of suid/sgid super-user (root) privileges */ 397/* take care of suid/sgid super-user (root) privileges */
300/* INTPROTO */
301void 398void
302rxvt_privileges(pR_ int mode) 399rxvt_term::privileges (int mode)
303{ 400{
304#if ! defined(__CYGWIN32__) 401#if ! defined(__CYGWIN32__)
305# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 402# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
306/* setreuid() is the poor man's setuid(), seteuid() */ 403 /* setreuid() is the poor man's setuid(), seteuid() */
307# define seteuid(a) setreuid(-1, (a)) 404# define seteuid(a) setreuid(-1, (a))
308# define setegid(a) setregid(-1, (a)) 405# define setegid(a) setregid(-1, (a))
309# define HAVE_SETEUID 406# define HAVE_SETEUID
310# endif 407# endif
311# ifdef HAVE_SETEUID 408# ifdef HAVE_SETEUID
312 switch (mode) { 409 switch (mode)
410 {
313 case IGNORE: 411 case IGNORE:
314 /* 412 /*
315 * change effective uid/gid - not real uid/gid - so we can switch 413 * change effective uid/gid - not real uid/gid - so we can switch
316 * back to root later, as required 414 * back to root later, as required
317 */ 415 */
318 seteuid(getuid()); 416 seteuid(getuid());
319 setegid(getgid()); 417 setegid(getgid());
320 break; 418 break;
321 case SAVE: 419 case SAVE:
322 R->euid = geteuid(); 420 euid = geteuid();
323 R->egid = getegid(); 421 egid = getegid();
324 break; 422 break;
325 case RESTORE: 423 case RESTORE:
326 seteuid(R->euid); 424 seteuid(euid);
327 setegid(R->egid); 425 setegid(egid);
328 break; 426 break;
329 } 427 }
330# else 428# else
331 switch (mode) { 429 switch (mode)
430 {
332 case IGNORE: 431 case IGNORE:
333 setuid(getuid()); 432 setuid(getuid());
334 setgid(getgid()); 433 setgid(getgid());
335 /* FALLTHROUGH */ 434 /* FALLTHROUGH */
336 case SAVE: 435 case SAVE:
337 /* FALLTHROUGH */ 436 /* FALLTHROUGH */
338 case RESTORE: 437 case RESTORE:
339 break; 438 break;
340 } 439 }
341# endif 440# endif
342#endif 441#endif
343} 442}
344 443
345#ifdef UTMP_SUPPORT 444#ifdef UTMP_SUPPORT
346/* EXTPROTO */
347void 445void
348rxvt_privileged_utmp(pR_ char action) 446rxvt_term::privileged_utmp (char action)
349{ 447{
350 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 448 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)",
351 action, R->next_utmp_action, getpid())); 449 action, next_utmp_action, getpid()));
352 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 450 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
353 || (R->Options & Opt_utmpInhibit) 451 || (Options & Opt_utmpInhibit)
354 || R->ttydev == NULL || *R->ttydev == '\0') 452 || ttydev == NULL || *ttydev == '\0')
355 return; 453 return;
356 454
357 rxvt_privileges(aR_ RESTORE); 455 privileges (RESTORE);
358 if (action == SAVE) { 456 if (action == SAVE)
457 {
359 R->next_utmp_action = RESTORE; 458 next_utmp_action = RESTORE;
360 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 459 makeutent (ttydev, rs[Rs_display_name]);
460 }
461 else
361 } else { /* action == RESTORE */ 462 { /* action == RESTORE */
362 R->next_utmp_action = IGNORE; 463 next_utmp_action = IGNORE;
363 rxvt_cleanutent(aR); 464 cleanutent ();
364 } 465 }
365 rxvt_privileges(aR_ IGNORE); 466 privileges (IGNORE);
366} 467}
367#endif 468#endif
368 469
369#ifndef NO_SETOWNER_TTYDEV 470#ifndef NO_SETOWNER_TTYDEV
370/* EXTPROTO */
371void 471void
372rxvt_privileged_ttydev(pR_ char action) 472rxvt_term::privileged_ttydev (char action)
373{ 473{
374 D_MAIN((stderr, 474 D_MAIN((stderr,
375 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 475 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
376 action, R->next_tty_action, getpid())); 476 action, next_tty_action, getpid()));
377 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 477 if (next_tty_action != action || (action != SAVE && action != RESTORE)
378 || R->ttydev == NULL || *R->ttydev == '\0') 478 || ttydev == NULL || *ttydev == '\0')
379 return; 479 return;
380 480
381 rxvt_privileges(aR_ RESTORE); 481 privileges (RESTORE);
382 482
383 if (action == SAVE) { 483 if (action == SAVE)
484 {
384 R->next_tty_action = RESTORE; 485 next_tty_action = RESTORE;
385# ifndef RESET_TTY_TO_COMMON_DEFAULTS 486# ifndef RESET_TTY_TO_COMMON_DEFAULTS
386/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 487 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */
387 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 488 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */
388 R->next_tty_action = IGNORE; 489 next_tty_action = IGNORE;
389 else 490 else
390# endif 491# endif
492
391 { 493 {
392 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 494 chown(ttydev, getuid(), ttygid); /* fail silently */
393 chmod(R->ttydev, R->ttymode); 495 chmod(ttydev, ttymode);
394# ifdef HAVE_REVOKE 496# ifdef HAVE_REVOKE
395 revoke(R->ttydev); 497 revoke(ttydev);
396# endif 498# endif
499
397 } 500 }
501 }
502 else
398 } else { /* action == RESTORE */ 503 { /* action == RESTORE */
399 R->next_tty_action = IGNORE; 504 next_tty_action = IGNORE;
400# ifndef RESET_TTY_TO_COMMON_DEFAULTS 505# ifndef RESET_TTY_TO_COMMON_DEFAULTS
401 chmod(R->ttydev, R->ttyfd_stat.st_mode); 506 chmod(ttydev, ttyfd_stat.st_mode);
402 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 507 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
403# else 508# else
404 chmod(R->ttydev, 509 chmod(ttydev,
405 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 510 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
406 chown(R->ttydev, 0, 0); 511 chown(ttydev, 0, 0);
407# endif 512# endif
408 }
409 513
514 }
515
410 rxvt_privileges(aR_ IGNORE); 516 privileges (IGNORE);
411 517
412# ifndef RESET_TTY_TO_COMMON_DEFAULTS 518# ifndef RESET_TTY_TO_COMMON_DEFAULTS
413 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 519 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
414 action == RESTORE ? "Restoring" : (action == 520 action == RESTORE ? "Restoring" : (action ==
415 SAVE ? "Saving" : 521 SAVE ? "Saving" :
416 "UNKNOWN ERROR for"), R->ttydev, 522 "UNKNOWN ERROR for"), ttydev,
417 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 523 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
418 R->ttyfd_stat.st_gid)); 524 ttyfd_stat.st_gid));
419# endif 525# endif
420} 526}
421#endif 527#endif
422 528
423/*----------------------------------------------------------------------*/ 529/*----------------------------------------------------------------------*/
424/* 530/*
425 * window size/position calculcations for XSizeHint and other storage. 531 * window size/position calculcations for XSizeHint and other storage.
426 * if width/height are non-zero then override calculated width/height 532 * if width/height are non-zero then override calculated width/height
427 */ 533 */
428/* EXTPROTO */
429void 534void
430rxvt_window_calc(pR_ unsigned int width, unsigned int height) 535rxvt_term::window_calc (unsigned int width, unsigned int height)
431{ 536{
432 short recalc_x, recalc_y; 537 short recalc_x, recalc_y;
433 int x, y, sb_w, mb_h, flags; 538 int x, y, sb_w, mb_h, flags;
434 unsigned int w, h; 539 unsigned int w, h;
435 unsigned int max_width, max_height; 540 unsigned int max_width, max_height;
436 541
437 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 542 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
438 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 543 TermWin.ncol, TermWin.nrow, szHint.width,
439 R->szHint.height)); 544 szHint.height));
440 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 545 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
441 R->szHint.win_gravity = NorthWestGravity; 546 szHint.win_gravity = NorthWestGravity;
442/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 547 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
443 548
444 recalc_x = recalc_y = 0; 549 recalc_x = recalc_y = 0;
445 flags = 0; 550 flags = 0;
446 if (!R->parsed_geometry) { 551 if (!parsed_geometry)
552 {
447 R->parsed_geometry = 1; 553 parsed_geometry = 1;
448 if (R->rs[Rs_geometry]) 554 if (rs[Rs_geometry])
449 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 555 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
450 if (flags & WidthValue) { 556 if (flags & WidthValue)
557 {
451 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 558 TermWin.ncol = BOUND_POSITIVE_INT16(w);
452 R->szHint.flags |= USSize; 559 szHint.flags |= USSize;
453 } 560 }
454 if (flags & HeightValue) { 561 if (flags & HeightValue)
562 {
455 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 563 TermWin.nrow = BOUND_POSITIVE_INT16(h);
456 R->szHint.flags |= USSize; 564 szHint.flags |= USSize;
457 } 565 }
458 if (flags & XValue) { 566 if (flags & XValue)
567 {
459 R->szHint.x = x; 568 szHint.x = x;
460 R->szHint.flags |= USPosition; 569 szHint.flags |= USPosition;
461 if (flags & XNegative) { 570 if (flags & XNegative)
571 {
462 recalc_x = 1; 572 recalc_x = 1;
463 R->szHint.win_gravity = NorthEastGravity; 573 szHint.win_gravity = NorthEastGravity;
464 } 574 }
465 } 575 }
466 if (flags & YValue) { 576 if (flags & YValue)
577 {
467 R->szHint.y = y; 578 szHint.y = y;
468 R->szHint.flags |= USPosition; 579 szHint.flags |= USPosition;
469 if (flags & YNegative) { 580 if (flags & YNegative)
581 {
470 recalc_y = 1; 582 recalc_y = 1;
471 if (R->szHint.win_gravity == NorthEastGravity) 583 if (szHint.win_gravity == NorthEastGravity)
472 R->szHint.win_gravity = SouthEastGravity; 584 szHint.win_gravity = SouthEastGravity;
473 else 585 else
474 R->szHint.win_gravity = SouthWestGravity; 586 szHint.win_gravity = SouthWestGravity;
475 } 587 }
476 } 588 }
477 } 589 }
478/* TODO: BOUNDS */ 590 /* TODO: BOUNDS */
479 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 591 TermWin.width = TermWin.ncol * TermWin.fwidth;
480 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 592 TermWin.height = TermWin.nrow * TermWin.fheight;
481 max_width = MAX_COLS * R->TermWin.fwidth; 593 max_width = MAX_COLS * TermWin.fwidth;
482 max_height = MAX_ROWS * R->TermWin.fheight; 594 max_height = MAX_ROWS * TermWin.fheight;
483 595
484 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 596 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
485 597
486 sb_w = mb_h = 0; 598 sb_w = mb_h = 0;
487 R->window_vt_x = R->window_vt_y = 0; 599 window_vt_x = window_vt_y = 0;
488 if (scrollbar_visible(R)) { 600 if (scrollbar_visible ())
601 {
489 sb_w = scrollbar_TotalWidth(); 602 sb_w = scrollbar_TotalWidth();
490 R->szHint.base_width += sb_w; 603 szHint.base_width += sb_w;
491 if (!(R->Options & Opt_scrollBar_right)) 604 if (!(Options & Opt_scrollBar_right))
492 R->window_vt_x = sb_w; 605 window_vt_x = sb_w;
493 } 606 }
494 if (menubar_visible(R)) { 607 if (menubar_visible ())
608 {
495 mb_h = menuBar_TotalHeight(); 609 mb_h = menuBar_TotalHeight();
496 R->szHint.base_height += mb_h; 610 szHint.base_height += mb_h;
497 R->window_vt_y = mb_h; 611 window_vt_y = mb_h;
498 } 612 }
499 R->szHint.width_inc = R->TermWin.fwidth; 613 szHint.width_inc = TermWin.fwidth;
500 R->szHint.height_inc = R->TermWin.fheight; 614 szHint.height_inc = TermWin.fheight;
501 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 615 szHint.min_width = szHint.base_width + szHint.width_inc;
502 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 616 szHint.min_height = szHint.base_height + szHint.height_inc;
503 617
504 if (width && width - R->szHint.base_width < max_width) { 618 if (width && width - szHint.base_width < max_width)
619 {
505 R->szHint.width = width; 620 szHint.width = width;
506 R->TermWin.width = width - R->szHint.base_width; 621 TermWin.width = width - szHint.base_width;
507 } else { 622 }
623 else
624 {
508 MIN_IT(R->TermWin.width, max_width); 625 MIN_IT(TermWin.width, max_width);
509 R->szHint.width = R->szHint.base_width + R->TermWin.width; 626 szHint.width = szHint.base_width + TermWin.width;
510 } 627 }
511 if (height && height - R->szHint.base_height < max_height) { 628 if (height && height - szHint.base_height < max_height)
629 {
512 R->szHint.height = height; 630 szHint.height = height;
513 R->TermWin.height = height - R->szHint.base_height; 631 TermWin.height = height - szHint.base_height;
514 } else { 632 }
633 else
634 {
515 MIN_IT(R->TermWin.height, max_height); 635 MIN_IT(TermWin.height, max_height);
516 R->szHint.height = R->szHint.base_height + R->TermWin.height; 636 szHint.height = szHint.base_height + TermWin.height;
517 } 637 }
518 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 638 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
519 R->window_sb_x = R->szHint.width - sb_w; 639 window_sb_x = szHint.width - sb_w;
520 640
521 if (recalc_x) 641 if (recalc_x)
522 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 642 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
523 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 643 - szHint.width - 2 * TermWin.ext_bwidth);
524 if (recalc_y) 644 if (recalc_y)
525 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 645 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
526 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 646 - szHint.height - 2 * TermWin.ext_bwidth);
527 647
528 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 648 TermWin.ncol = TermWin.width / TermWin.fwidth;
529 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 649 TermWin.nrow = TermWin.height / TermWin.fheight;
530 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 650 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
531 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 651 TermWin.ncol, TermWin.nrow, szHint.width,
532 R->szHint.height)); 652 szHint.height));
533 return; 653 return;
534} 654}
535 655
536/*----------------------------------------------------------------------*/ 656/*----------------------------------------------------------------------*/
537/* 657/*
538 * Tell the teletype handler what size the window is. 658 * Tell the teletype handler what size the window is.
539 * Called after a window size change. 659 * Called after a window size change.
540 */ 660 */
541/* EXTPROTO */
542void 661void
543rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 662rxvt_term::tt_winch ()
544{ 663{
545 struct winsize ws; 664 struct winsize ws;
546 665
547 if (fd < 0) 666 if (cmd_fd < 0)
548 return; 667 return;
668
549 ws.ws_col = col; 669 ws.ws_col = TermWin.ncol;
550 ws.ws_row = row; 670 ws.ws_row = TermWin.nrow;
551 ws.ws_xpixel = ws.ws_ypixel = 0; 671 ws.ws_xpixel = ws.ws_ypixel = 0;
552#ifndef DEBUG_SIZE 672#ifndef DEBUG_SIZE
553 (void)ioctl(fd, TIOCSWINSZ, &ws); 673 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
554#else 674#else
555 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 675 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
556 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 676 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
557 }
558# ifdef SIGWINCH 677# ifdef SIGWINCH
559 else if (pid) /* force through to the command */ 678 else if (cmd_pid) /* force through to the command */
560 kill(pid, SIGWINCH); 679 kill (cmd_pid, SIGWINCH);
561# endif 680# endif
562#endif 681#endif
563} 682}
564 683
565/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
568 * init = 1 - initialize 687 * init = 1 - initialize
569 * 688 *
570 * fontname == FONT_UP - switch to bigger font 689 * fontname == FONT_UP - switch to bigger font
571 * fontname == FONT_DN - switch to smaller font 690 * fontname == FONT_DN - switch to smaller font
572 */ 691 */
573/* EXTPROTO */
574void 692void
575rxvt_change_font(pR_ int init, const char *fontname) 693rxvt_term::change_font (int init, const char *fontname)
576{ 694{}
577}
578 695
579/* INTPROTO */
580void 696void
581rxvt_font_up_down(pR_ int n, int direction) 697rxvt_term::font_up_down (int n, int direction)
582{ 698{}
583}
584 699
585/*----------------------------------------------------------------------*/ 700/*----------------------------------------------------------------------*/
586/*----------------------------------------------------------------------*/ 701/*----------------------------------------------------------------------*/
587/* xterm sequences - title, iconName, color (exptl) */ 702/* xterm sequences - title, iconName, color (exptl) */
588/* EXTPROTO */
589void 703void
590rxvt_set_title(pR_ const char *str) 704rxvt_term::set_title (const char *str)
591{ 705{
592#ifndef SMART_WINDOW_TITLE 706#ifndef SMART_WINDOW_TITLE
593 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 707 XStoreName(Xdisplay, TermWin.parent[0], str);
594#else 708#else
595 char *name; 709 char *name;
596 710
597 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 711 if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0)
598 name = NULL; 712 name = NULL;
599 if (name == NULL || STRCMP(name, str)) 713 if (name == NULL || STRCMP(name, str))
600 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 714 XStoreName(Xdisplay, TermWin.parent[0], str);
601 if (name) 715 if (name)
602 XFree(name); 716 XFree(name);
603#endif 717#endif
604} 718}
605 719
606/* EXTPROTO */
607void 720void
608rxvt_set_iconName(pR_ const char *str) 721rxvt_term::set_iconName (const char *str)
609{ 722{
610#ifndef SMART_WINDOW_TITLE 723#ifndef SMART_WINDOW_TITLE
611 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 724 XSetIconName(Xdisplay, TermWin.parent[0], str);
612#else 725#else
613 char *name; 726 char *name;
614 727
615 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 728 if (XGetIconName(Xdisplay, TermWin.parent[0], &name))
616 name = NULL; 729 name = NULL;
617 if (name == NULL || STRCMP(name, str)) 730 if (name == NULL || STRCMP(name, str))
618 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 731 XSetIconName(Xdisplay, TermWin.parent[0], str);
619 if (name) 732 if (name)
620 XFree(name); 733 XFree(name);
621#endif 734#endif
622} 735}
623 736
624#ifdef XTERM_COLOR_CHANGE 737#ifdef XTERM_COLOR_CHANGE
625/* EXTPROTO */
626void 738void
627rxvt_set_window_color(pR_ int idx, const char *color) 739rxvt_term::set_window_color (int idx, const char *color)
628{ 740{
629 rxvt_color xcol; 741 rxvt_color xcol;
630 int i; 742 int i;
631 743
632 if (color == NULL || *color == '\0') 744 if (color == NULL || *color == '\0')
633 return; 745 return;
634 746
635/* handle color aliases */ 747 /* handle color aliases */
636 if (isdigit(*color)) { 748 if (isdigit(*color))
749 {
637 i = atoi(color); 750 i = atoi(color);
751 if (i >= 8 && i <= 15)
638 if (i >= 8 && i <= 15) { /* bright colors */ 752 { /* bright colors */
639 i -= 8; 753 i -= 8;
640# ifndef NO_BRIGHTCOLOR 754# ifndef NO_BRIGHTCOLOR
641 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 755 PixColors[idx] = PixColors[minBrightCOLOR + i];
642 SET_PIXCOLOR(R, idx); 756 SET_PIXCOLOR(idx);
643 goto Done; 757 goto Done;
644# endif 758# endif
759
645 } 760 }
646 if (i >= 0 && i <= 7) { /* normal colors */ 761 if (i >= 0 && i <= 7)
762 { /* normal colors */
647 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 763 PixColors[idx] = PixColors[minCOLOR + i];
648 SET_PIXCOLOR(R, idx); 764 SET_PIXCOLOR(idx);
649 goto Done; 765 goto Done;
650 } 766 }
651 } 767 }
652 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 768 if (!rXParseAllocColor (& xcol, color))
653 return; 769 return;
654/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 770 /* XStoreColor (Xdisplay, XCMAP, XColor*); */
655 771
656/* 772 /*
657 * FIXME: should free colors here, but no idea how to do it so instead, 773 * FIXME: should free colors here, but no idea how to do it so instead,
658 * so just keep gobbling up the colormap 774 * so just keep gobbling up the colormap
659 */ 775 */
660# if 0 776# if 0
661 for (i = Color_Black; i <= Color_White; i++) 777 for (i = Color_Black; i <= Color_White; i++)
662 if (R->PixColors[idx] == R->PixColors[i]) 778 if (PixColors[idx] == PixColors[i])
663 break; 779 break;
664 if (i > Color_White) { 780 if (i > Color_White)
781 {
665 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 782 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
666 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 783 XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1,
667 DisplayPlanes(R->Xdisplay, Xscreen)); 784 DisplayPlanes(Xdisplay, Xscreen));
668 } 785 }
669# endif 786# endif
670 787
671 R->PixColors[idx] = xcol; 788 PixColors[idx] = xcol;
672 SET_PIXCOLOR(R, idx); 789 SET_PIXCOLOR(idx);
673 790
674/* XSetWindowAttributes attr; */ 791 /* XSetWindowAttributes attr; */
675/* Cursor cursor; */ 792 /* Cursor cursor; */
676 Done: 793Done:
677 if (idx == Color_bg && !(R->Options & Opt_transparent)) 794 if (idx == Color_bg && !(Options & Opt_transparent))
678 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 795 XSetWindowBackground(Xdisplay, TermWin.vt,
679 R->PixColors[Color_bg]); 796 PixColors[Color_bg]);
680 797
681/* handle Color_BD, scrollbar background, etc. */ 798 /* handle Color_BD, scrollbar background, etc. */
682 799
683 rxvt_set_colorfgbg(aR); 800 set_colorfgbg ();
684 rxvt_recolour_cursor(aR); 801 recolour_cursor ();
685/* the only reasonable way to enforce a clean update */ 802 /* the only reasonable way to enforce a clean update */
686 rxvt_scr_poweron(aR); 803 scr_poweron ();
687} 804}
688 805
689#else 806#else
690# define rxvt_set_window_color(aR_ idx,color) ((void)0) 807# define set_window_color (idx,color) ((void)0)
691#endif /* XTERM_COLOR_CHANGE */ 808#endif /* XTERM_COLOR_CHANGE */
692 809
693/* EXTPROTO */
694void 810void
695rxvt_recolour_cursor(pR) 811rxvt_term::recolour_cursor ()
696{ 812{
697 rxvt_color xcol[2];
698
699#if TODO 813#if TODO
814 rxvt_color xcol[2];
815
700 xcol[0] = R->PixColors[Color_pointer]; 816 xcol[0] = PixColors[Color_pointer];
701 xcol[1] = R->PixColors[Color_bg]; 817 xcol[1] = PixColors[Color_bg];
702 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 818 XQueryColors (Xdisplay, XCMAP, xcol, 2);
703 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 819 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
704#endif 820#endif
705} 821}
706 822
707/*----------------------------------------------------------------------*/ 823/*----------------------------------------------------------------------*/
708/* 824/*
709 * find if fg/bg matches any of the normal (low-intensity) colors 825 * find if fg/bg matches any of the normal (low-intensity) colors
710 */ 826 */
711/* INTPROTO */
712void 827void
713rxvt_set_colorfgbg(pR) 828rxvt_term::set_colorfgbg ()
714{ 829{
715 unsigned int i; 830 unsigned int i;
716 const char *xpmb = "\0"; 831 const char *xpmb = "\0";
717 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 832 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];
718 833
719 R->env_colorfgbg = 834 env_colorfgbg =
720 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 835 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);
721 STRCPY(fstr, "default"); 836 STRCPY(fstr, "default");
722 STRCPY(bstr, "default"); 837 STRCPY(bstr, "default");
723 for (i = Color_Black; i <= Color_White; i++) 838 for (i = Color_Black; i <= Color_White; i++)
724 if (R->PixColors[Color_fg] == R->PixColors[i]) { 839 if (PixColors[Color_fg] == PixColors[i])
840 {
725 sprintf(fstr, "%d", (i - Color_Black)); 841 sprintf(fstr, "%d", (i - Color_Black));
726 break; 842 break;
727 } 843 }
728 for (i = Color_Black; i <= Color_White; i++) 844 for (i = Color_Black; i <= Color_White; i++)
729 if (R->PixColors[Color_bg] == R->PixColors[i]) { 845 if (PixColors[Color_bg] == PixColors[i])
846 {
730 sprintf(bstr, "%d", (i - Color_Black)); 847 sprintf(bstr, "%d", (i - Color_Black));
731#ifdef XPM_BACKGROUND 848#ifdef XPM_BACKGROUND
732 xpmb = "default;"; 849 xpmb = "default;";
733#endif 850#endif
734 break; 851 break;
735 } 852 }
736 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 853 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
737 putenv(R->env_colorfgbg); 854 putenv(env_colorfgbg);
738 855
739#ifndef NO_BRIGHTCOLOR 856#ifndef NO_BRIGHTCOLOR
740 R->colorfgbg = DEFAULT_RSTYLE; 857 colorfgbg = DEFAULT_RSTYLE;
741 for (i = minCOLOR; i <= maxCOLOR; i++) { 858 for (i = minCOLOR; i <= maxCOLOR; i++)
859 {
742 if (R->PixColors[Color_fg] == R->PixColors[i]) 860 if (PixColors[Color_fg] == PixColors[i])
743 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 861 colorfgbg = SET_FGCOLOR(colorfgbg, i);
744 if (R->PixColors[Color_bg] == R->PixColors[i]) 862 if (PixColors[Color_bg] == PixColors[i])
745 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 863 colorfgbg = SET_BGCOLOR(colorfgbg, i);
746 } 864 }
747#endif 865#endif
748} 866}
749 867
750/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
751/* 869/*
752 * Colour determination for low colour displays, routine from 870 * Colour determination for low colour displays, routine from
753 * Hans de Goede <hans@highrise.nl> 871 * Hans de Goede <hans@highrise.nl>
754 */ 872 */
755 873
756/* EXTPROTO */
757int 874int
758rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 875rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
759{ 876{
760 screen_in_out->set(aR_ colour);
761
762 if (!screen_in_out->set(aR_ colour)) { 877 if (!screen_in_out->set (this, colour))
878 {
763 rxvt_print_error("can't allocate colour: %s", colour); 879 rxvt_print_error("can't allocate colour: %s", colour);
764 return false; 880 return false;
765 } 881 }
766 882
767 return true; 883 return true;
768} 884}
769 885
770/* -------------------------------------------------------------------- * 886/* -------------------------------------------------------------------- *
771 * - WINDOW RESIZING - * 887 * - WINDOW RESIZING - *
772 * -------------------------------------------------------------------- */ 888 * -------------------------------------------------------------------- */
773/* EXTPROTO */
774void 889void
775rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 890rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
776 int ignoreparent)
777{ 891{
778 int fix_screen; 892 int fix_screen;
779 893
780#ifdef SMART_RESIZE 894#ifdef SMART_RESIZE
781 int old_width = R->szHint.width, old_height = R->szHint.height; 895 int old_width = szHint.width, old_height = szHint.height;
782#endif 896#endif
783 897
784 rxvt_window_calc(aR_ width, height); 898 window_calc (width, height);
785 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 899 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
786 if (!ignoreparent) { 900 if (!ignoreparent)
901 {
787#ifdef SMART_RESIZE 902#ifdef SMART_RESIZE
788/* 903 /*
789 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 904 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
790 * reposition window on resize depending on placement on screen 905 * reposition window on resize depending on placement on screen
791 */ 906 */
792 int x, y, x1, y1; 907 int x, y, x1, y1;
793 int dx, dy; 908 int dx, dy;
794 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 909 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
795 Window unused_cr; 910 Window unused_cr;
796 911
797 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 912 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
798 0, 0, &x, &y, &unused_cr); 913 0, 0, &x, &y, &unused_cr);
799 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 914 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
800 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 915 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
801 /* 916 /*
802 * if Xroot isn't the parent window, a WM will probably have offset 917 * if Xroot isn't the parent window, a WM will probably have offset
803 * our position for handles and decorations. Counter it 918 * our position for handles and decorations. Counter it
804 */ 919 */
805 if (x1 != x || y1 != y) { 920 if (x1 != x || y1 != y)
921 {
806 x -= x1; 922 x -= x1;
807 y -= y1; 923 y -= y1;
808 } 924 }
809 925
810 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 926 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2;
811 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 927 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2;
812 dx = old_width - R->szHint.width; 928 dx = old_width - szHint.width;
813 dy = old_height - R->szHint.height; 929 dy = old_height - szHint.height;
814 930
815 /* Check position of the center of the window */ 931 /* Check position of the center of the window */
816 if (x < x1) /* left half */ 932 if (x < x1) /* left half */
817 dx = 0; 933 dx = 0;
818 else if (x == x1) /* exact center */ 934 else if (x == x1) /* exact center */
819 dx /= 2; 935 dx /= 2;
820 if (y < y1) /* top half */ 936 if (y < y1) /* top half */
821 dy = 0; 937 dy = 0;
822 else if (y == y1) /* exact center */ 938 else if (y == y1) /* exact center */
823 dy /= 2; 939 dy /= 2;
824 940
825 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 941 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy,
826 R->szHint.width, R->szHint.height); 942 szHint.width, szHint.height);
827#else 943#else
828 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 944 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width,
829 R->szHint.height); 945 szHint.height);
830#endif 946#endif
831 }
832 947
948 }
949
833 fix_screen = (R->TermWin.ncol != R->prev_ncol 950 fix_screen = (TermWin.ncol != prev_ncol
834 || R->TermWin.nrow != R->prev_nrow); 951 || TermWin.nrow != prev_nrow);
952
835 if (fix_screen || width != R->old_width || height != R->old_height) { 953 if (fix_screen || width != old_width || height != old_height)
954 {
836 if (scrollbar_visible(R)) { 955 if (scrollbar_visible ())
956 {
837 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 957 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x,
838 0, scrollbar_TotalWidth(), R->szHint.height); 958 0, scrollbar_TotalWidth (), szHint.height);
839 rxvt_Resize_scrollBar(aR); 959 resize_scrollbar ();
840 } 960 }
961
841 if (menubar_visible(R)) 962 if (menubar_visible ())
842 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 963 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
843 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 964 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
965
844 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 966 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
845 R->window_vt_y, TermWin_TotalWidth(), 967 window_vt_y, TermWin_TotalWidth (),
846 TermWin_TotalHeight()); 968 TermWin_TotalHeight ());
847#ifdef RXVT_GRAPHICS 969#ifdef RXVT_GRAPHICS
848 if (R->old_height) 970 if (old_height)
849 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width, 971 Gr_Resize (old_width - szHint.base_width,
850 R->old_height - R->szHint.base_height); 972 old_height - szHint.base_height);
851#endif 973#endif
852 rxvt_scr_clear(aR); 974 scr_clear ();
853#ifdef XPM_BACKGROUND 975#ifdef XPM_BACKGROUND
854 rxvt_resize_pixmap(aR); 976 resize_pixmap ();
855#endif 977#endif
856 }
857 978
979 }
980
858 if (fix_screen || R->old_height == 0) { 981 if (fix_screen || old_height == 0)
982 {
859 int curr_screen = -1; 983 int curr_screen = -1;
860 uint16_t old_ncol = R->prev_ncol; 984 int old_ncol = prev_ncol;
861 985
862 /* scr_reset only works on the primary screen */ 986 /* scr_reset only works on the primary screen */
863 if (R->old_height) /* this is not the first time through */ 987 if (old_height) /* this is not the first time through */
988 {
989 unsigned int ncol = TermWin.ncol;
990 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
864 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 991 curr_screen = scr_change_screen (PRIMARY);
865 rxvt_scr_reset(aR); 992 TermWin.ncol = ncol;
866 if (curr_screen >= 0) { /* this is not the first time through */
867 rxvt_scr_change_screen(aR_ curr_screen);
868 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
869 } 993 }
870 }
871 994
995 scr_reset();
996
997 if (curr_screen >= 0) /* this is not the first time through */
998 {
999 scr_change_screen (curr_screen);
1000 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1001 }
1002 }
1003
872 R->old_width = R->szHint.width; 1004 old_width = szHint.width;
873 R->old_height = R->szHint.height; 1005 old_height = szHint.height;
874 1006
875#ifdef USE_XIM 1007#ifdef USE_XIM
876 rxvt_IMSetStatusPosition(aR); 1008 IMSetStatusPosition ();
877#endif 1009#endif
878} 1010}
879 1011
880/* 1012/*
881 * Set the width/height of the vt window in characters. Units are pixels. 1013 * Set the width/height of the vt window in characters. Units are pixels.
882 * good for toggling 80/132 columns 1014 * good for toggling 80/132 columns
883 */ 1015 */
884/* EXTPROTO */
885void 1016void
886rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1017rxvt_term::set_widthheight (unsigned int width, unsigned int height)
887{ 1018{
888 XWindowAttributes wattr; 1019 XWindowAttributes wattr;
889 1020
890 if (width == 0 || height == 0) { 1021 if (width == 0 || height == 0)
1022 {
891 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1023 XGetWindowAttributes(Xdisplay, Xroot, &wattr);
892 if (width == 0) 1024 if (width == 0)
893 width = wattr.width - R->szHint.base_width; 1025 width = wattr.width - szHint.base_width;
894 if (height == 0) 1026 if (height == 0)
895 height = wattr.height - R->szHint.base_height; 1027 height = wattr.height - szHint.base_height;
896 } 1028 }
897 if (width != R->TermWin.width || height != R->TermWin.height) { 1029 if (width != TermWin.width || height != TermWin.height)
1030 {
898 width += R->szHint.base_width; 1031 width += szHint.base_width;
899 height += R->szHint.base_height; 1032 height += szHint.base_height;
900 rxvt_resize_all_windows(aR_ width, height, 0); 1033 resize_all_windows (width, height, 0);
901 } 1034 }
902} 1035}
903 1036
904/* -------------------------------------------------------------------- * 1037/* -------------------------------------------------------------------- *
905 * - X INPUT METHOD ROUTINES - * 1038 * - X INPUT METHOD ROUTINES - *
906 * -------------------------------------------------------------------- */ 1039 * -------------------------------------------------------------------- */
907#ifdef USE_XIM 1040#ifdef USE_XIM
908/* INTPROTO */
909void 1041void
910rxvt_setSize(pR_ XRectangle * size) 1042rxvt_term::set_size (XRectangle *size)
911{ 1043{
912 size->x = R->TermWin.int_bwidth; 1044 size->x = TermWin.int_bwidth;
913 size->y = R->TermWin.int_bwidth; 1045 size->y = TermWin.int_bwidth;
914 size->width = Width2Pixel(R->TermWin.ncol); 1046 size->width = Width2Pixel(TermWin.ncol);
915 size->height = Height2Pixel(R->TermWin.nrow); 1047 size->height = Height2Pixel(TermWin.nrow);
916} 1048}
917 1049
918/* INTPROTO */
919void 1050void
920rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1051rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
921{ 1052{
922 *fg = R->PixColors[Color_fg]; 1053 *fg = PixColors[Color_fg];
923 *bg = R->PixColors[Color_bg]; 1054 *bg = PixColors[Color_bg];
924} 1055}
925 1056
926/* Checking whether input method is running. */ 1057/* Checking whether input method is running. */
927/* INTPROTO */
928Bool 1058bool
929rxvt_IMisRunning(pR) 1059rxvt_term::IMisRunning ()
930{ 1060{
931 char *p; 1061 char *p;
932 Atom atom; 1062 Atom atom;
933 Window win; 1063 Window win;
934 char server[IMBUFSIZ]; 1064 char server[IMBUFSIZ];
935 1065
936/* get current locale modifier */ 1066 /* get current locale modifier */
937 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1067 if ((p = XSetLocaleModifiers(NULL)) != NULL)
1068 {
938 STRCPY(server, "@server="); 1069 STRCPY(server, "@server=");
939 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1070 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */
940 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1071 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */
941 *p = '\0'; 1072 *p = '\0';
942 1073
943 atom = XInternAtom(R->Xdisplay, server, False); 1074 atom = XInternAtom(Xdisplay, server, False);
944 win = XGetSelectionOwner(R->Xdisplay, atom); 1075 win = XGetSelectionOwner(Xdisplay, atom);
945 if (win != None) 1076 if (win != None)
946 return True; 1077 return True;
947 } 1078 }
948 return False; 1079 return False;
949} 1080}
950 1081
1082void
1083rxvt_term::IMSendSpot ()
1084{
1085 XPoint spot;
1086 XVaNestedList preedit_attr;
1087
1088 if (Input_Context == NULL
1089 || !TermWin.focus || !(input_style & XIMPreeditPosition)
1090 || !(event_type == KeyPress
1091 || event_type == Expose
1092 || event_type == NoExpose
1093 || event_type == SelectionNotify
1094 || event_type == ButtonRelease || event_type == FocusIn)
1095 || !IMisRunning ())
1096 return;
1097
1098 set_position (&spot);
1099
1100 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1101 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1102 XFree(preedit_attr);
1103}
1104
1105void
1106rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1107 XRectangle * needed_rect)
1108{
1109 int mbh, vtx = 0;
1110
1111 if (scrollbar_visible () && !(Options & Opt_scrollBar_right))
1112 vtx = scrollbar_TotalWidth();
1113
1114 mbh = menubar_visible () ? menuBar_TotalHeight() : 0;
1115 mbh -= TermWin.lineSpace;
1116
1117 preedit_rect->x = needed_rect->width + vtx;
1118 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1119
1120 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1121 preedit_rect->height = Height2Pixel(1);
1122
1123 status_rect->x = vtx;
1124 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1125
1126 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1127 status_rect->height = Height2Pixel(1);
1128}
1129
1130/* ARGSUSED */
951/* EXTPROTO */ 1131/* EXTPROTO */
952void
953rxvt_IMSendSpot(pR)
954{
955 XPoint spot;
956 XVaNestedList preedit_attr;
957
958 if (R->Input_Context == NULL
959 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition)
960 || !(R->event_type == KeyPress
961 || R->event_type == Expose
962 || R->event_type == NoExpose
963 || R->event_type == SelectionNotify
964 || R->event_type == ButtonRelease || R->event_type == FocusIn)
965 || !rxvt_IMisRunning(aR))
966 return;
967
968 rxvt_setPosition(aR_ & spot);
969
970 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
971 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
972 XFree(preedit_attr);
973}
974
975/* EXTPROTO */
976void
977rxvt_setTermFontSet(pR_ int idx)
978{
979 char *string;
980 long length;
981 int success = 0;
982
983 if (idx < 0 || idx >= MAX_NFONTS)
984 return;
985}
986
987/* INTPROTO */
988void
989rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect,
990 XRectangle * needed_rect)
991{
992 int mbh, vtx = 0;
993
994 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
995 vtx = scrollbar_TotalWidth();
996 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0;
997 mbh -= R->TermWin.lineSpace;
998
999 preedit_rect->x = needed_rect->width + vtx;
1000 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1001
1002 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width
1003 + vtx;
1004 preedit_rect->height = Height2Pixel(1);
1005
1006 status_rect->x = vtx;
1007 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1008
1009 status_rect->width = needed_rect->width ? needed_rect->width
1010 : Width2Pixel(R->TermWin.ncol + 1);
1011 status_rect->height = Height2Pixel(1);
1012}
1013
1014/* ARGSUSED */
1015/* INTPROTO */
1016void 1132void
1017rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1133rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data
1018 __attribute__ ((unused)), XPointer call_data 1134 __attribute__ ((unused)), XPointer call_data
1019 __attribute__ ((unused))) 1135 __attribute__ ((unused)))
1020{ 1136{
1021 dR;
1022
1023 R->Input_Context = NULL; 1137 GET_R->Input_Context = NULL;
1024/* To avoid Segmentation Fault in C locale: Solaris only? */ 1138 /* To avoid Segmentation Fault in C locale: Solaris only? */
1025 if (STRCMP(R->locale, "C")) 1139 if (STRCMP (GET_R->locale, "C"))
1026 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1140 XRegisterIMInstantiateCallback(GET_R->Xdisplay, NULL, NULL, NULL,
1027 rxvt_IMInstantiateCallback, NULL); 1141 rxvt_IMInstantiateCallback, NULL);
1142}
1143
1144/*
1145 * Try to open a XIM with the current modifiers, then see if we can
1146 * open a suitable preedit type
1147 */
1148bool
1149rxvt_term::IM_get_IC ()
1150{
1151 int i, j, found;
1152 XIM xim;
1153 XPoint spot;
1154 XRectangle rect, status_rect, needed_rect;
1155 unsigned long fg, bg;
1156 const char *p;
1157 char **s;
1158 XIMStyles *xim_styles;
1159 XVaNestedList preedit_attr, status_attr;
1160 XIMCallback ximcallback;
1161
1162 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1163 xim = XOpenIM (Xdisplay, NULL, NULL, NULL);
1164 if (xim == NULL)
1165 return False;
1166
1167 xim_styles = NULL;
1168 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1169 || !xim_styles || !xim_styles->count_styles)
1170 {
1171 XCloseIM(xim);
1172 return False;
1173 }
1174
1175 p = rs[Rs_preeditType] ? rs[Rs_preeditType]
1176 : "OverTheSpot,OffTheSpot,Root";
1177 s = rxvt_splitcommastring(p);
1178 for (i = found = 0; !found && s[i]; i++)
1179 {
1180 if (!STRCMP(s[i], "OverTheSpot"))
1181 input_style = (XIMPreeditPosition | XIMStatusNothing);
1182 else if (!STRCMP(s[i], "OffTheSpot"))
1183 input_style = (XIMPreeditArea | XIMStatusArea);
1184 else if (!STRCMP(s[i], "Root"))
1185 input_style = (XIMPreeditNothing | XIMStatusNothing);
1186
1187 for (j = 0; j < xim_styles->count_styles; j++)
1188 if (input_style == xim_styles->supported_styles[j])
1189 {
1190 found = 1;
1191 break;
1192 }
1193 }
1194 for (i = 0; s[i]; i++)
1195 free(s[i]);
1196 free(s);
1197 XFree(xim_styles);
1198
1199 if (!found)
1200 {
1201 XCloseIM(xim);
1202 return False;
1203 }
1204
1205 ximcallback.callback = rxvt_IMDestroyCallback;
1206
1207 /* XXX: not sure why we need this (as well as IC one below) */
1208 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1209
1210 preedit_attr = status_attr = NULL;
1211
1212 if (input_style & XIMPreeditPosition)
1213 {
1214 set_size (&rect);
1215 set_position (&spot);
1216 set_color (&fg, &bg);
1217
1218 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1219 XNSpotLocation, &spot,
1220 XNForeground, fg, XNBackground, bg,
1221 //XNFontSet, TermWin.fontset,
1222 NULL);
1223 }
1224 else if (input_style & XIMPreeditArea)
1225 {
1226 set_color (&fg, &bg);
1227
1228 /*
1229 * The necessary width of preedit area is unknown
1230 * until create input context.
1231 */
1232 needed_rect.width = 0;
1233
1234 set_preedit_area(&rect, &status_rect, &needed_rect);
1235
1236 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1237 XNForeground, fg, XNBackground, bg,
1238 //XNFontSet, TermWin.fontset,
1239 NULL);
1240 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1241 XNForeground, fg, XNBackground, bg,
1242 //XNFontSet, TermWin.fontset,
1243 NULL);
1244 }
1245 Input_Context = XCreateIC(xim, XNInputStyle, input_style,
1246 XNClientWindow, TermWin.parent[0],
1247 XNFocusWindow, TermWin.parent[0],
1248 XNDestroyCallback, &ximcallback,
1249 preedit_attr ? XNPreeditAttributes : NULL,
1250 preedit_attr,
1251 status_attr ? XNStatusAttributes : NULL,
1252 status_attr, NULL);
1253 if (preedit_attr)
1254 XFree(preedit_attr);
1255 if (status_attr)
1256 XFree(status_attr);
1257 if (Input_Context == NULL)
1258 {
1259 rxvt_print_error("failed to create input context");
1260 XCloseIM(xim);
1261 return False;
1262 }
1263 if (input_style & XIMPreeditArea)
1264 IMSetStatusPosition ();
1265 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1266 return True;
1028} 1267}
1029 1268
1030/* 1269/*
1031 * X manual pages and include files don't match on some systems: 1270 * X manual pages and include files don't match on some systems:
1032 * some think this is an XIDProc and others an XIMProc so we can't 1271 * some think this is an XIDProc and others an XIMProc so we can't
1039rxvt_IMInstantiateCallback(Display * unused 1278rxvt_IMInstantiateCallback(Display * unused
1040 __attribute__ ((unused)), XPointer client_data 1279 __attribute__ ((unused)), XPointer client_data
1041 __attribute__ ((unused)), XPointer call_data 1280 __attribute__ ((unused)), XPointer call_data
1042 __attribute__ ((unused))) 1281 __attribute__ ((unused)))
1043{ 1282{
1044 dR;
1045 int i, found, had_im; 1283 int i, found, had_im;
1046 const char *p; 1284 const char *p;
1047 char **s; 1285 char **s;
1048 char buf[IMBUFSIZ]; 1286 char buf[IMBUFSIZ];
1049 1287
1050 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1288 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1051 if (R->Input_Context) 1289 if (GET_R->Input_Context)
1052 return; 1290 return;
1053 1291
1054 found = had_im = 0; 1292#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1293 if (GET_R->rs[Rs_imLocale])
1294 setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]);
1295#endif
1296
1055 p = R->rs[Rs_inputMethod]; 1297 p = GET_R->rs[Rs_inputMethod];
1056 if (p && *p) { 1298 if (p && *p)
1057 had_im = 1; 1299 {
1300 bool found = false;
1301
1058 s = rxvt_splitcommastring(p); 1302 s = rxvt_splitcommastring (p);
1059 for (i = 0; s[i]; i++) { 1303 for (i = 0; s[i]; i++)
1304 {
1060 if (*s[i]) { 1305 if (*s[i])
1306 {
1061 STRCPY(buf, "@im="); 1307 STRCPY (buf, "@im=");
1062 STRNCAT(buf, s[i], IMBUFSIZ - 5); 1308 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1063 if ((p = XSetLocaleModifiers(buf)) != NULL && *p 1309 if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ())
1064 && (rxvt_IM_get_IC(aR) == True)) { 1310 {
1065 found = 1; 1311 found = true;
1066 break; 1312 break;
1067 } 1313 }
1068 } 1314 }
1069 } 1315 }
1070 for (i = 0; s[i]; i++) 1316 for (i = 0; s[i]; i++)
1071 free(s[i]);
1072 free(s);
1073 }
1074 if (found)
1075 return;
1076
1077/* try with XMODIFIERS env. var. */
1078 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1079 rxvt_IM_get_IC(aR);
1080 return;
1081 }
1082
1083/* try with no modifiers base IF the user didn't specify an IM */
1084 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1085 && rxvt_IM_get_IC(aR) == True)
1086 return;
1087}
1088
1089/*
1090 * Try to open a XIM with the current modifiers, then see if we can
1091 * open a suitable preedit type
1092 */
1093/* INTPROTO */
1094Bool
1095rxvt_IM_get_IC(pR)
1096{
1097 int i, j, found;
1098 XIM xim;
1099 XPoint spot;
1100 XRectangle rect, status_rect, needed_rect;
1101 unsigned long fg, bg;
1102 const char *p;
1103 char **s;
1104 XIMStyles *xim_styles;
1105 XVaNestedList preedit_attr, status_attr;
1106 XIMCallback ximcallback;
1107
1108 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1109 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1110 if (xim == NULL)
1111 return False;
1112
1113 xim_styles = NULL;
1114 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1115 || !xim_styles || !xim_styles->count_styles) {
1116 XCloseIM(xim);
1117 return False;
1118 }
1119
1120 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1121 : "OverTheSpot,OffTheSpot,Root";
1122 s = rxvt_splitcommastring(p);
1123 for (i = found = 0; !found && s[i]; i++) {
1124 if (!STRCMP(s[i], "OverTheSpot"))
1125 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1126 else if (!STRCMP(s[i], "OffTheSpot"))
1127 R->input_style = (XIMPreeditArea | XIMStatusArea);
1128 else if (!STRCMP(s[i], "Root"))
1129 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1130
1131 for (j = 0; j < xim_styles->count_styles; j++)
1132 if (R->input_style == xim_styles->supported_styles[j]) {
1133 found = 1;
1134 break;
1135 }
1136 }
1137 for (i = 0; s[i]; i++)
1138 free(s[i]); 1317 free(s[i]);
1139 free(s); 1318 free(s);
1140 XFree(xim_styles);
1141 1319
1142 if (!found) { 1320 if (found)
1143 XCloseIM(xim); 1321 goto done;
1144 return False;
1145 } 1322 }
1146 1323
1147 ximcallback.callback = rxvt_IMDestroyCallback; 1324 /* try with XMODIFIERS env. var. */
1325 if ((p = XSetLocaleModifiers ("")) && *p
1326 && GET_R->IM_get_IC ())
1327 goto done;
1148 1328
1149/* XXX: not sure why we need this (as well as IC one below) */ 1329 /* try with no modifiers base IF the user didn't specify an IM */
1150 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1330 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1331 && GET_R->IM_get_IC () == True)
1332 goto done;
1151 1333
1152 preedit_attr = status_attr = NULL; 1334done:
1153 1335#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1154 if (R->input_style & XIMPreeditPosition) { 1336 if (GET_R->rs[Rs_imLocale])
1155 rxvt_setSize(aR_ & rect); 1337 setlocale (LC_CTYPE, GET_R->locale);
1156 rxvt_setPosition(aR_ & spot); 1338#endif
1157 rxvt_setColor(aR_ & fg, &bg);
1158
1159 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1160 XNSpotLocation, &spot,
1161 XNForeground, fg, XNBackground, bg,
1162 //XNFontSet, R->TermWin.fontset,
1163 NULL);
1164 } else if (R->input_style & XIMPreeditArea) {
1165 rxvt_setColor(aR_ & fg, &bg);
1166
1167 /*
1168 * The necessary width of preedit area is unknown
1169 * until create input context.
1170 */
1171 needed_rect.width = 0;
1172
1173 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1174
1175 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1176 XNForeground, fg, XNBackground, bg,
1177 //XNFontSet, R->TermWin.fontset,
1178 NULL);
1179 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1180 XNForeground, fg, XNBackground, bg,
1181 //XNFontSet, R->TermWin.fontset,
1182 NULL);
1183 }
1184 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1185 XNClientWindow, R->TermWin.parent[0],
1186 XNFocusWindow, R->TermWin.parent[0],
1187 XNDestroyCallback, &ximcallback,
1188 preedit_attr ? XNPreeditAttributes : NULL,
1189 preedit_attr,
1190 status_attr ? XNStatusAttributes : NULL,
1191 status_attr, NULL);
1192 if (preedit_attr)
1193 XFree(preedit_attr);
1194 if (status_attr)
1195 XFree(status_attr);
1196 if (R->Input_Context == NULL) {
1197 rxvt_print_error("failed to create input context");
1198 XCloseIM(xim);
1199 return False;
1200 }
1201 if (R->input_style & XIMPreeditArea)
1202 rxvt_IMSetStatusPosition(aR);
1203 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1204 return True;
1205} 1339}
1206 1340
1207/* EXTPROTO */
1208void 1341void
1209rxvt_IMSetStatusPosition(pR) 1342rxvt_term::IMSetStatusPosition ()
1210{ 1343{
1211 XRectangle preedit_rect, status_rect, *needed_rect; 1344 XRectangle preedit_rect, status_rect, *needed_rect;
1212 XVaNestedList preedit_attr, status_attr; 1345 XVaNestedList preedit_attr, status_attr;
1213 1346
1214 if (R->Input_Context == NULL 1347 if (Input_Context == NULL
1215 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1348 || !TermWin.focus || !(input_style & XIMPreeditArea)
1216 || !rxvt_IMisRunning(aR)) 1349 || !IMisRunning ())
1217 return; 1350 return;
1218 1351
1219/* Getting the necessary width of preedit area */ 1352 /* Getting the necessary width of preedit area */
1220 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1353 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1221 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1354 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);
1222 XFree(status_attr); 1355 XFree(status_attr);
1223 1356
1224 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1357 set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1225 1358
1226 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1359 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1227 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1360 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1228 1361
1229 XSetICValues(R->Input_Context, 1362 XSetICValues(Input_Context,
1230 XNPreeditAttributes, preedit_attr, 1363 XNPreeditAttributes, preedit_attr,
1231 XNStatusAttributes, status_attr, NULL); 1364 XNStatusAttributes, status_attr, NULL);
1232 1365
1233 XFree(preedit_attr); 1366 XFree(preedit_attr);
1234 XFree(status_attr); 1367 XFree(status_attr);
1235} 1368}
1236#endif /* USE_XIM */ 1369#endif /* USE_XIM */
1237 1370
1238/*----------------------------------------------------------------------*/ 1371/*----------------------------------------------------------------------*/
1239rxvt_t rxvt_current_term; 1372rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines