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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.30 by pcg, Thu Feb 12 01:53:25 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines