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.194 by root, Sun Jan 22 00:36:59 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC

… …
271 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 272 free (allocated [i]);
273 273
274 free (selection.text); 274 free (selection.text);
275 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 276 free (env_display);
278 free (env_term); 277 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 278 free (locale);
281 free (v_buffer); 279 free (v_buffer);
282 free (incr_buf); 280 free (incr_buf);
283 281
284 delete envv; 282 delete envv;
… …
305rxvt_term::destroy () 303rxvt_term::destroy ()
306{ 304{
307 if (destroy_ev.active) 305 if (destroy_ev.active)
308 return; 306 return;
309 307
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 309
313#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
314 scr_overlay_off (); 311 scr_overlay_off ();
315#endif 312#endif
316 313
… …
474#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 474#endif
478 475
479 pty = rxvt_new_ptytty (); 476 pty = ptytty::create ();
480 477
481 create_windows (argc, argv); 478 create_windows (argc, argv);
482 479
483 dDisp; 480 dDisp;
484 481
… …
513 pty_ev.start (pty->pty, EVENT_READ); 510 pty_ev.start (pty->pty, EVENT_READ);
514 511
515 check_ev.start (); 512 check_ev.start ();
516 513
517 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
518 525
519 XMapWindow (disp, vt); 526 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]); 527 XMapWindow (disp, parent[0]);
521 528
522 return true; 529 return true;
… …
530 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
531 */ 538 */
532 void 539 void
533 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
534 { 541 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 542 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 543 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 544 kill (getpid (), w.signum);
541 } 545 }
542 546
… …
550char **rxvt_environ; // startup environment 554char **rxvt_environ; // startup environment
551 555
552void 556void
553rxvt_init () 557rxvt_init ()
554{ 558{
555 uid_t uid = getuid (); 559 ptytty::init ();
556 gid_t gid = getgid ();
557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 rxvt_ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568
569 // drop privileges
570#if HAVE_SETRESUID
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585 560
586 rxvt_environ = environ; 561 rxvt_environ = environ;
587 562
588 signal (SIGHUP, SIG_IGN); 563 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 564 signal (SIGPIPE, SIG_IGN);
… …
648 short recalc_x, recalc_y; 623 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 624 int x, y, sb_w, flags;
650 unsigned int w, h; 625 unsigned int w, h;
651 unsigned int max_width, max_height; 626 unsigned int max_width, max_height;
652 dDisp; 627 dDisp;
653
654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
655 ncol, nrow, szHint.width, szHint.height));
656 628
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 630 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 632
… …
763 if (recalc_y) 735 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
765 737
766 ncol = width / fwidth; 738 ncol = width / fwidth;
767 nrow = height / fheight; 739 nrow = height / fheight;
768 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
769 ncol, nrow, szHint.width,
770 szHint.height));
771 return;
772} 740}
773 741
774/*----------------------------------------------------------------------*/ 742/*----------------------------------------------------------------------*/
775/* 743/*
776 * Tell the teletype handler what size the window is. 744 * Tell the teletype handler what size the window is.
… …
1016{ 984{
1017 unsigned int i; 985 unsigned int i;
1018 const char *xpmb = "\0"; 986 const char *xpmb = "\0";
1019 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1020 988
1021 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1022 strcpy (fstr, "default"); 989 strcpy (fstr, "default");
1023 strcpy (bstr, "default"); 990 strcpy (bstr, "default");
1024 for (i = Color_Black; i <= Color_White; i++) 991 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[Color_fg] == pix_colors[i]) 992 if (pix_colors[Color_fg] == pix_colors[i])
1026 { 993 {
… …
1060 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
1061void 1028void
1062rxvt_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)
1063{ 1030{
1064 int fix_screen; 1031 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 1032 int old_width = szHint.width;
1033 int old_height = szHint.height;
1066 dDisp; 1034 dDisp;
1067 1035
1068 window_calc (newwidth, newheight); 1036 window_calc (newwidth, newheight);
1069 XSetWMNormalHints (disp, parent[0], &szHint); 1037 XSetWMNormalHints (disp, parent[0], &szHint);
1070 1038
… …
1092 { 1060 {
1093 x -= x1; 1061 x -= x1;
1094 y -= y1; 1062 y -= y1;
1095 } 1063 }
1096 1064
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 1067 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 1068 dy = old_height - szHint.height;
1101 1069
1102 /* Check position of the center of the window */ 1070 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 1071 if (x < x1) /* left half */
1104 dx = 0; 1072 dx = 0;
… …
1137 resize_pixmap (); 1105 resize_pixmap ();
1138#endif 1106#endif
1139 } 1107 }
1140 1108
1141 if (fix_screen || old_height == 0) 1109 if (fix_screen || old_height == 0)
1142 {
1143 int curr_screen = -1;
1144 int old_ncol = prev_ncol;
1145
1146 /* scr_reset only works on the primary screen */
1147 if (old_height) /* this is not the first time through */
1148 {
1149 unsigned int ocol = ncol;
1150 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1151 curr_screen = scr_change_screen (PRIMARY);
1152 ncol = ocol;
1153 }
1154
1155 scr_reset (); 1110 scr_reset ();
1156
1157 if (curr_screen >= 0) /* this is not the first time through */
1158 {
1159 scr_change_screen (curr_screen);
1160 selection_check (old_ncol != ncol ? 4 : 0);
1161 }
1162 }
1163
1164 old_width = szHint.width;
1165 old_height = szHint.height;
1166 1111
1167#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1168 if (pixmap) 1113 if (pixmap)
1169 scr_touch (false); 1114 scr_touch (false);
1170#endif 1115#endif
… …
1273 XPoint nspot; 1218 XPoint nspot;
1274 XVaNestedList preedit_attr; 1219 XVaNestedList preedit_attr;
1275 1220
1276 if (!Input_Context 1221 if (!Input_Context
1277 || !focus 1222 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1223 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1224 return;
1280 1225
1281 im_set_position (nspot); 1226 im_set_position (nspot);
1282 1227
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1228 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1302 input_method = 0; 1247 input_method = 0;
1303 } 1248 }
1304 1249
1305 Input_Context = 0; 1250 Input_Context = 0;
1306} 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
1307 1326
1308/* 1327/*
1309 * 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
1310 * open a suitable preedit type 1329 * open a suitable preedit type
1311 */ 1330 */
… …
1318 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1319 unsigned long fg, bg; 1338 unsigned long fg, bg;
1320 const char *p; 1339 const char *p;
1321 char **s; 1340 char **s;
1322 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342#ifdef ENABLE_XIM_ONTHESPOT
1343 XIMCallback xcb[4];
1344#endif
1323 1345
1324 set_environ (envv); 1346 set_environ (envv);
1325 1347
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1348 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1349 return false;
1328 1350
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1351 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1352 if (input_method == NULL)
1332 return false; 1353 return false;
1333 1354
1334 xim = input_method->xim; 1355 xim = input_method->xim;
… …
1354 s = rxvt_splitcommastring (p); 1375 s = rxvt_splitcommastring (p);
1355 1376
1356 for (i = found = 0; !found && s[i]; i++) 1377 for (i = found = 0; !found && s[i]; i++)
1357 { 1378 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1379 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1380 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1381 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1382 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1383 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1384 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1385 else if (!strcmp (s[i], "None"))
1365 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;
1366 1393
1367 for (j = 0; j < xim_styles->count_styles; j++) 1394 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1395 if (input_style == xim_styles->supported_styles[j])
1369 { 1396 {
1370 rxvt_freecommastring (s); 1397 rxvt_freecommastring (s);
… …
1459 XNBackground, bg, 1486 XNBackground, bg,
1460 XNArea, &status_rect, 1487 XNArea, &status_rect,
1461 XNFontSet, fs, 1488 XNFontSet, fs,
1462 NULL); 1489 NULL);
1463 } 1490 }
1491 else if (input_style & XIMPreeditCallbacks)
1492 {
1493 im_set_position (spot);
1494
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif
1501
1502 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2],
1507#if 0
1508 XNPreeditCaretCallback, &xcb[3],
1509#endif
1510 NULL);
1511 }
1464 1512
1465 Input_Context = XCreateIC (xim, 1513 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1514 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1515 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1516 XNFocusWindow, parent[0],
… …
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1528 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1529 im_destroy ();
1482 return false; 1530 return false;
1483 } 1531 }
1484 1532
1533#if 0
1534 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input ();
1537#endif
1538
1485 if (input_style & XIMPreeditArea) 1539 if (input_style & XIMPreeditArea)
1486 IMSetStatusPosition (); 1540 IMSetStatusPosition ();
1487 1541
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1489 return true; 1542 return true;
1490} 1543}
1491 1544
1492void 1545void
1493rxvt_term::im_cb () 1546rxvt_term::im_cb ()
… …
1499 1552
1500 make_current (); 1553 make_current ();
1501 1554
1502 im_destroy (); 1555 im_destroy ();
1503 1556
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1557 if (Input_Context)
1506 return; 1558 return;
1507 1559
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1560#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1561 if (rs[Rs_imLocale])

Diff Legend

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