Mercurial > emacs
comparison src/xfns.c @ 12470:a5cfab57f3e5
(x_set_icon_type, x_set_icon_name): Don't ever remap the
frame window; changing the icon doesn't make it disappear.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 02 Jul 1995 02:36:32 +0000 |
parents | 67cb86bbdb55 |
children | f4fb791df099 |
comparison
equal
deleted
inserted
replaced
12469:bec888e46e6a | 12470:a5cfab57f3e5 |
---|---|
1472 { | 1472 { |
1473 UNBLOCK_INPUT; | 1473 UNBLOCK_INPUT; |
1474 error ("No icon window available"); | 1474 error ("No icon window available"); |
1475 } | 1475 } |
1476 | 1476 |
1477 /* If the window was unmapped (and its icon was mapped), | |
1478 the new icon is not mapped, so map the window in its stead. */ | |
1479 if (FRAME_VISIBLE_P (f)) | |
1480 { | |
1481 #ifdef USE_X_TOOLKIT | |
1482 XtPopup (f->display.x->widget, XtGrabNone); | |
1483 #endif | |
1484 XMapWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); | |
1485 } | |
1486 | |
1487 XFlush (FRAME_X_DISPLAY (f)); | 1477 XFlush (FRAME_X_DISPLAY (f)); |
1488 UNBLOCK_INPUT; | 1478 UNBLOCK_INPUT; |
1489 } | 1479 } |
1490 | 1480 |
1491 /* Return non-nil if frame F wants a bitmap icon. */ | 1481 /* Return non-nil if frame F wants a bitmap icon. */ |
1533 | 1523 |
1534 if (result) | 1524 if (result) |
1535 { | 1525 { |
1536 UNBLOCK_INPUT; | 1526 UNBLOCK_INPUT; |
1537 error ("No icon window available"); | 1527 error ("No icon window available"); |
1538 } | |
1539 | |
1540 /* If the window was unmapped (and its icon was mapped), | |
1541 the new icon is not mapped, so map the window in its stead. */ | |
1542 if (FRAME_VISIBLE_P (f)) | |
1543 { | |
1544 #ifdef USE_X_TOOLKIT | |
1545 XtPopup (f->display.x->widget, XtGrabNone); | |
1546 #endif | |
1547 XMapWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f)); | |
1548 } | 1528 } |
1549 | 1529 |
1550 XFlush (FRAME_X_DISPLAY (f)); | 1530 XFlush (FRAME_X_DISPLAY (f)); |
1551 UNBLOCK_INPUT; | 1531 UNBLOCK_INPUT; |
1552 } | 1532 } |