wrap all C includes with 'extern "C" {}'

fix updateAvailableArea, maximize and placeWindow work properly now.
bbidulock · Mar 31, 2002 · 0cfa73d · 0cfa73d
1 parent ec4cb07
commit 0cfa73d
Show file tree

Hide file tree

Showing 32 changed files with 115 additions and 43 deletions.
diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
@@ -25,6 +25,7 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
@@ -75,6 +76,7 @@
 #  include <sys/types.h>
 #  include <sys/wait.h>
 #endif // HAVE_SYS_WAIT_H
+}
 
 #include "i18n.hh"
 #include "BaseDisplay.hh"

diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh
@@ -24,8 +24,10 @@
 #ifndef   __BaseDisplay_hh
 #define   __BaseDisplay_hh
 
+extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
+}
 
 #include <vector>
 

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
@@ -25,6 +25,7 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+extern "C" {
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
@@ -36,6 +37,7 @@
 #ifdef HAVE_STRING_H
 #  include <string.h>
 #endif // HAVE_STRING_H
+}
 
 #include <algorithm>
 using namespace std;

diff --git a/src/Basemenu.hh b/src/Basemenu.hh
@@ -24,7 +24,9 @@
 #ifndef   __Basemenu_hh
 #define   __Basemenu_hh
 
+extern "C" {
 #include <X11/Xlib.h>
+}
 
 #include <string>
 #include <deque>
@@ -98,7 +100,7 @@ public:
   int insert(const std::string &label, Basemenu *submenu, int pos = -1);
   int remove(int index);
 
-  void changeItemLabel(unsigned int index, const string& label);
+  void changeItemLabel(unsigned int index, const std::string& label);
 
   inline int getX(void) const { return menu.x; }
   inline int getY(void) const { return menu.y; }

diff --git a/src/Color.cc b/src/Color.cc
@@ -28,7 +28,10 @@
 #include "Color.hh"
 #include "BaseDisplay.hh"
 
+extern "C" {
 #include <stdio.h>
+}
+
 
 BColor::ColorCache BColor::colorcache;
 bool BColor::cleancache = false;

diff --git a/src/Color.hh b/src/Color.hh
@@ -24,7 +24,9 @@
 #ifndef COLOR_HH
 #define COLOR_HH
 
+extern "C" {
 #include <X11/Xlib.h>
+}
 
 #include <map>
 #include <string>

diff --git a/src/GCCache.cc b/src/GCCache.cc
@@ -30,7 +30,9 @@
 #include "Color.hh"
 #include "Util.hh"
 
+extern "C" {
 #include <stdio.h>
+}
 
 
 void BGCCacheContext::set(const BColor &_color,

diff --git a/src/GCCache.hh b/src/GCCache.hh
@@ -24,7 +24,9 @@
 #ifndef GCCACHE_HH
 #define GCCACHE_HH
 
+extern "C" {
 #include <X11/Xlib.h>
+}
 
 #include "BaseDisplay.hh"
 #include "Color.hh"

diff --git a/src/Image.hh b/src/Image.hh
@@ -24,8 +24,10 @@
 #ifndef   __Image_hh
 #define   __Image_hh
 
+extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+}
 
 #include <list>
 

diff --git a/src/ImageControl.cc b/src/ImageControl.cc
@@ -25,6 +25,7 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+extern "C" {
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
@@ -34,6 +35,7 @@
 #endif // HAVE_CTYPE_H
 
 #include <X11/Xlib.h>
+}
 
 #include <algorithm>
 

diff --git a/src/Netizen.hh b/src/Netizen.hh
@@ -24,7 +24,9 @@
 #ifndef   __Netizen_hh
 #define   __Netizen_hh
 
+extern "C" {
 #include <X11/Xlib.h>
+}
 
 // forward declaration
 class Blackbox;

