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.196 by root, Sun Jan 22 04:01:52 2006 UTC vs.
Revision 1.203 by root, Wed Jan 25 02:42:06 2006 UTC

… …
305rxvt_term::destroy () 305rxvt_term::destroy ()
306{ 306{
307 if (destroy_ev.active) 307 if (destroy_ev.active)
308 return; 308 return;
309 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 311
313#if ENABLE_OVERLAY 312#if ENABLE_OVERLAY
314 scr_overlay_off (); 313 scr_overlay_off ();
315#endif 314#endif
316 315
… …
514 513
515 check_ev.start (); 514 check_ev.start ();
516 515
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 516 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 517
518#if ENABLE_XEMBED
519 if (rs[Rs_embed])
520 {
521 long info[2] = { 0, XEMBED_MAPPED };
522
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2);
525 }
526#endif
527
519 XMapWindow (disp, vt); 528 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]); 529 XMapWindow (disp, parent[0]);
521 530
522 return true; 531 return true;
523} 532}
… …
530 * Catch a fatal signal and tidy up before quitting 539 * Catch a fatal signal and tidy up before quitting
531 */ 540 */
532 void 541 void
533 sig_term (sig_watcher &w) 542 sig_term (sig_watcher &w)
534 { 543 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 544 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 545 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 546 kill (getpid (), w.signum);
541 } 547 }
542 548
… …
620 int x, y, sb_w, flags; 626 int x, y, sb_w, flags;
621 unsigned int w, h; 627 unsigned int w, h;
622 unsigned int max_width, max_height; 628 unsigned int max_width, max_height;
623 dDisp; 629 dDisp;
624 630
625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
626 ncol, nrow, szHint.width, szHint.height));
627
628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
629 szHint.win_gravity = NorthWestGravity; 632 szHint.win_gravity = NorthWestGravity;
630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
631 634
632 recalc_x = recalc_y = 0; 635 recalc_x = recalc_y = 0;
… …
734 if (recalc_y) 737 if (recalc_y)
735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
736 739
737 ncol = width / fwidth; 740 ncol = width / fwidth;
738 nrow = height / fheight; 741 nrow = height / fheight;
739 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
740 ncol, nrow, szHint.width,
741 szHint.height));
742 return;
743} 742}
744 743
745/*----------------------------------------------------------------------*/ 744/*----------------------------------------------------------------------*/
746/* 745/*
747 * Tell the teletype handler what size the window is. 746 * Tell the teletype handler what size the window is.
… …
1031 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1032void 1031void
1033rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1034{ 1033{
1035 int fix_screen; 1034 int fix_screen;
1036 int old_width = szHint.width, old_height = szHint.height; 1035 int old_width = szHint.width;
1036 int old_height = szHint.height;
1037 dDisp; 1037 dDisp;
1038 1038
1039 window_calc (newwidth, newheight); 1039 window_calc (newwidth, newheight);
1040 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (disp, parent[0], &szHint);
1041 1041
… …
1063 { 1063 {
1064 x -= x1; 1064 x -= x1;
1065 y -= y1; 1065 y -= y1;
1066 } 1066 }
1067 1067
1068 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1072 1072
1073 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1075 dx = 0; 1075 dx = 0;
… …
1108 resize_pixmap (); 1108 resize_pixmap ();
1109#endif 1109#endif
1110 } 1110 }
1111 1111
1112 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1113 {
1114 int curr_screen = -1;
1115 int old_ncol = prev_ncol;
1116
1117 /* scr_reset only works on the primary screen */
1118 if (old_height) /* this is not the first time through */
1119 {
1120 unsigned int ocol = ncol;
1121 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1122 curr_screen = scr_change_screen (PRIMARY);
1123 ncol = ocol;
1124 }
1125
1126 scr_reset (); 1113 scr_reset ();
1127
1128 if (curr_screen >= 0) /* this is not the first time through */
1129 {
1130 scr_change_screen (curr_screen);
1131 selection_check (old_ncol != ncol ? 4 : 0);
1132 }
1133 }
1134
1135 old_width = szHint.width;
1136 old_height = szHint.height;
1137 1114
1138#ifdef XPM_BACKGROUND 1115#ifdef XPM_BACKGROUND
1139 if (pixmap) 1116 if (pixmap)
1140 scr_touch (false); 1117 scr_touch (false);
1141#endif 1118#endif
… …
1244 XPoint nspot; 1221 XPoint nspot;
1245 XVaNestedList preedit_attr; 1222 XVaNestedList preedit_attr;
1246 1223
1247 if (!Input_Context 1224 if (!Input_Context
1248 || !focus 1225 || !focus
1249 || !(input_style & XIMPreeditPosition)) 1226 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1250 return; 1227 return;
1251 1228
1252 im_set_position (nspot); 1229 im_set_position (nspot);
1253 1230
1254 if (nspot.x == spot.x && nspot.y == spot.y) 1231 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1273 input_method = 0; 1250 input_method = 0;
1274 } 1251 }
1275 1252
1276 Input_Context = 0; 1253 Input_Context = 0;
1277} 1254}
1255
1256#ifdef ENABLE_XIM_ONTHESPOT
1257
1258static void
1259xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1260{
1261 ((rxvt_term *)client_data)->make_current ();
1262 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1263}
1264
1265static void
1266xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1267{
1268 ((rxvt_term *)client_data)->make_current ();
1269 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1270}
1271
1272static void
1273xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1274{
1275 rxvt_term *term = (rxvt_term *)client_data;
1276 XIMText *text = call_data->text;
1277
1278 term->make_current ();
1279
1280 if (text)
1281 {
1282 void *str;
1283
1284 if (!text->encoding_is_wchar && text->string.multi_byte)
1285 {
1286 // of course, X makes it ugly again
1287 if (term->rs[Rs_imLocale])
1288 SET_LOCALE (term->rs[Rs_imLocale]);
1289
1290 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1291 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1292
1293 if (term->rs[Rs_imLocale])
1294 SET_LOCALE (term->locale);
1295 }
1296 else
1297 str = (void *)text->string.wide_char;
1298
1299 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1300 DT_INT, call_data->caret,
1301 DT_INT, call_data->chg_first,
1302 DT_INT, call_data->chg_length,
1303 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1304 DT_WCS_LEN, str, str ? (int)text->length : 0,
1305 DT_END));
1306 }
1307 else
1308 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1309 DT_INT, call_data->caret,
1310 DT_INT, call_data->chg_first,
1311 DT_INT, call_data->chg_length,
1312 DT_END));
1313}
1314
1315#if 0
1316static void
1317xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1318{
1319 ((rxvt_term *)client_data)->make_current ();
1320 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1321 DT_INT, call_data->position,
1322 DT_INT, call_data->direction,
1323 DT_INT, call_data->style,
1324 DT_END));
1325}
1326#endif
1327
1328#endif
1278 1329
1279/* 1330/*
1280 * Try to open a XIM with the current modifiers, then see if we can 1331 * Try to open a XIM with the current modifiers, then see if we can
1281 * open a suitable preedit type 1332 * open a suitable preedit type
1282 */ 1333 */
… …
1289 XRectangle rect, status_rect, needed_rect; 1340 XRectangle rect, status_rect, needed_rect;
1290 unsigned long fg, bg; 1341 unsigned long fg, bg;
1291 const char *p; 1342 const char *p;
1292 char **s; 1343 char **s;
1293 XIMStyles *xim_styles; 1344 XIMStyles *xim_styles;
1345#ifdef ENABLE_XIM_ONTHESPOT
1346 XIMCallback xcb[4];
1347#endif
1294 1348
1295 set_environ (envv); 1349 set_environ (envv);
1296 1350
1297 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1351 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1298 return false; 1352 return false;
1299 1353
1300 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1301 input_method = display->get_xim (locale, modifiers); 1354 input_method = display->get_xim (locale, modifiers);
1302 if (input_method == NULL) 1355 if (input_method == NULL)
1303 return false; 1356 return false;
1304 1357
1305 xim = input_method->xim; 1358 xim = input_method->xim;
… …
1325 s = rxvt_splitcommastring (p); 1378 s = rxvt_splitcommastring (p);
1326 1379
1327 for (i = found = 0; !found && s[i]; i++) 1380 for (i = found = 0; !found && s[i]; i++)
1328 { 1381 {
1329 if (!strcmp (s[i], "OverTheSpot")) 1382 if (!strcmp (s[i], "OverTheSpot"))
1330 input_style = (XIMPreeditPosition | XIMStatusNothing); 1383 input_style = XIMPreeditPosition | XIMStatusNothing;
1331 else if (!strcmp (s[i], "OffTheSpot")) 1384 else if (!strcmp (s[i], "OffTheSpot"))
1332 input_style = (XIMPreeditArea | XIMStatusArea); 1385 input_style = XIMPreeditArea | XIMStatusArea;
1333 else if (!strcmp (s[i], "Root")) 1386 else if (!strcmp (s[i], "Root"))
1334 input_style = (XIMPreeditNothing | XIMStatusNothing); 1387 input_style = XIMPreeditNothing | XIMStatusNothing;
1335 else if (!strcmp (s[i], "None")) 1388 else if (!strcmp (s[i], "None"))
1336 input_style = (XIMPreeditNone | XIMStatusNone); 1389 input_style = XIMPreeditNone | XIMStatusNone;
1390#ifdef ENABLE_XIM_ONTHESPOT
1391 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1392 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1393#endif
1394 else
1395 input_style = XIMPreeditNothing | XIMStatusNothing;
1337 1396
1338 for (j = 0; j < xim_styles->count_styles; j++) 1397 for (j = 0; j < xim_styles->count_styles; j++)
1339 if (input_style == xim_styles->supported_styles[j]) 1398 if (input_style == xim_styles->supported_styles[j])
1340 { 1399 {
1341 rxvt_freecommastring (s); 1400 rxvt_freecommastring (s);
… …
1430 XNBackground, bg, 1489 XNBackground, bg,
1431 XNArea, &status_rect, 1490 XNArea, &status_rect,
1432 XNFontSet, fs, 1491 XNFontSet, fs,
1433 NULL); 1492 NULL);
1434 } 1493 }
1494 else if (input_style & XIMPreeditCallbacks)
1495 {
1496 im_set_position (spot);
1497
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif
1504
1505 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2],
1510#if 0
1511 XNPreeditCaretCallback, &xcb[3],
1512#endif
1513 NULL);
1514 }
1435 1515
1436 Input_Context = XCreateIC (xim, 1516 Input_Context = XCreateIC (xim,
1437 XNInputStyle, input_style, 1517 XNInputStyle, input_style,
1438 XNClientWindow, vt, 1518 XNClientWindow, vt,
1439 XNFocusWindow, parent[0], 1519 XNFocusWindow, parent[0],
… …
1451 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1531 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1452 im_destroy (); 1532 im_destroy ();
1453 return false; 1533 return false;
1454 } 1534 }
1455 1535
1536#if 0
1537 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input ();
1540#endif
1541
1456 if (input_style & XIMPreeditArea) 1542 if (input_style & XIMPreeditArea)
1457 IMSetStatusPosition (); 1543 IMSetStatusPosition ();
1458 1544
1459 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1460 return true; 1545 return true;
1461} 1546}
1462 1547
1463void 1548void
1464rxvt_term::im_cb () 1549rxvt_term::im_cb ()
… …
1470 1555
1471 make_current (); 1556 make_current ();
1472 1557
1473 im_destroy (); 1558 im_destroy ();
1474 1559
1475 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1476 if (Input_Context) 1560 if (Input_Context)
1477 return; 1561 return;
1478 1562
1479#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1563#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1480 if (rs[Rs_imLocale]) 1564 if (rs[Rs_imLocale])

Diff Legend

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