Partial merge of the SDL2 branch into trunk

* Mainly get the cleanup of window drawing functions.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2102 416bcca6-2ee7-4201-b75f-2eb2f807beb1

src/input.c

@@ -325,7 +325,6 @@ int Handle_mouse_click(SDL_MouseButtonEvent event)
             else
               Input_new_mouse_K |= 1;
             break;
-            break;
 
         case SDL_BUTTON_RIGHT:
             if (Button_inverter)
@@ -333,7 +332,6 @@ int Handle_mouse_click(SDL_MouseButtonEvent event)
             else
               Input_new_mouse_K |= 2;
             break;
-            break;
 
         case SDL_BUTTON_MIDDLE:
             Key = KEY_MOUSEMIDDLE|Key_modifiers(SDL_GetModState());
@@ -347,6 +345,7 @@ int Handle_mouse_click(SDL_MouseButtonEvent event)
         case SDL_BUTTON_WHEELDOWN:
             Key = KEY_MOUSEWHEELDOWN|Key_modifiers(SDL_GetModState());
             return 0;
+
         default:
         return 0;
     }
@@ -842,11 +841,11 @@ int Get_input(int sleep_time)
     SDL_Event event;
     int user_feedback_required = 0; // Flag qui indique si on doit arrêter de traiter les évènements ou si on peut enchainer
                 
+    Color_cycling();
     // Commit any pending screen update.
     // This is done in this function because it's called after reading 
     // some user input.
     Flush_update();
-    Color_cycling();
     Key_ANSI = 0;
     Key = 0;
     Mouse_moved=0;