Style update: spaces around assignments

[libs/gui.git] / source / gbase / display.cpp

diff --git a/source/gbase/display.cpp b/source/gbase/display.cpp
index d004b05be1f3768f345f5cf9bec7941515bcf9b9..10e86fa064503c20a888216dee32aa0cf88bb08a 100644 (file)
--- a/source/gbase/display.cpp
+++ b/source/gbase/display.cpp
@@ -16,7 +16,7 @@ using namespace std;
 
 namespace {
 
-bool error_flag=false;
+bool error_flag = false;
 std::string error_msg;
 
 #ifndef WIN32
@@ -25,18 +25,18 @@ int x_error_handler(Display *display, XErrorEvent *event)
        char err[128];
        XGetErrorText(display, event->error_code, err, sizeof(err));
 
-       string request_code=Msp::lexical_cast(static_cast<int>(event->request_code));
+       string request_code = Msp::lexical_cast(static_cast<int>(event->request_code));
        char req[128];
        XGetErrorDatabaseText(display, "XRequest", request_code.c_str(), request_code.c_str(), req, sizeof(req));
 
-       string msg=Msp::format("Request %s failed with %s [%08X]", req, err, event->resourceid);
+       string msg = Msp::format("Request %s failed with %s [%08X]", req, err, event->resourceid);
        if(error_flag)
                cerr<<"Discarding error: "<<msg<<'\n';
        else
        {
                cerr<<msg<<'\n';
-               error_msg=msg;
-               error_flag=true;
+               error_msg = msg;
+               error_flag = true;
        }
 
        return 0;
@@ -61,39 +61,39 @@ Display::Display(const string &disp_name):
                        break;
 
                VideoMode mode(info.dmPelsWidth, info.dmPelsHeight);
-               mode.rate=info.dmDisplayFrequency;
+               mode.rate = info.dmDisplayFrequency;
                modes.push_back(mode);
        }
        
        DEVMODE info;
        if(EnumDisplaySettings(0, ENUM_CURRENT_SETTINGS, &info))
        {
-               orig_mode=VideoMode(info.dmPelsWidth, info.dmPelsHeight);
-               orig_mode.rate=info.dmDisplayFrequency;
+               orig_mode = VideoMode(info.dmPelsWidth, info.dmPelsHeight);
+               orig_mode.rate = info.dmDisplayFrequency;
        }
 #else
        if(disp_name.empty())
-               priv->display=XOpenDisplay(0);
+               priv->display = XOpenDisplay(0);
        else
-               priv->display=XOpenDisplay(disp_name.c_str());
+               priv->display = XOpenDisplay(disp_name.c_str());
        if(!priv->display)
                throw Exception("Couldn't open X display");
 
        XSetErrorHandler(x_error_handler);
 
 #ifdef WITH_XF86VIDMODE
-       int screen=DefaultScreen(priv->display);
+       int screen = DefaultScreen(priv->display);
 
        int nmodes;
        XF86VidModeModeInfo **infos;
        XF86VidModeGetAllModeLines(priv->display, screen, &nmodes, &infos);
        for(int i=0; i<nmodes; ++i)
        {
-               XF86VidModeModeInfo &info=*infos[i];
+               XF86VidModeModeInfo &info = *infos[i];
        
                VideoMode mode(info.hdisplay, info.vdisplay);
                if(info.htotal && info.vtotal)
-                       mode.rate=info.dotclock/(info.htotal*info.vtotal);
+                       mode.rate = info.dotclock/(info.htotal*info.vtotal);
                modes.push_back(mode);
        }
 
@@ -102,9 +102,9 @@ Display::Display(const string &disp_name):
        XF86VidModeModeLine modeline;
        int dotclock;
        XF86VidModeGetModeLine(priv->display, screen, &dotclock, &modeline);
-       orig_mode=VideoMode(modeline.hdisplay, modeline.vdisplay);
+       orig_mode = VideoMode(modeline.hdisplay, modeline.vdisplay);
        if(modeline.htotal && modeline.vtotal)
