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.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC

… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 171#endif
172#ifdef USE_XIM 172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
175 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
177 child_ev (this, &rxvt_term::child_cb), 180 child_ev (this, &rxvt_term::child_cb),
178 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
179 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
… …
268 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 272 free (allocated [i]);
270 273
271 free (selection.text); 274 free (selection.text);
272 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
273 free (env_windowid);
274 free (env_display); 276 free (env_display);
275 free (env_term); 277 free (env_term);
276 free (env_colorfgbg);
277 free (locale); 278 free (locale);
278 free (v_buffer); 279 free (v_buffer);
279 free (incr_buf); 280 free (incr_buf);
280 281
281 delete envv; 282 delete envv;
… …
302rxvt_term::destroy () 303rxvt_term::destroy ()
303{ 304{
304 if (destroy_ev.active) 305 if (destroy_ev.active)
305 return; 306 return;
306 307
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 return;
309 309
310#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
311 scr_overlay_off (); 311 scr_overlay_off ();
312#endif 312#endif
313 313
… …
447 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
448} 448}
449 449
450/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
451bool 451bool
452rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 453{
454 this->envv = envv;
455
454 SET_R (this); 456 SET_R (this);
455 set_locale (""); 457 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :( 458 set_environ (envv); // few things in X do not call setlocale :(
457 459
458 if (!init_vars ()) 460 if (!init_vars ())
… …
464 466
465#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
466 keyboard->register_done (); 468 keyboard->register_done ();
467#endif 469#endif
468 470
469#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
485#endif 474#endif
486 475
487 pty = rxvt_new_ptytty (); 476 pty = ptytty::create ();
488 477
489 create_windows (argc, argv); 478 create_windows (argc, argv);
490 479
491 dDisp; 480 dDisp;
492 481
… …
521 pty_ev.start (pty->pty, EVENT_READ); 510 pty_ev.start (pty->pty, EVENT_READ);
522 511
523 check_ev.start (); 512 check_ev.start ();
524 513
525 HOOK_INVOKE ((this, HOOK_START, DT_END)); 514 HOOK_INVOKE ((this, HOOK_START, DT_END));
515
516#if ENABLE_XEMBED
517 if (rs[Rs_embed])
518 {
519 long info[2] = { 0, XEMBED_MAPPED };
520
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2);
523 }
524#endif
526 525
527 XMapWindow (disp, vt); 526 XMapWindow (disp, vt);
528 XMapWindow (disp, parent[0]); 527 XMapWindow (disp, parent[0]);
529 528
530 return true; 529 return true;
… …
538 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
539 */ 538 */
540 void 539 void
541 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
542 { 541 {
543#ifdef DEBUG_CMD
544 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545#endif
546 rxvt_emergency_cleanup (); 542 rxvt_emergency_cleanup ();
547 signal (w.signum, SIG_DFL); 543 signal (w.signum, SIG_DFL);
548 kill (getpid (), w.signum); 544 kill (getpid (), w.signum);
549 } 545 }
550 546
… …
558char **rxvt_environ; // startup environment 554char **rxvt_environ; // startup environment
559 555
560void 556void
561rxvt_init () 557rxvt_init ()
562{ 558{
563 uid_t uid = getuid (); 559 ptytty::init ();
564 gid_t gid = getgid ();
565
566 // before doing anything else, check for setuid/setgid operation,
567 // start the helper process and drop privileges
568 if (uid != geteuid ()
569 || gid != getegid ())
570 {
571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576
577 // drop privileges
578#if HAVE_SETRESUID
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593 560
594 rxvt_environ = environ; 561 rxvt_environ = environ;
595 562
596 signal (SIGHUP, SIG_IGN); 563 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN); 564 signal (SIGPIPE, SIG_IGN);
… …
656 short recalc_x, recalc_y; 623 short recalc_x, recalc_y;
657 int x, y, sb_w, flags; 624 int x, y, sb_w, flags;
658 unsigned int w, h; 625 unsigned int w, h;
659 unsigned int max_width, max_height; 626 unsigned int max_width, max_height;
660 dDisp; 627 dDisp;
661
662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
663 ncol, nrow, szHint.width, szHint.height));
664 628
665 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
666 szHint.win_gravity = NorthWestGravity; 630 szHint.win_gravity = NorthWestGravity;
667 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
668 632
… …
771 if (recalc_y) 735 if (recalc_y)
772 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
773 737
774 ncol = width / fwidth; 738 ncol = width / fwidth;
775 nrow = height / fheight; 739 nrow = height / fheight;
776 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
777 ncol, nrow, szHint.width,
778 szHint.height));
779 return;
780} 740}
781 741
782/*----------------------------------------------------------------------*/ 742/*----------------------------------------------------------------------*/
783/* 743/*
784 * Tell the teletype handler what size the window is. 744 * Tell the teletype handler what size the window is.
… …
1024{ 984{
1025 unsigned int i; 985 unsigned int i;
1026 const char *xpmb = "\0"; 986 const char *xpmb = "\0";
1027 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1028 988
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1030 strcpy (fstr, "default"); 989 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 990 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 991 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 992 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 993 {
… …
1068 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
1069void 1028void
1070rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1071{ 1030{
1072 int fix_screen; 1031 int fix_screen;
1073 int old_width = szHint.width, old_height = szHint.height; 1032 int old_width = szHint.width;
1033 int old_height = szHint.height;
1074 dDisp; 1034 dDisp;
1075 1035
1076 window_calc (newwidth, newheight); 1036 window_calc (newwidth, newheight);
1077 XSetWMNormalHints (disp, parent[0], &szHint); 1037 XSetWMNormalHints (disp, parent[0], &szHint);
1078 1038
… …
1100 { 1060 {
1101 x -= x1; 1061 x -= x1;
1102 y -= y1; 1062 y -= y1;
1103 } 1063 }
1104 1064
1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1107 dx = old_width - szHint.width; 1067 dx = old_width - szHint.width;
1108 dy = old_height - szHint.height; 1068 dy = old_height - szHint.height;
1109 1069
1110 /* Check position of the center of the window */ 1070 /* Check position of the center of the window */
1111 if (x < x1) /* left half */ 1071 if (x < x1) /* left half */
1112 dx = 0; 1072 dx = 0;
… …
1145 resize_pixmap (); 1105 resize_pixmap ();
1146#endif 1106#endif
1147 } 1107 }
1148 1108
1149 if (fix_screen || old_height == 0) 1109 if (fix_screen || old_height == 0)
1150 {
1151 int curr_screen = -1;
1152 int old_ncol = prev_ncol;
1153
1154 /* scr_reset only works on the primary screen */
1155 if (old_height) /* this is not the first time through */
1156 {
1157 unsigned int ocol = ncol;
1158 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1159 curr_screen = scr_change_screen (PRIMARY);
1160 ncol = ocol;
1161 }
1162
1163 scr_reset (); 1110 scr_reset ();
1164
1165 if (curr_screen >= 0) /* this is not the first time through */
1166 {
1167 scr_change_screen (curr_screen);
1168 selection_check (old_ncol != ncol ? 4 : 0);
1169 }
1170 }
1171
1172 old_width = szHint.width;
1173 old_height = szHint.height;
1174 1111
1175#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1176 if (pixmap) 1113 if (pixmap)
1177 scr_touch (false); 1114 scr_touch (false);
1178#endif 1115#endif
… …
1281 XPoint nspot; 1218 XPoint nspot;
1282 XVaNestedList preedit_attr; 1219 XVaNestedList preedit_attr;
1283 1220
1284 if (!Input_Context 1221 if (!Input_Context
1285 || !focus 1222 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1223 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1287 return; 1224 return;
1288 1225
1289 im_set_position (nspot); 1226 im_set_position (nspot);
1290 1227
1291 if (nspot.x == spot.x && nspot.y == spot.y) 1228 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1310 input_method = 0; 1247 input_method = 0;
1311 } 1248 }
1312 1249
1313 Input_Context = 0; 1250 Input_Context = 0;
1314} 1251}
1252
1253#ifdef ENABLE_XIM_ONTHESPOT
1254
1255static void
1256xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1257{
1258 ((rxvt_term *)client_data)->make_current ();
1259 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1260}
1261
1262static void
1263xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1264{
1265 ((rxvt_term *)client_data)->make_current ();
1266 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1267}
1268
1269static void
1270xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1271{
1272 rxvt_term *term = (rxvt_term *)client_data;
1273 XIMText *text = call_data->text;
1274
1275 term->make_current ();
1276
1277 if (text)
1278 {
1279 void *str;
1280
1281 if (!text->encoding_is_wchar && text->string.multi_byte)
1282 {
1283 // of course, X makes it ugly again
1284 if (term->rs[Rs_imLocale])
1285 SET_LOCALE (term->rs[Rs_imLocale]);
1286
1287 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1288 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1289
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale);
1292 }
1293 else
1294 str = (void *)text->string.wide_char;
1295
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length,
1300 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1301 DT_WCS_LEN, str, str ? (int)text->length : 0,
1302 DT_END));
1303 }
1304 else
1305 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1306 DT_INT, call_data->caret,
1307 DT_INT, call_data->chg_first,
1308 DT_INT, call_data->chg_length,
1309 DT_END));
1310}
1311
1312#if 0
1313static void
1314xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1315{
1316 ((rxvt_term *)client_data)->make_current ();
1317 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1318 DT_INT, call_data->position,
1319 DT_INT, call_data->direction,
1320 DT_INT, call_data->style,
1321 DT_END));
1322}
1323#endif
1324
1325#endif
1315 1326
1316/* 1327/*
1317 * Try to open a XIM with the current modifiers, then see if we can 1328 * Try to open a XIM with the current modifiers, then see if we can
1318 * open a suitable preedit type 1329 * open a suitable preedit type
1319 */ 1330 */
… …
1326 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1338 unsigned long fg, bg;
1328 const char *p; 1339 const char *p;
1329 char **s; 1340 char **s;
1330 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342#ifdef ENABLE_XIM_ONTHESPOT
1343 XIMCallback xcb[4];
1344#endif
1331 1345
1332 set_environ (envv); 1346 set_environ (envv);
1333 1347
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1348 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1349 return false;
1336 1350
1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1338 input_method = display->get_xim (locale, modifiers); 1351 input_method = display->get_xim (locale, modifiers);
1339 if (input_method == NULL) 1352 if (input_method == NULL)
1340 return false; 1353 return false;
1341 1354
1342 xim = input_method->xim; 1355 xim = input_method->xim;
… …
1362 s = rxvt_splitcommastring (p); 1375 s = rxvt_splitcommastring (p);
1363 1376
1364 for (i = found = 0; !found && s[i]; i++) 1377 for (i = found = 0; !found && s[i]; i++)
1365 { 1378 {
1366 if (!strcmp (s[i], "OverTheSpot")) 1379 if (!strcmp (s[i], "OverTheSpot"))
1367 input_style = (XIMPreeditPosition | XIMStatusNothing); 1380 input_style = XIMPreeditPosition | XIMStatusNothing;
1368 else if (!strcmp (s[i], "OffTheSpot")) 1381 else if (!strcmp (s[i], "OffTheSpot"))
1369 input_style = (XIMPreeditArea | XIMStatusArea); 1382 input_style = XIMPreeditArea | XIMStatusArea;
1370 else if (!strcmp (s[i], "Root")) 1383 else if (!strcmp (s[i], "Root"))
1371 input_style = (XIMPreeditNothing | XIMStatusNothing); 1384 input_style = XIMPreeditNothing | XIMStatusNothing;
1372 else if (!strcmp (s[i], "None")) 1385 else if (!strcmp (s[i], "None"))
1373 input_style = (XIMPreeditNone | XIMStatusNone); 1386 input_style = XIMPreeditNone | XIMStatusNone;
1387#ifdef ENABLE_XIM_ONTHESPOT
1388 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1389 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1390#endif
1391 else
1392 input_style = XIMPreeditNothing | XIMStatusNothing;
1374 1393
1375 for (j = 0; j < xim_styles->count_styles; j++) 1394 for (j = 0; j < xim_styles->count_styles; j++)
1376 if (input_style == xim_styles->supported_styles[j]) 1395 if (input_style == xim_styles->supported_styles[j])
1377 { 1396 {
1378 rxvt_freecommastring (s); 1397 rxvt_freecommastring (s);
… …
1467 XNBackground, bg, 1486 XNBackground, bg,
1468 XNArea, &status_rect, 1487 XNArea, &status_rect,
1469 XNFontSet, fs, 1488 XNFontSet, fs,
1470 NULL); 1489 NULL);
1471 } 1490 }
1491#if ENABLE_XIM_ONTHESPOT
1492 else if (input_style & XIMPreeditCallbacks)
1493 {
1494 im_set_position (spot);
1495
1496 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1497 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1498 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1499# if 0
1500 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1501# endif
1502
1503 preedit_attr = XVaCreateNestedList (0,
1504 XNSpotLocation, &spot,
1505 XNPreeditStartCallback, &xcb[0],
1506 XNPreeditDoneCallback , &xcb[1],
1507 XNPreeditDrawCallback , &xcb[2],
1508# if 0
1509 XNPreeditCaretCallback, &xcb[3],
1510# endif
1511 NULL);
1512 }
1513#endif
1472 1514
1473 Input_Context = XCreateIC (xim, 1515 Input_Context = XCreateIC (xim,
1474 XNInputStyle, input_style, 1516 XNInputStyle, input_style,
1475 XNClientWindow, vt, 1517 XNClientWindow, vt,
1476 XNFocusWindow, parent[0], 1518 XNFocusWindow, parent[0],
… …
1488 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1530 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1489 im_destroy (); 1531 im_destroy ();
1490 return false; 1532 return false;
1491 } 1533 }
1492 1534
1535#if 0
1536 // unfortunately, only the focus window is used by XIM, hard to fix
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input ();
1539#endif
1540
1493 if (input_style & XIMPreeditArea) 1541 if (input_style & XIMPreeditArea)
1494 IMSetStatusPosition (); 1542 IMSetStatusPosition ();
1495 1543
1496 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1497 return true; 1544 return true;
1498} 1545}
1499 1546
1500void 1547void
1501rxvt_term::im_cb () 1548rxvt_term::im_cb ()
… …
1507 1554
1508 make_current (); 1555 make_current ();
1509 1556
1510 im_destroy (); 1557 im_destroy ();
1511 1558
1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1513 if (Input_Context) 1559 if (Input_Context)
1514 return; 1560 return;
1515 1561
1516#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1562#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1517 if (rs[Rs_imLocale]) 1563 if (rs[Rs_imLocale])

Diff Legend

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