… | |
… | |
30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
31 | *---------------------------------------------------------------------*/ |
31 | *---------------------------------------------------------------------*/ |
32 | |
32 | |
33 | #include "../config.h" /* NECESSARY */ |
33 | #include "../config.h" /* NECESSARY */ |
34 | #include "rxvt.h" /* NECESSARY */ |
34 | #include "rxvt.h" /* NECESSARY */ |
35 | #include "main.intpro" /* PROTOS for internal routines */ |
|
|
36 | |
35 | |
37 | #include <csignal> |
36 | #include <csignal> |
|
|
37 | #include <cstring> |
38 | |
38 | |
39 | #ifdef TTY_GID_SUPPORT |
39 | #ifdef TTY_GID_SUPPORT |
40 | # include <grp.h> |
40 | # include <grp.h> |
41 | #endif |
41 | #endif |
42 | |
42 | |
43 | #ifdef HAVE_TERMIOS_H |
43 | #ifdef HAVE_TERMIOS_H |
44 | # include <termios.h> |
44 | # include <termios.h> |
45 | #endif |
45 | #endif |
46 | |
46 | |
47 | #include <cstring> |
47 | #ifdef KEYSYM_RESOURCE |
|
|
48 | # include "keyboard.h" |
|
|
49 | #endif |
48 | |
50 | |
49 | vector<rxvt_term *> rxvt_term::termlist; |
51 | vector<rxvt_term *> rxvt_term::termlist; |
50 | |
52 | |
51 | static char curlocale[128]; |
53 | static char curlocale[128]; |
52 | |
54 | |
… | |
… | |
155 | pointer_ev (this, &rxvt_term::pointer_cb), |
157 | pointer_ev (this, &rxvt_term::pointer_cb), |
156 | #endif |
158 | #endif |
157 | #ifdef USE_XIM |
159 | #ifdef USE_XIM |
158 | im_ev (this, &rxvt_term::im_cb), |
160 | im_ev (this, &rxvt_term::im_cb), |
159 | #endif |
161 | #endif |
160 | sw_term (this, &rxvt_term::sig_term), |
|
|
161 | sw_chld (this, &rxvt_term::sig_chld), |
|
|
162 | termwin_ev (this, &rxvt_term::x_cb), |
162 | termwin_ev (this, &rxvt_term::x_cb), |
163 | vt_ev (this, &rxvt_term::x_cb), |
163 | vt_ev (this, &rxvt_term::x_cb), |
164 | check_ev (this, &rxvt_term::check_cb), |
164 | check_ev (this, &rxvt_term::check_cb), |
165 | flush_ev (this, &rxvt_term::flush_cb), |
165 | flush_ev (this, &rxvt_term::flush_cb), |
166 | destroy_ev (this, &rxvt_term::destroy_cb), |
166 | destroy_ev (this, &rxvt_term::destroy_cb), |
… | |
… | |
168 | incr_ev (this, &rxvt_term::incr_cb) |
168 | incr_ev (this, &rxvt_term::incr_cb) |
169 | { |
169 | { |
170 | cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |
170 | cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |
171 | |
171 | |
172 | termlist.push_back (this); |
172 | termlist.push_back (this); |
173 | } |
|
|
174 | |
173 | |
175 | rxvt_term::~rxvt_term () |
174 | #ifdef KEYSYM_RESOURCE |
176 | { |
175 | keyboard = new keyboard_manager; |
177 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
|
|
178 | |
176 | |
|
|
177 | if (!keyboard) |
|
|
178 | rxvt_fatal ("out of memory, aborting.\n"); |
|
|
179 | #endif |
|
|
180 | } |
|
|
181 | |
|
|
182 | // clean up the most important stuff, do *not* call x or free mem etc. |
|
|
183 | // for use before an emergency exit |
|
|
184 | void rxvt_term::emergency_cleanup () |
|
|
185 | { |
179 | if (cmd_pid) |
186 | if (cmd_pid) |
180 | kill (-cmd_pid, SIGHUP); |
187 | kill (-cmd_pid, SIGHUP); |
181 | |
188 | |
182 | pty.put (); |
|
|
183 | |
|
|
184 | #ifdef UTMP_SUPPORT |
189 | #ifdef UTMP_SUPPORT |
185 | privileged_utmp (RESTORE); |
190 | privileged_utmp (RESTORE); |
186 | #endif |
191 | #endif |
|
|
192 | |
|
|
193 | pty.put (); |
|
|
194 | } |
|
|
195 | |
|
|
196 | rxvt_term::~rxvt_term () |
|
|
197 | { |
|
|
198 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
|
|
199 | |
|
|
200 | emergency_cleanup (); |
187 | |
201 | |
188 | #if ENABLE_STYLES |
202 | #if ENABLE_STYLES |
189 | for (int i = RS_styleCount; --i; ) |
203 | for (int i = RS_styleCount; --i; ) |
190 | if (TermWin.fontset[i] != TermWin.fontset[0]) |
204 | if (TermWin.fontset[i] != TermWin.fontset[0]) |
191 | delete TermWin.fontset[i]; |
205 | delete TermWin.fontset[i]; |
192 | #endif |
206 | #endif |
193 | delete TermWin.fontset[0]; |
207 | delete TermWin.fontset[0]; |
194 | |
208 | |
195 | if (display) |
209 | if (display) |
196 | { |
210 | { |
|
|
211 | dDisp; |
|
|
212 | |
197 | selection_clear (); |
213 | selection_clear (); |
198 | |
214 | |
199 | #ifdef USE_XIM |
215 | #ifdef USE_XIM |
200 | im_destroy (); |
216 | im_destroy (); |
201 | #endif |
217 | #endif |
202 | #ifdef MENUBAR |
218 | #ifdef MENUBAR |
203 | if (menubarGC) XFreeGC (display->display, menubarGC); |
219 | if (menubarGC) XFreeGC (disp, menubarGC); |
204 | #endif |
220 | #endif |
205 | #ifdef XTERM_SCROLLBAR |
221 | #ifdef XTERM_SCROLLBAR |
206 | if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); |
222 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
207 | if (ShadowGC) XFreeGC (display->display, ShadowGC); |
223 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
208 | #endif |
224 | #endif |
209 | #ifdef PLAIN_SCROLLBAR |
225 | #ifdef PLAIN_SCROLLBAR |
210 | if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); |
226 | if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); |
211 | #endif |
227 | #endif |
212 | #ifdef NEXT_SCROLLBAR |
228 | #ifdef NEXT_SCROLLBAR |
213 | if (blackGC) XFreeGC (display->display, blackGC); |
229 | if (blackGC) XFreeGC (disp, blackGC); |
214 | if (whiteGC) XFreeGC (display->display, whiteGC); |
230 | if (whiteGC) XFreeGC (disp, whiteGC); |
215 | if (grayGC) XFreeGC (display->display, grayGC); |
231 | if (grayGC) XFreeGC (disp, grayGC); |
216 | if (darkGC) XFreeGC (display->display, darkGC); |
232 | if (darkGC) XFreeGC (disp, darkGC); |
217 | if (stippleGC) XFreeGC (display->display, stippleGC); |
233 | if (stippleGC) XFreeGC (disp, stippleGC); |
218 | if (dimple) XFreePixmap (display->display, dimple); |
234 | if (dimple) XFreePixmap (disp, dimple); |
219 | if (upArrow) XFreePixmap (display->display, upArrow); |
235 | if (upArrow) XFreePixmap (disp, upArrow); |
220 | if (downArrow) XFreePixmap (display->display, downArrow); |
236 | if (downArrow) XFreePixmap (disp, downArrow); |
221 | if (upArrowHi) XFreePixmap (display->display, upArrowHi); |
237 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
222 | if (downArrowHi) XFreePixmap (display->display, downArrowHi); |
238 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
223 | #endif |
239 | #endif |
224 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
240 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
225 | if (topShadowGC) XFreeGC (display->display, topShadowGC); |
241 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
226 | if (botShadowGC) XFreeGC (display->display, botShadowGC); |
242 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
227 | if (scrollbarGC) XFreeGC (display->display, scrollbarGC); |
243 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
228 | #endif |
244 | #endif |
229 | if (TermWin.gc) XFreeGC (display->display, TermWin.gc); |
245 | if (TermWin.gc) XFreeGC (disp, TermWin.gc); |
230 | |
246 | |
231 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
247 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
232 | delete menuBar.drawable; |
248 | delete menuBar.drawable; |
233 | //if (menuBar.win) |
249 | //if (menuBar.win) |
234 | // XDestroyWindow (display->display, menuBar.win); |
250 | // XDestroyWindow (disp, menuBar.win); |
235 | #endif |
251 | #endif |
236 | delete TermWin.drawable; |
252 | delete TermWin.drawable; |
237 | // destroy all windows |
253 | // destroy all windows |
238 | if (TermWin.parent[0]) |
254 | if (TermWin.parent[0]) |
239 | XDestroyWindow (display->display, TermWin.parent[0]); |
255 | XDestroyWindow (disp, TermWin.parent[0]); |
240 | } |
256 | } |
241 | |
257 | |
242 | // TODO: free pixcolours, colours should become part of rxvt_display |
258 | // TODO: free pixcolours, colours should become part of rxvt_display |
243 | |
259 | |
244 | delete pix_colors_focused; |
260 | delete pix_colors_focused; |
245 | #ifdef OFF_FOCUS_FADING |
261 | #if OFF_FOCUS_FADING |
246 | delete pix_colors_unfocused; |
262 | delete pix_colors_unfocused; |
247 | #endif |
263 | #endif |
248 | |
264 | |
249 | displays.put (display); |
265 | displays.put (display); |
250 | |
266 | |
251 | scr_release (); |
267 | scr_release (); |
252 | |
268 | |
253 | /* clear all resources */ |
269 | /* clear all resources */ |
254 | for (int i = 0; i < allocated.size (); i++) |
270 | for (int i = 0; i < allocated.size (); i++) |
255 | free (allocated[i]); |
271 | free (allocated [i]); |
256 | |
272 | |
257 | free (selection.text); |
273 | free (selection.text); |
258 | // TODO: manage env vars in child only(!) |
274 | // TODO: manage env vars in child only(!) |
259 | free (env_windowid); |
275 | free (env_windowid); |
260 | free (env_display); |
276 | free (env_display); |
… | |
… | |
264 | free (v_buffer); |
280 | free (v_buffer); |
265 | free (incr_buf); |
281 | free (incr_buf); |
266 | |
282 | |
267 | delete envv; |
283 | delete envv; |
268 | delete argv; |
284 | delete argv; |
|
|
285 | |
|
|
286 | #ifdef KEYSYM_RESOURCE |
|
|
287 | delete keyboard; |
|
|
288 | #endif |
269 | } |
289 | } |
270 | |
290 | |
271 | void |
291 | void |
272 | rxvt_term::destroy () |
292 | rxvt_term::destroy () |
273 | { |
293 | { |
… | |
… | |
325 | |
345 | |
326 | delete this; |
346 | delete this; |
327 | } |
347 | } |
328 | |
348 | |
329 | /*----------------------------------------------------------------------*/ |
349 | /*----------------------------------------------------------------------*/ |
330 | /* rxvt_init () */ |
350 | /* |
|
|
351 | * Exit gracefully, clearing the utmp entry and restoring tty attributes |
|
|
352 | * TODO: if debugging, this should free up any known resources if we can |
|
|
353 | */ |
|
|
354 | static XErrorHandler old_xerror_handler; |
|
|
355 | |
|
|
356 | static void |
|
|
357 | rxvt_emergency_cleanup () |
|
|
358 | { |
|
|
359 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
|
|
360 | (*t)->emergency_cleanup (); |
|
|
361 | } |
|
|
362 | |
|
|
363 | #if ENABLE_FRILLS |
|
|
364 | static void |
|
|
365 | print_x_error (Display *dpy, XErrorEvent *event) |
|
|
366 | { |
|
|
367 | char buffer[BUFSIZ]; |
|
|
368 | char mesg[BUFSIZ]; |
|
|
369 | char number[32]; |
|
|
370 | char *mtype = "XlibMessage"; |
|
|
371 | XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); |
|
|
372 | XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); |
|
|
373 | rxvt_warn ("An X Error occured, trying to continue after report.\n"); |
|
|
374 | rxvt_warn ("%s: %s\n", mesg, buffer); |
|
|
375 | XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); |
|
|
376 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); |
|
|
377 | sprintf(number, "%d", event->request_code); |
|
|
378 | XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); |
|
|
379 | rxvt_warn ("(which is %s)\n", buffer); |
|
|
380 | if (event->request_code >= 128) { |
|
|
381 | XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", |
|
|
382 | mesg, BUFSIZ); |
|
|
383 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); |
|
|
384 | } |
|
|
385 | if ((event->error_code == BadWindow) || |
|
|
386 | (event->error_code == BadPixmap) || |
|
|
387 | (event->error_code == BadCursor) || |
|
|
388 | (event->error_code == BadFont) || |
|
|
389 | (event->error_code == BadDrawable) || |
|
|
390 | (event->error_code == BadColor) || |
|
|
391 | (event->error_code == BadGC) || |
|
|
392 | (event->error_code == BadIDChoice) || |
|
|
393 | (event->error_code == BadValue) || |
|
|
394 | (event->error_code == BadAtom)) { |
|
|
395 | if (event->error_code == BadValue) |
|
|
396 | XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", |
|
|
397 | mesg, BUFSIZ); |
|
|
398 | else if (event->error_code == BadAtom) |
|
|
399 | XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", |
|
|
400 | mesg, BUFSIZ); |
|
|
401 | else |
|
|
402 | XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", |
|
|
403 | mesg, BUFSIZ); |
|
|
404 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); |
|
|
405 | } |
|
|
406 | XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", |
|
|
407 | mesg, BUFSIZ); |
|
|
408 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); |
|
|
409 | } |
|
|
410 | #endif |
|
|
411 | |
|
|
412 | int |
|
|
413 | rxvt_xerror_handler (Display *display, XErrorEvent *event) |
|
|
414 | { |
|
|
415 | if (GET_R->allowedxerror == -1) |
|
|
416 | GET_R->allowedxerror = event->error_code; |
|
|
417 | else |
|
|
418 | { |
|
|
419 | // GET_R is most likely not the terminal which caused the error, |
|
|
420 | // so just output the error and continue |
|
|
421 | #if ENABLE_FRILLS |
|
|
422 | print_x_error (display, event); |
|
|
423 | #else |
|
|
424 | old_xerror_handler (display, event); |
|
|
425 | #endif |
|
|
426 | } |
|
|
427 | |
|
|
428 | return 0; |
|
|
429 | } |
|
|
430 | |
|
|
431 | int |
|
|
432 | rxvt_xioerror_handler (Display *display) |
|
|
433 | { |
|
|
434 | rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", |
|
|
435 | DisplayString (display)); |
|
|
436 | rxvt_emergency_cleanup (); |
|
|
437 | _exit (EXIT_FAILURE); |
|
|
438 | } |
|
|
439 | |
|
|
440 | /*----------------------------------------------------------------------*/ |
331 | bool |
441 | bool |
332 | rxvt_term::init (int argc, const char *const *argv) |
442 | rxvt_term::init (int argc, const char *const *argv) |
333 | { |
443 | { |
334 | SET_R (this); |
444 | SET_R (this); |
335 | |
445 | |
|
|
446 | set_locale (""); |
|
|
447 | |
336 | if (!init_vars ()) |
448 | if (!init_vars ()) |
337 | return false; |
449 | return false; |
338 | |
450 | |
339 | init_secondary (); |
451 | init_secondary (); |
340 | |
452 | |
341 | const char **cmd_argv = init_resources (argc, argv); |
453 | const char **cmd_argv = init_resources (argc, argv); |
342 | |
454 | |
343 | set_locale (""); |
455 | #ifdef KEYSYM_RESOURCE |
|
|
456 | keyboard->register_done (); |
|
|
457 | #endif |
344 | |
458 | |
345 | #if MENUBAR_MAX |
459 | #if MENUBAR_MAX |
346 | menubar_read (rs[Rs_menu]); |
460 | menubar_read (rs[Rs_menu]); |
347 | #endif |
461 | #endif |
348 | #ifdef HAVE_SCROLLBARS |
462 | #ifdef HAVE_SCROLLBARS |
… | |
… | |
350 | scrollBar.setIdle (); /* set existence for size calculations */ |
464 | scrollBar.setIdle (); /* set existence for size calculations */ |
351 | #endif |
465 | #endif |
352 | |
466 | |
353 | create_windows (argc, argv); |
467 | create_windows (argc, argv); |
354 | |
468 | |
|
|
469 | dDisp; |
|
|
470 | |
355 | init_xlocale (); |
471 | init_xlocale (); |
356 | |
472 | |
357 | scr_reset (); /* initialize screen */ |
473 | scr_reset (); /* initialize screen */ |
358 | |
474 | |
359 | #if 0 |
475 | #if 0 |
360 | XSynchronize (display->display, True); |
476 | XSynchronize (disp, True); |
361 | #endif |
477 | #endif |
362 | |
478 | |
363 | #ifdef HAVE_SCROLLBARS |
479 | #ifdef HAVE_SCROLLBARS |
364 | if (options & Opt_scrollBar) |
480 | if (options & Opt_scrollBar) |
365 | resize_scrollbar (); /* create and map scrollbar */ |
481 | resize_scrollbar (); /* create and map scrollbar */ |
366 | #endif |
482 | #endif |
367 | #if (MENUBAR_MAX) |
483 | #if (MENUBAR_MAX) |
368 | if (menubar_visible ()) |
484 | if (menubar_visible ()) |
369 | XMapWindow (display->display, menuBar.win); |
485 | XMapWindow (disp, menuBar.win); |
370 | #endif |
486 | #endif |
371 | #ifdef TRANSPARENT |
487 | #ifdef TRANSPARENT |
372 | if (options & Opt_transparent) |
488 | if (options & Opt_transparent) |
373 | { |
489 | { |
374 | XSelectInput (display->display, display->root, PropertyChangeMask); |
490 | XSelectInput (disp, display->root, PropertyChangeMask); |
375 | check_our_parents (); |
491 | check_our_parents (); |
376 | rootwin_ev.start (display, display->root); |
492 | rootwin_ev.start (display, display->root); |
377 | } |
493 | } |
378 | #endif |
494 | #endif |
379 | |
495 | |
380 | XMapWindow (display->display, TermWin.vt); |
496 | XMapWindow (disp, TermWin.vt); |
381 | XMapWindow (display->display, TermWin.parent[0]); |
497 | XMapWindow (disp, TermWin.parent[0]); |
382 | |
498 | |
383 | set_colorfgbg (); |
499 | set_colorfgbg (); |
384 | |
500 | |
385 | init_command (cmd_argv); |
501 | init_command (cmd_argv); |
386 | |
502 | |
|
|
503 | free (cmd_argv); |
|
|
504 | |
387 | pty_ev.start (pty.pty, EVENT_READ); |
505 | pty_ev.start (pty.pty, EVENT_READ); |
388 | |
506 | |
389 | check_ev.start (); |
507 | check_ev.start (); |
390 | |
508 | |
391 | return true; |
509 | return true; |
392 | } |
510 | } |
393 | |
511 | |
394 | static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); |
512 | static struct sig_handlers |
|
|
513 | { |
|
|
514 | sig_watcher sw_chld, sw_term, sw_int; |
|
|
515 | |
|
|
516 | void sig_chld (sig_watcher &w) |
|
|
517 | { |
|
|
518 | // we are being called for every SIGCHLD, find the corresponding term |
|
|
519 | int pid; |
|
|
520 | |
|
|
521 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
|
|
522 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
|
|
523 | if (pid == (*t)->cmd_pid) |
|
|
524 | { |
|
|
525 | (*t)->destroy (); |
|
|
526 | break; |
|
|
527 | } |
|
|
528 | } |
|
|
529 | |
|
|
530 | /* |
|
|
531 | * Catch a fatal signal and tidy up before quitting |
|
|
532 | */ |
|
|
533 | void |
|
|
534 | sig_term (sig_watcher &w) |
|
|
535 | { |
|
|
536 | #ifdef DEBUG_CMD |
|
|
537 | rxvt_warn ("caught signal %d, exiting.\n", w.signum); |
|
|
538 | #endif |
|
|
539 | rxvt_emergency_cleanup (); |
|
|
540 | signal (w.signum, SIG_DFL); |
|
|
541 | kill (getpid (), w.signum); |
|
|
542 | } |
|
|
543 | |
|
|
544 | sig_handlers () |
|
|
545 | : sw_chld (this, &sig_handlers::sig_chld), |
|
|
546 | sw_term (this, &sig_handlers::sig_term), |
|
|
547 | sw_int (this, &sig_handlers::sig_term) |
|
|
548 | { |
|
|
549 | } |
|
|
550 | } sig_handlers; |
395 | |
551 | |
396 | void |
552 | void |
397 | rxvt_init () |
553 | rxvt_init () |
398 | { |
554 | { |
399 | /* |
555 | /* |
… | |
… | |
407 | rxvt_privileges (IGNORE); |
563 | rxvt_privileges (IGNORE); |
408 | |
564 | |
409 | signal (SIGHUP, SIG_IGN); |
565 | signal (SIGHUP, SIG_IGN); |
410 | signal (SIGPIPE, SIG_IGN); |
566 | signal (SIGPIPE, SIG_IGN); |
411 | |
567 | |
|
|
568 | sig_handlers.sw_chld.start (SIGCHLD); |
|
|
569 | sig_handlers.sw_term.start (SIGTERM); |
|
|
570 | sig_handlers.sw_int.start (SIGINT); |
|
|
571 | |
412 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
572 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
413 | /* signal (SIGURG, SIG_DFL); */ |
573 | /* signal (SIGURG, SIG_DFL); */ |
414 | |
574 | |
415 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
575 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
416 | // TODO: handle this with exceptions and tolerate the memory loss |
576 | // TODO: handle this with exceptions and tolerate the memory loss |
417 | //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); |
577 | XSetIOErrorHandler (rxvt_xioerror_handler); |
418 | } |
|
|
419 | |
|
|
420 | /* ------------------------------------------------------------------------- * |
|
|
421 | * SIGNAL HANDLING & EXIT HANDLER * |
|
|
422 | * ------------------------------------------------------------------------- */ |
|
|
423 | /* |
|
|
424 | * Catch a SIGCHLD signal and exit if the direct child has died |
|
|
425 | */ |
|
|
426 | |
|
|
427 | void |
|
|
428 | rxvt_term::sig_chld (sig_watcher &w) |
|
|
429 | { |
|
|
430 | // we are being called for every SIGCHLD, not just ours |
|
|
431 | int pid; |
|
|
432 | |
|
|
433 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
|
|
434 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
|
|
435 | if (pid == (*t)->cmd_pid) |
|
|
436 | { |
|
|
437 | (*t)->destroy (); |
|
|
438 | break; |
|
|
439 | } |
|
|
440 | } |
|
|
441 | |
|
|
442 | /*----------------------------------------------------------------------*/ |
|
|
443 | /* |
|
|
444 | * Exit gracefully, clearing the utmp entry and restoring tty attributes |
|
|
445 | * TODO: if debugging, this should free up any known resources if we can |
|
|
446 | */ |
|
|
447 | void |
|
|
448 | rxvt_destroy_all () |
|
|
449 | { |
|
|
450 | // TODO: rxvtd should clean up all ressources |
|
|
451 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
|
|
452 | (*t)->destroy (); |
|
|
453 | } |
|
|
454 | |
|
|
455 | /* |
|
|
456 | * Catch a fatal signal and tidy up before quitting |
|
|
457 | */ |
|
|
458 | void |
|
|
459 | rxvt_term::sig_term (sig_watcher &w) |
|
|
460 | { |
|
|
461 | #ifdef DEBUG_CMD |
|
|
462 | rxvt_warn ("caught signal %d, exiting.\n", w.signum); |
|
|
463 | #endif |
|
|
464 | rxvt_destroy_all (); |
|
|
465 | signal (w.signum, SIG_DFL); |
|
|
466 | kill (getpid (), w.signum); |
|
|
467 | } |
|
|
468 | |
|
|
469 | /* INTPROTO */ |
|
|
470 | int |
|
|
471 | rxvt_xerror_handler (Display *display, XErrorEvent *event) |
|
|
472 | { |
|
|
473 | if (GET_R->allowedxerror == -1) |
|
|
474 | GET_R->allowedxerror = event->error_code; |
|
|
475 | else |
|
|
476 | { |
|
|
477 | old_xerror_handler (display, event); |
|
|
478 | GET_R->destroy (); |
|
|
479 | } |
|
|
480 | |
|
|
481 | return 0; |
|
|
482 | } |
578 | } |
483 | |
579 | |
484 | /* ------------------------------------------------------------------------- * |
580 | /* ------------------------------------------------------------------------- * |
485 | * MEMORY ALLOCATION WRAPPERS * |
581 | * MEMORY ALLOCATION WRAPPERS * |
486 | * ------------------------------------------------------------------------- */ |
582 | * ------------------------------------------------------------------------- */ |
… | |
… | |
493 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
589 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
494 | |
590 | |
495 | return p; |
591 | return p; |
496 | } |
592 | } |
497 | |
593 | |
498 | /* INTPROTO */ |
594 | void * |
499 | void * |
|
|
500 | rxvt_calloc (size_t number, size_t size) |
595 | rxvt_calloc (size_t number, size_t size) |
501 | { |
596 | { |
502 | void *p = calloc (number, size); |
597 | void *p = calloc (number, size); |
503 | |
598 | |
504 | if (!p) |
599 | if (!p) |
505 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
600 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
506 | |
601 | |
507 | return p; |
602 | return p; |
508 | } |
603 | } |
509 | |
604 | |
510 | /* INTPROTO */ |
|
|
511 | void * |
605 | void * |
512 | rxvt_realloc (void *ptr, size_t size) |
606 | rxvt_realloc (void *ptr, size_t size) |
513 | { |
607 | { |
514 | void *p = realloc (ptr, size); |
608 | void *p = realloc (ptr, size); |
515 | |
609 | |
… | |
… | |
599 | * if width/height are non-zero then override calculated width/height |
693 | * if width/height are non-zero then override calculated width/height |
600 | */ |
694 | */ |
601 | void |
695 | void |
602 | rxvt_term::window_calc (unsigned int width, unsigned int height) |
696 | rxvt_term::window_calc (unsigned int width, unsigned int height) |
603 | { |
697 | { |
604 | short recalc_x, recalc_y; |
698 | short recalc_x, recalc_y; |
605 | int x, y, sb_w, mb_h, flags; |
699 | int x, y, sb_w, mb_h, flags; |
606 | unsigned int w, h; |
700 | unsigned int w, h; |
607 | unsigned int max_width, max_height; |
701 | unsigned int max_width, max_height; |
|
|
702 | dDisp; |
608 | |
703 | |
609 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
704 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
610 | TermWin.ncol, TermWin.nrow, szHint.width, |
705 | TermWin.ncol, TermWin.nrow, szHint.width, |
611 | szHint.height)); |
706 | szHint.height)); |
612 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
707 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
… | |
… | |
618 | if (!parsed_geometry) |
713 | if (!parsed_geometry) |
619 | { |
714 | { |
620 | parsed_geometry = 1; |
715 | parsed_geometry = 1; |
621 | if (rs[Rs_geometry]) |
716 | if (rs[Rs_geometry]) |
622 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
717 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
|
|
718 | |
623 | if (flags & WidthValue) |
719 | if (flags & WidthValue) |
624 | { |
720 | { |
625 | TermWin.ncol = BOUND_POSITIVE_INT16 (w); |
721 | TermWin.ncol = BOUND_POSITIVE_INT16 (w); |
626 | szHint.flags |= USSize; |
722 | szHint.flags |= USSize; |
627 | } |
723 | } |
|
|
724 | |
628 | if (flags & HeightValue) |
725 | if (flags & HeightValue) |
629 | { |
726 | { |
630 | TermWin.nrow = BOUND_POSITIVE_INT16 (h); |
727 | TermWin.nrow = BOUND_POSITIVE_INT16 (h); |
631 | szHint.flags |= USSize; |
728 | szHint.flags |= USSize; |
632 | } |
729 | } |
|
|
730 | |
633 | if (flags & XValue) |
731 | if (flags & XValue) |
634 | { |
732 | { |
635 | szHint.x = x; |
733 | szHint.x = x; |
636 | szHint.flags |= USPosition; |
734 | szHint.flags |= USPosition; |
637 | if (flags & XNegative) |
735 | if (flags & XNegative) |
638 | { |
736 | { |
639 | recalc_x = 1; |
737 | recalc_x = 1; |
640 | szHint.win_gravity = NorthEastGravity; |
738 | szHint.win_gravity = NorthEastGravity; |
641 | } |
739 | } |
642 | } |
740 | } |
|
|
741 | |
643 | if (flags & YValue) |
742 | if (flags & YValue) |
644 | { |
743 | { |
645 | szHint.y = y; |
744 | szHint.y = y; |
646 | szHint.flags |= USPosition; |
745 | szHint.flags |= USPosition; |
647 | if (flags & YNegative) |
746 | if (flags & YNegative) |
… | |
… | |
710 | |
809 | |
711 | if (scrollbar_visible () && (options & Opt_scrollBar_right)) |
810 | if (scrollbar_visible () && (options & Opt_scrollBar_right)) |
712 | window_sb_x = szHint.width - sb_w; |
811 | window_sb_x = szHint.width - sb_w; |
713 | |
812 | |
714 | if (recalc_x) |
813 | if (recalc_x) |
715 | szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) |
814 | szHint.x += (DisplayWidth (disp, display->screen) |
716 | - szHint.width - 2 * TermWin.ext_bwidth); |
815 | - szHint.width - 2 * TermWin.ext_bwidth); |
717 | if (recalc_y) |
816 | if (recalc_y) |
718 | szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) |
817 | szHint.y += (DisplayHeight (disp, display->screen) |
719 | - szHint.height - 2 * TermWin.ext_bwidth); |
818 | - szHint.height - 2 * TermWin.ext_bwidth); |
720 | |
819 | |
721 | TermWin.ncol = TermWin.width / TermWin.fwidth; |
820 | TermWin.ncol = TermWin.width / TermWin.fwidth; |
722 | TermWin.nrow = TermWin.height / TermWin.fheight; |
821 | TermWin.nrow = TermWin.height / TermWin.fheight; |
723 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
822 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
… | |
… | |
746 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
845 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
747 | |
846 | |
748 | #if 0 |
847 | #if 0 |
749 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
848 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
750 | if (cmd_pid) /* force through to the command */ |
849 | if (cmd_pid) /* force through to the command */ |
751 | kill (cmd_pid, SIGWINCH); |
850 | kill (-cmd_pid, SIGWINCH); |
752 | #endif |
851 | #endif |
753 | } |
852 | } |
754 | |
853 | |
755 | /*----------------------------------------------------------------------*/ |
854 | /*----------------------------------------------------------------------*/ |
756 | /* set_fonts () - load and set the various fonts |
855 | /* set_fonts () - load and set the various fonts |
757 | /* |
856 | * |
758 | * init = 1 - initialize |
857 | * init = 1 - initialize |
759 | * |
858 | * |
760 | * fontname == FONT_UP - switch to bigger font |
859 | * fontname == FONT_UP - switch to bigger font |
761 | * fontname == FONT_DN - switch to smaller font |
860 | * fontname == FONT_DN - switch to smaller font |
762 | */ |
861 | */ |
… | |
… | |
782 | |
881 | |
783 | delete TermWin.fontset[0]; |
882 | delete TermWin.fontset[0]; |
784 | TermWin.fontset[0] = fs; |
883 | TermWin.fontset[0] = fs; |
785 | |
884 | |
786 | prop = (*fs)[1]->properties (); |
885 | prop = (*fs)[1]->properties (); |
|
|
886 | prop.height += TermWin.lineSpace; |
787 | fs->set_prop (prop); |
887 | fs->set_prop (prop); |
788 | |
888 | |
789 | TermWin.fwidth = prop.width; |
889 | TermWin.fwidth = prop.width; |
790 | TermWin.fheight = prop.height; |
890 | TermWin.fheight = prop.height; |
791 | TermWin.fweight = prop.weight; |
891 | TermWin.fweight = prop.weight; |
… | |
… | |
859 | /* xterm sequences - title, iconName, color (exptl) */ |
959 | /* xterm sequences - title, iconName, color (exptl) */ |
860 | void |
960 | void |
861 | rxvt_term::set_title (const char *str) |
961 | rxvt_term::set_title (const char *str) |
862 | { |
962 | { |
863 | set_string_property (XA_WM_NAME, str); |
963 | set_string_property (XA_WM_NAME, str); |
864 | #if ENABLE_FRILLS |
964 | #if ENABLE_EWMH |
865 | set_utf8_property (xa[XA_NET_WM_NAME], str); |
965 | set_utf8_property (xa[XA_NET_WM_NAME], str); |
866 | #endif |
966 | #endif |
867 | } |
967 | } |
868 | |
968 | |
869 | void |
969 | void |
870 | rxvt_term::set_icon_name (const char *str) |
970 | rxvt_term::set_icon_name (const char *str) |
871 | { |
971 | { |
872 | set_string_property (XA_WM_ICON_NAME, str); |
972 | set_string_property (XA_WM_ICON_NAME, str); |
873 | #if ENABLE_FRILLS |
973 | #if ENABLE_EWMH |
874 | set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); |
974 | set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); |
875 | #endif |
975 | #endif |
876 | } |
976 | } |
877 | |
977 | |
878 | #ifdef XTERM_COLOR_CHANGE |
978 | #ifdef XTERM_COLOR_CHANGE |
… | |
… | |
887 | |
987 | |
888 | /* handle color aliases */ |
988 | /* handle color aliases */ |
889 | if (isdigit (*color)) |
989 | if (isdigit (*color)) |
890 | { |
990 | { |
891 | i = atoi (color); |
991 | i = atoi (color); |
|
|
992 | |
892 | if (i >= 8 && i <= 15) |
993 | if (i >= 8 && i <= 15) |
893 | { /* bright colors */ |
994 | { /* bright colors */ |
894 | i -= 8; |
995 | i -= 8; |
895 | # ifndef NO_BRIGHTCOLOR |
996 | # ifndef NO_BRIGHTCOLOR |
896 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
997 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
897 | SET_PIXCOLOR (idx); |
998 | SET_PIXCOLOR (idx); |
898 | goto Done; |
999 | goto done; |
899 | # endif |
1000 | # endif |
900 | |
|
|
901 | } |
1001 | } |
|
|
1002 | |
902 | if (i >= 0 && i <= 7) |
1003 | if (i >= 0 && i <= 7) |
903 | { /* normal colors */ |
1004 | { /* normal colors */ |
904 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
1005 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
905 | SET_PIXCOLOR (idx); |
1006 | SET_PIXCOLOR (idx); |
906 | goto Done; |
1007 | goto done; |
907 | } |
1008 | } |
908 | } |
1009 | } |
909 | |
1010 | |
910 | if (!rXParseAllocColor (& xcol, color)) |
1011 | if (!rXParseAllocColor (&xcol, color)) |
911 | return; |
1012 | return; |
912 | |
1013 | |
913 | /* XStoreColor (display->display, display->cmap, XColor*); */ |
1014 | /* XStoreColor (display->display, display->cmap, XColor*); */ |
914 | |
1015 | |
915 | /* |
1016 | /* |
… | |
… | |
931 | pix_colors_focused[idx] = xcol; |
1032 | pix_colors_focused[idx] = xcol; |
932 | SET_PIXCOLOR (idx); |
1033 | SET_PIXCOLOR (idx); |
933 | |
1034 | |
934 | /* XSetWindowAttributes attr; */ |
1035 | /* XSetWindowAttributes attr; */ |
935 | /* Cursor cursor; */ |
1036 | /* Cursor cursor; */ |
936 | Done: |
1037 | done: |
|
|
1038 | |
937 | #ifdef OFF_FOCUS_FADING |
1039 | #if OFF_FOCUS_FADING |
938 | if (rs[Rs_fade]) |
1040 | if (rs[Rs_fade]) |
939 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); |
1041 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
940 | #endif |
1042 | #endif |
941 | |
1043 | |
942 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
1044 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
943 | |
1045 | |
944 | recolour_cursor (); |
1046 | recolour_cursor (); |
… | |
… | |
1018 | * -------------------------------------------------------------------- */ |
1120 | * -------------------------------------------------------------------- */ |
1019 | void |
1121 | void |
1020 | rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) |
1122 | rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) |
1021 | { |
1123 | { |
1022 | int fix_screen; |
1124 | int fix_screen; |
1023 | |
|
|
1024 | #ifdef SMART_RESIZE |
1125 | #ifdef SMART_RESIZE |
1025 | int old_width = szHint.width, old_height = szHint.height; |
1126 | int old_width = szHint.width, old_height = szHint.height; |
1026 | #endif |
1127 | #endif |
|
|
1128 | dDisp; |
1027 | |
1129 | |
1028 | window_calc (width, height); |
1130 | window_calc (width, height); |
1029 | XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); |
1131 | XSetWMNormalHints (disp, TermWin.parent[0], &szHint); |
1030 | |
1132 | |
1031 | if (!ignoreparent) |
1133 | if (!ignoreparent) |
1032 | { |
1134 | { |
1033 | #ifdef SMART_RESIZE |
1135 | #ifdef SMART_RESIZE |
1034 | /* |
1136 | /* |
… | |
… | |
1038 | int x, y, x1, y1; |
1140 | int x, y, x1, y1; |
1039 | int dx, dy; |
1141 | int dx, dy; |
1040 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1142 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1041 | Window unused_cr; |
1143 | Window unused_cr; |
1042 | |
1144 | |
1043 | XTranslateCoordinates (display->display, TermWin.parent[0], display->root, |
1145 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
1044 | 0, 0, &x, &y, &unused_cr); |
1146 | 0, 0, &x, &y, &unused_cr); |
1045 | XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, |
1147 | XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, |
1046 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1148 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1047 | /* |
1149 | /* |
1048 | * if display->root isn't the parent window, a WM will probably have offset |
1150 | * if display->root isn't the parent window, a WM will probably have offset |
1049 | * our position for handles and decorations. Counter it |
1151 | * our position for handles and decorations. Counter it |
1050 | */ |
1152 | */ |
… | |
… | |
1052 | { |
1154 | { |
1053 | x -= x1; |
1155 | x -= x1; |
1054 | y -= y1; |
1156 | y -= y1; |
1055 | } |
1157 | } |
1056 | |
1158 | |
1057 | x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; |
1159 | x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; |
1058 | y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; |
1160 | y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; |
1059 | dx = old_width - szHint.width; |
1161 | dx = old_width - szHint.width; |
1060 | dy = old_height - szHint.height; |
1162 | dy = old_height - szHint.height; |
1061 | |
1163 | |
1062 | /* Check position of the center of the window */ |
1164 | /* Check position of the center of the window */ |
1063 | if (x < x1) /* left half */ |
1165 | if (x < x1) /* left half */ |
… | |
… | |
1067 | if (y < y1) /* top half */ |
1169 | if (y < y1) /* top half */ |
1068 | dy = 0; |
1170 | dy = 0; |
1069 | else if (y == y1) /* exact center */ |
1171 | else if (y == y1) /* exact center */ |
1070 | dy /= 2; |
1172 | dy /= 2; |
1071 | |
1173 | |
1072 | XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, |
1174 | XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, |
1073 | szHint.width, szHint.height); |
1175 | szHint.width, szHint.height); |
1074 | #else |
1176 | #else |
1075 | XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); |
1177 | XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); |
1076 | #endif |
1178 | #endif |
1077 | } |
1179 | } |
1078 | |
1180 | |
1079 | fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; |
1181 | fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; |
1080 | |
1182 | |
1081 | if (fix_screen || width != old_width || height != old_height) |
1183 | if (fix_screen || width != old_width || height != old_height) |
1082 | { |
1184 | { |
1083 | if (scrollbar_visible ()) |
1185 | if (scrollbar_visible ()) |
1084 | { |
1186 | { |
1085 | XMoveResizeWindow (display->display, scrollBar.win, |
1187 | XMoveResizeWindow (disp, scrollBar.win, |
1086 | window_sb_x, 0, |
1188 | window_sb_x, 0, |
1087 | scrollbar_TotalWidth (), szHint.height); |
1189 | scrollbar_TotalWidth (), szHint.height); |
1088 | resize_scrollbar (); |
1190 | resize_scrollbar (); |
1089 | } |
1191 | } |
1090 | |
1192 | |
1091 | if (menubar_visible ()) |
1193 | if (menubar_visible ()) |
1092 | XMoveResizeWindow (display->display, menuBar.win, |
1194 | XMoveResizeWindow (disp, menuBar.win, |
1093 | window_vt_x, 0, |
1195 | window_vt_x, 0, |
1094 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
1196 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
1095 | |
1197 | |
1096 | XMoveResizeWindow (display->display, TermWin.vt, |
1198 | XMoveResizeWindow (disp, TermWin.vt, |
1097 | window_vt_x, window_vt_y, |
1199 | window_vt_x, window_vt_y, |
1098 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
1200 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
|
|
1201 | |
1099 | scr_clear (); |
1202 | scr_clear (); |
1100 | #ifdef XPM_BACKGROUND |
1203 | #ifdef XPM_BACKGROUND |
1101 | resize_pixmap (); |
1204 | resize_pixmap (); |
1102 | #endif |
1205 | #endif |
1103 | } |
1206 | } |
… | |
… | |
1126 | } |
1229 | } |
1127 | |
1230 | |
1128 | old_width = szHint.width; |
1231 | old_width = szHint.width; |
1129 | old_height = szHint.height; |
1232 | old_height = szHint.height; |
1130 | |
1233 | |
|
|
1234 | #ifdef XPM_BACKGROUND |
|
|
1235 | if (TermWin.pixmap) |
|
|
1236 | scr_touch (false); |
|
|
1237 | #endif |
|
|
1238 | |
1131 | #ifdef USE_XIM |
1239 | #ifdef USE_XIM |
1132 | IMSetStatusPosition (); |
1240 | IMSetStatusPosition (); |
1133 | #endif |
1241 | #endif |
1134 | } |
1242 | } |
1135 | |
1243 | |
… | |
… | |
1143 | XWindowAttributes wattr; |
1251 | XWindowAttributes wattr; |
1144 | |
1252 | |
1145 | if (width == 0 || height == 0) |
1253 | if (width == 0 || height == 0) |
1146 | { |
1254 | { |
1147 | XGetWindowAttributes (display->display, display->root, &wattr); |
1255 | XGetWindowAttributes (display->display, display->root, &wattr); |
|
|
1256 | |
1148 | if (width == 0) |
1257 | if (width == 0) |
1149 | width = wattr.width - szHint.base_width; |
1258 | width = wattr.width - szHint.base_width; |
1150 | if (height == 0) |
1259 | if (height == 0) |
1151 | height = wattr.height - szHint.base_height; |
1260 | height = wattr.height - szHint.base_height; |
1152 | } |
1261 | } |
… | |
… | |
1364 | "*", |
1473 | "*", |
1365 | TermWin.fheight, |
1474 | TermWin.fheight, |
1366 | TermWin.fheight + 1, TermWin.fheight - 1, |
1475 | TermWin.fheight + 1, TermWin.fheight - 1, |
1367 | TermWin.fheight - 2, TermWin.fheight + 2); |
1476 | TermWin.fheight - 2, TermWin.fheight + 2); |
1368 | |
1477 | |
1369 | fs = XCreateFontSet (display->display, pat, |
1478 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1370 | &missing_charset_list, &missing_charset_count, &def_string); |
1479 | &missing_charset_list, &missing_charset_count, &def_string); |
1371 | |
1480 | |
1372 | if (missing_charset_list) |
1481 | if (missing_charset_list) |
1373 | XFreeStringList (missing_charset_list); |
1482 | XFreeStringList (missing_charset_list); |
1374 | |
1483 | |
… | |
… | |
1446 | } |
1555 | } |
1447 | |
1556 | |
1448 | void |
1557 | void |
1449 | rxvt_term::im_cb () |
1558 | rxvt_term::im_cb () |
1450 | { |
1559 | { |
1451 | int i, found, had_im; |
1560 | int i; |
1452 | const char *p; |
1561 | const char *p; |
1453 | char **s; |
1562 | char **s; |
1454 | char buf[IMBUFSIZ]; |
1563 | char buf[IMBUFSIZ]; |
|
|
1564 | |
|
|
1565 | SET_R (this); |
1455 | |
1566 | |
1456 | im_destroy (); |
1567 | im_destroy (); |
1457 | |
1568 | |
1458 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1569 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1459 | if (Input_Context) |
1570 | if (Input_Context) |