aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-04-04 11:28:19 (GMT)
committerfluxgen <fluxgen>2002-04-04 11:28:19 (GMT)
commit2526e4bce821eedcd4bcc13e0f27ac7b9e255350 (patch)
treef86898efe146ecb882e597955e1e94b375154b19 /src/Window.cc
parentbd05695cfa6d066e5e5368d857eef8c0b11987c1 (diff)
downloadfluxbox-2526e4bce821eedcd4bcc13e0f27ac7b9e255350.zip
fluxbox-2526e4bce821eedcd4bcc13e0f27ac7b9e255350.tar.bz2
moved nls defines to enums in namespace FBNLS
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc51
1 files changed, 13 insertions, 38 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 06c295a..ba18a05 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.36 2002/04/03 23:01:04 fluxgen Exp $ 25// $Id: Window.cc,v 1.37 2002/04/04 11:28:19 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -81,18 +81,13 @@ tab(0)
81{ 81{
82 lastFocusTime.tv_sec = lastFocusTime.tv_usec = 0; 82 lastFocusTime.tv_sec = lastFocusTime.tv_usec = 0;
83 83
84 #ifdef DEBUG
85 fprintf(stderr, 84 fprintf(stderr,
86 I18n::instance()-> 85 I18n::instance()->
87 getMessage( 86 getMessage(
88 #ifdef NLS 87 FBNLS::WindowSet, FBNLS::WindowCreating,
89 WindowSet, WindowCreating,
90 #else // !NLS
91 0, 0,
92 #endif // NLS
93 "FluxboxWindow::FluxboxWindow(): creating 0x%lx\n"), 88 "FluxboxWindow::FluxboxWindow(): creating 0x%lx\n"),
94 w); 89 w);
95 #endif // DEBUG 90
96 91
97 Fluxbox *fluxbox = Fluxbox::instance(); 92 Fluxbox *fluxbox = Fluxbox::instance();
98 display = fluxbox->getXDisplay(); 93 display = fluxbox->getXDisplay();
@@ -528,11 +523,7 @@ void FluxboxWindow::showError(FluxboxWindow::Error error) {
528 fprintf(stderr, 523 fprintf(stderr,
529 I18n::instance()-> 524 I18n::instance()->
530 getMessage( 525 getMessage(
531 #ifdef NLS 526 FBNLS::WindowSet, FBNLS::WindowXGetWindowAttributesFail,
532 WindowSet, WindowXGetWindowAttributesFail,
533 #else // !NLS
534 0, 0,
535 #endif // NLS
536 "FluxboxWindow::FluxboxWindow(): XGetWindowAttributes " 527 "FluxboxWindow::FluxboxWindow(): XGetWindowAttributes "
537 "failed\n") 528 "failed\n")
538 ); 529 );
@@ -541,11 +532,7 @@ void FluxboxWindow::showError(FluxboxWindow::Error error) {
541 fprintf(stderr, 532 fprintf(stderr,
542 I18n::instance()-> 533 I18n::instance()->
543 getMessage( 534 getMessage(
544 #ifdef NLS 535 FBNLS::WindowSet, FBNLS::WindowCannotFindScreen,
545 WindowSet, WindowCannotFindScreen,
546 #else // !NLS
547 0, 0,
548 #endif // NLS
549 "FluxboxWindow::FluxboxWindow(): can't find screen\n" 536 "FluxboxWindow::FluxboxWindow(): can't find screen\n"
550 " for root window")); 537 " for root window"));
551 break; 538 break;
@@ -1463,11 +1450,11 @@ void FluxboxWindow::getWMName(void) {
1463 XFree((char *) text_prop.value); 1450 XFree((char *) text_prop.value);
1464 } else 1451 } else
1465 client.title = i18n->getMessage( 1452 client.title = i18n->getMessage(
1466 WindowSet, WindowUnnamed, 1453 FBNLS::WindowSet, FBNLS::WindowUnnamed,
1467 "Unnamed"); 1454 "Unnamed");
1468 } else { 1455 } else {
1469 client.title = i18n->getMessage( 1456 client.title = i18n->getMessage(
1470 WindowSet, WindowUnnamed, 1457 FBNLS::WindowSet, FBNLS::WindowUnnamed,
1471 "Unnamed"); 1458 "Unnamed");
1472 } 1459 }
1473 1460
@@ -2816,11 +2803,7 @@ void FluxboxWindow::mapRequestEvent(XMapRequestEvent *re) {
2816#ifdef DEBUG 2803#ifdef DEBUG
2817 fprintf(stderr, 2804 fprintf(stderr,
2818 I18n::instance()->getMessage( 2805 I18n::instance()->getMessage(
2819#ifdef NLS 2806 FBNLS::WindowSet, FBNLS::WindowMapRequest,
2820 WindowSet, WindowMapRequest,
2821#else // !NLS
2822 0, 0,
2823#endif // NLS
2824 "FluxboxWindow::mapRequestEvent() for 0x%lx\n"), 2807 "FluxboxWindow::mapRequestEvent() for 0x%lx\n"),
2825 client.window); 2808 client.window);
2826#endif // DEBUG 2809#endif // DEBUG
@@ -2907,11 +2890,7 @@ bool FluxboxWindow::unmapNotifyEvent(XUnmapEvent *ue) {
2907 #ifdef DEBUG 2890 #ifdef DEBUG
2908 fprintf(stderr, 2891 fprintf(stderr,
2909 I18n::instance()->getMessage( 2892 I18n::instance()->getMessage(
2910 #ifdef NLS 2893 FBNLS::WindowSet, FBNLS::WindowUnmapNotify,
2911 WindowSet, WindowUnmapNotify,
2912 #else // !NLS
2913 0, 0,
2914 #endif // NLS
2915 "FluxboxWindow::unmapNotifyEvent() for 0x%lx\n"), 2894 "FluxboxWindow::unmapNotifyEvent() for 0x%lx\n"),
2916 client.window); 2895 client.window);
2917 #endif // DEBUG 2896 #endif // DEBUG
@@ -2937,13 +2916,9 @@ bool FluxboxWindow::unmapNotifyEvent(XUnmapEvent *ue) {
2937 #ifdef DEBUG 2916 #ifdef DEBUG
2938 fprintf(stderr, 2917 fprintf(stderr,
2939 I18n::instance()->getMessage( 2918 I18n::instance()->getMessage(
2940 #ifdef NLS 2919 FBNLS::WindowSet, FBNLS::WindowUnmapNotifyReparent,
2941 WindowSet, WindowUnmapNotifyReparent, 2920 "FluxboxWindow::unmapNotifyEvent(): reparent 0x%lx to "
2942 #else // !NLS 2921 "root.\n"), client.window);
2943 0, 0,
2944 #endif // NLS
2945 "FluxboxWindow::unmapNotifyEvent(): reparent 0x%lx to "
2946 "root.\n"), client.window);
2947 #endif // DEBUG 2922 #endif // DEBUG
2948 restoreGravity(); 2923 restoreGravity();
2949 XReparentWindow(display, client.window, screen->getRootWindow(), 2924 XReparentWindow(display, client.window, screen->getRootWindow(),