diff --git a/src/Rootmenu.cc b/src/Rootmenu.cc
@@ -25,11 +25,7 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
-#include "blackbox.hh"
-#include "Rootmenu.hh"
-#include "Screen.hh"
-#include "Util.hh"
-
+extern "C" {
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
@@ -45,6 +41,12 @@
 #ifdef    HAVE_SYS_PARAM_H
 #  include <sys/param.h>
 #endif // HAVE_SYS_PARAM_H
+}
+
+#include "blackbox.hh"
+#include "Rootmenu.hh"
+#include "Screen.hh"
+#include "Util.hh"
 
 
 Rootmenu::Rootmenu(BScreen *scrn) : Basemenu(scrn) {

diff --git a/src/Screen.cc b/src/Screen.cc
@@ -25,6 +25,7 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+extern "C" {
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
@@ -65,6 +66,7 @@
 #ifdef    HAVE_STDARG_H
 #  include <stdarg.h>
 #endif // HAVE_STDARG_H
+}
 
 #include "i18n.hh"
 #include "blackbox.hh"
@@ -1671,28 +1673,33 @@ void BScreen::updateAvailableArea(void) {
     old_width = usableArea.width, old_height = usableArea.height;
 
   StrutList::iterator it = strutList.begin();
+  unsigned int current_left = 0, current_right = 0, current_top = 0,
+    current_bottom = 0;
 
   usableArea = getRect(); // reset to full screen
   for(; it != strutList.end(); ++it) {
     NETStrut *strut = *it;
-    if ((signed)strut->left > usableArea.x)
-      usableArea.x = strut->left;
-
-    if ((signed)strut->top > usableArea.y)
-      usableArea.y = strut->top;
-
-    if (((usableArea.width + old_x) - strut->right) < usableArea.width)
-      usableArea.width = getWidth() - strut->right - usableArea.x;
-
-    if (((usableArea.height + old_y) - strut->bottom) < usableArea.height)
-      usableArea.height = getHeight() - strut->bottom - usableArea.y;
+    fprintf(stderr, "screen: %d; left: %d, top: %d, right: %d, bottom: %d\n",
+            getScreenNumber(),
+            strut->left, strut->top, strut->right, strut->bottom);
+    if (strut->left > current_left)
+      current_left = strut->left;
+    if (strut->top > current_top)
+      current_top = strut->top;
+    if (strut->right > current_right)
+      current_right = strut->right;
+    if (strut->bottom > current_bottom)
+      current_bottom = strut->bottom;
   }
 
+  usableArea.x = current_left;
+  usableArea.width -= usableArea.x + current_right;
+  usableArea.y = current_top;
+  usableArea.height -= usableArea.y + current_bottom;
+
   // if area changed
   if (old_x != usableArea.x || old_y != usableArea.y ||
       old_width != usableArea.width || old_height != usableArea.height) {
-    usableArea.width += old_x - usableArea.x;
-    usableArea.height += old_y - usableArea.y;
     BlackboxWindowList::iterator it = windowList.begin(),
       end = windowList.end();
     for(; it != end; ++it)

diff --git a/src/Screen.hh b/src/Screen.hh
@@ -24,6 +24,7 @@
 #ifndef   __Screen_hh
 #define   __Screen_hh
 
+extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
@@ -37,6 +38,7 @@
 #    include <time.h>
 #  endif // HAVE_SYS_TIME_H
 #endif // TIME_WITH_SYS_TIME
+}
 
 #include <list>
 #include <vector>

diff --git a/src/Slit.cc b/src/Slit.cc
@@ -25,7 +25,9 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+extern "C" {
 #include <X11/keysym.h>
+}
 
 #include "i18n.hh"
 #include "blackbox.hh"

diff --git a/src/Slit.hh b/src/Slit.hh
@@ -24,8 +24,10 @@
 #ifndef   __Slit_hh
 #define   __Slit_hh
 
+extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+}
 
 #include <list>
 

diff --git a/src/Texture.cc b/src/Texture.cc
@@ -25,10 +25,12 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+extern "C" {
 #include <stdio.h>
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
 #endif
+}
 
 #include "Texture.hh"
 #include "BaseDisplay.hh"

diff --git a/src/Timer.hh b/src/Timer.hh
@@ -24,6 +24,7 @@
 #ifndef   _BLACKBOX_Timer_hh
 #define   _BLACKBOX_Timer_hh
 
+extern "C" {
 #ifdef    TIME_WITH_SYS_TIME
 #  include <sys/time.h>
 #  include <time.h>
@@ -34,6 +35,7 @@
 #    include <time.h>
 #  endif // HAVE_SYS_TIME_H
 #endif // TIME_WITH_SYS_TIME
+}
 
 // forward declaration
 class TimerQueueManager;

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
@@ -25,20 +25,7 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
-#include "i18n.hh"
-#include "blackbox.hh"
-#include "Clientmenu.hh"
-#include "GCCache.hh"
-#include "Iconmenu.hh"
-#include "Image.hh"
-#include "Rootmenu.hh"
-#include "Screen.hh"
-#include "Toolbar.hh"
-#include "Window.hh"
-#include "Workspace.hh"
-#include "Workspacemenu.hh"
-#include "Slit.hh"
-
+extern "C" {
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
@@ -60,10 +47,25 @@
 #  include <time.h>
 # endif // HAVE_SYS_TIME_H
 #endif // TIME_WITH_SYS_TIME
+}
 
 #include <string>
 using std::string;
 
+#include "i18n.hh"
+#include "blackbox.hh"
+#include "Clientmenu.hh"
+#include "GCCache.hh"
+#include "Iconmenu.hh"
+#include "Image.hh"
+#include "Rootmenu.hh"
+#include "Screen.hh"
+#include "Toolbar.hh"
+#include "Window.hh"
+#include "Workspace.hh"
+#include "Workspacemenu.hh"
+#include "Slit.hh"
+
 
 static long aMinuteFromNow(void) {
   timeval now;
@@ -275,7 +277,7 @@ void Toolbar::reconfigure(void) {
   case TopLeft:
   case TopCenter:
   case TopRight:
-    strut.top = getY() + 1;
+    strut.top = getHeight() + 1;
     break;
   default:
     strut.bottom = screen->getHeight() - getY() - 1;

diff --git a/src/Toolbar.hh b/src/Toolbar.hh
@@ -24,7 +24,9 @@
 #ifndef   __Toolbar_hh
 #define   __Toolbar_hh
 
+extern "C" {
 #include <X11/Xlib.h>
+}
 
 #include "Screen.hh"
 #include "Basemenu.hh"

diff --git a/src/Util.cc b/src/Util.cc
@@ -25,6 +25,7 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+extern "C" {
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -47,6 +48,7 @@
 #if defined(HAVE_PROCESS_H) && defined(__EMX__)
 #  include <process.h>
 #endif //   HAVE_PROCESS_H             __EMX__
+}
 
 #include "Util.hh"