-               orig_mode.rate=dotclock/(modeline.htotal*modeline.vtotal);
+               orig_mode.rate = dotclock/(modeline.htotal*modeline.vtotal);
 #endif
 #endif
 }
@@ -119,7 +119,7 @@ Display::~Display()
 
 void Display::add_window(Window &wnd)
 {
-       priv->windows[wnd.get_private().window]=&wnd;
+       priv->windows[wnd.get_private().window] = &wnd;
 }
 
 void Display::remove_window(Window &wnd)
@@ -131,30 +131,30 @@ void Display::set_mode(const VideoMode &mode)
 {
 #if defined(WIN32)
        DEVMODE info;
-       info.dmSize=sizeof(DEVMODE);
-       info.dmFields=DM_PELSWIDTH|DM_PELSHEIGHT;
-       info.dmPelsWidth=mode.width;
-       info.dmPelsHeight=mode.height;
+       info.dmSize = sizeof(DEVMODE);
+       info.dmFields = DM_PELSWIDTH|DM_PELSHEIGHT;
+       info.dmPelsWidth = mode.width;
+       info.dmPelsHeight = mode.height;
        if(mode.rate)
        {
-               info.dmFields|=DM_DISPLAYFREQUENCY;
-               info.dmDisplayFrequency=mode.rate;
+               info.dmFields |= DM_DISPLAYFREQUENCY;
+               info.dmDisplayFrequency = mode.rate;
        }
 
        ChangeDisplaySettings(&info, CDS_FULLSCREEN);
 #elif defined(WITH_XF86VIDMODE)
-       int screen=DefaultScreen(priv->display);
+       int screen = DefaultScreen(priv->display);
 
        int nmodes;
        XF86VidModeModeInfo **infos;
        XF86VidModeGetAllModeLines(priv->display, screen, &nmodes, &infos);
        for(int i=0; i<nmodes; ++i)
        {
-               XF86VidModeModeInfo &info=*infos[i];
+               XF86VidModeModeInfo &info = *infos[i];
 
-               unsigned rate=0;
+               unsigned rate = 0;
                if(info.htotal && info.vtotal)
-                       rate=info.dotclock/(info.htotal*info.vtotal);
+                       rate = info.dotclock/(info.htotal*info.vtotal);
                if(info.hdisplay==mode.width && info.vdisplay==mode.height && (mode.rate==0 || rate==mode.rate))
                {
                        XF86VidModeSwitchToMode(priv->display, screen, &info);
@@ -183,7 +183,7 @@ void Display::tick()
                else
                        break;
 #else
-               int pending=XPending(priv->display);
+               int pending = XPending(priv->display);
                if(pending==0)
                        break;
 
@@ -194,7 +194,7 @@ void Display::tick()
 
                        check_error();
 
-                       map<WindowHandle, Window *>::iterator j=priv->windows.find(event.xevent.xany.window);
+                       map<WindowHandle, Window *>::iterator j = priv->windows.find(event.xevent.xany.window);
                        if(j!=priv->windows.end())
                        {
                                /* Filter keyboard autorepeat.  If this packet is a KeyRelease and
@@ -202,12 +202,12 @@ void Display::tick()
                                indicate autorepeat and must be dropped. */
                                if(event.xevent.type==KeyRelease && !j->second->get_keyboard_autorepeat() && pending>0)
                                {
-                                       XKeyEvent &kev=event.xevent.xkey;
+                                       XKeyEvent &kev = event.xevent.xkey;
                                        XEvent ev2;
                                        XPeekEvent(priv->display, &ev2);
                                        if(ev2.type==KeyPress)
                                        {
-                                               XKeyEvent &kev2=ev2.xkey;
+                                               XKeyEvent &kev2 = ev2.xkey;
                                                if(kev2.window==kev.window && kev2.time==kev.time && kev2.keycode==kev.keycode)
                                                {
                                                        XNextEvent(priv->display, &ev2);
@@ -228,7 +228,7 @@ void Display::check_error()
 {
        if(error_flag)
        {
-               error_flag=false;
+               error_flag = false;
                throw Exception(error_msg);
        }
 }