Merge commit 'ff48e71434a414958e6e56628ccf04284d030784' into master-merge

diff --cc Makefile
Simple merge

diff --cc libs/gtkutil/xorrectangle.cpp
Simple merge

diff --cc radiant/CMakeLists.txt
Simple merge

diff --cc radiant/main.cpp
index 8564fc7b62036596cee9ecbe4bb108d44953f26f,88cd0cad4fd89e7a774ca8941be1a9fbd5b60144..a2d288f15eff91315e794a5a14f8ed1419ce370a
--- 1/radiant/main.cpp
--- 2/radiant/main.cpp
+++ b/radiant/main.cpp
@@@ -502,23 -534,32 +502,48 @@@ void user_shortcuts_save()
        SaveCommandMap( path.c_str() );
  }
  
+ void add_local_rc_files(){
+ #define GARUX_DISABLE_GTKTHEME
+ #ifndef GARUX_DISABLE_GTKTHEME
+ /* FIXME: HACK: not GTK3 compatible
+  https://developer.gnome.org/gtk2/stable/gtk2-Resource-Files.html#gtk-rc-add-default-file
+  https://developer.gnome.org/gtk3/stable/gtk3-Resource-Files.html#gtk-rc-add-default-file
+  > gtk_rc_add_default_file has been deprecated since version 3.0 and should not be used in newly-written code.
+  > Use GtkStyleContext with a custom GtkStyleProvider instead
+ */
+ 
+       {
+               StringOutputStream path( 512 );
+               path << AppPath_get() << ".gtkrc-2.0.radiant";
+               gtk_rc_add_default_file( path.c_str() );
+       }
+ #ifdef WIN32
+       {
+               StringOutputStream path( 512 );
+               path << AppPath_get() << ".gtkrc-2.0.win";
+               gtk_rc_add_default_file( path.c_str() );
+       }
+ #endif
+ #endif // GARUX_DISABLE_GTKTHEME
+ }
+ 
 +/* HACK: If ui::main is not called yet,
 +gtk_main_quit will not quit, so tell main
 +to not call ui::main. This happens when a
 +map is loaded from command line and require
 +a restart because of wrong format.
 +Delete this when the code to not have to
 +restart to load another format is merged. */
 +bool g_dontStart = false;
 +
  int main( int argc, char* argv[] ){
 +#if GTK_TARGET == 3
 +      // HACK: force legacy GL backend as we don't support GL3 yet
 +      setenv("GDK_GL", "LEGACY", 0);
 +#if GDEF_OS_LINUX || GDEF_OS_BSD
 +      setenv("GDK_BACKEND", "x11", 0);
 +#endif
 +#endif // GTK_TARGET == 3
        crt_init();
  
        streams_init();
@@@ -561,23 -596,18 +586,23 @@@
        }
  
        // Gtk already removed parsed `--options`
-       if ( argc == 2 ) {
-               if ( strlen( argv[ 1 ] ) > 1 ) {
-                       mapname = argv[ 1 ];
+       if (argc == 2) {
+               if ( strlen( argv[1] ) > 1 ) {
 -                      if ( g_str_has_suffix( argv[1], ".map" ) ) {
 -                              if ( g_path_is_absolute( argv[1] ) ) {
+                                       mapname = argv[1];
 +
 +                      if ( g_str_has_suffix( mapname, ".map" ) ) {
 +                              if ( !g_path_is_absolute( mapname ) ) {
 +                                      mapname = g_build_filename( g_get_current_dir(), mapname, NULL );
                                }
 -                              else {
 -                                      mapname = g_build_filename( g_get_current_dir(), argv[1], NULL );
 -                              }
 +
 +#if GDEF_OS_WINDOWS
 +                              mapname_buffer << PathCleaned( mapname );
 +                              mapname = mapname_buffer.c_str();
 +#endif
                        }
                        else {
 -                              g_print( "bad file name, will not load: %s\n", argv[1] );
 +                              g_print( "bad file name, will not load: %s\n", mapname );
 +                              mapname = NULL;
                        }
                }
        }
@@@ -604,6 -634,12 +629,8 @@@
  
        paths_init();
  
 -      if ( !check_version() ) {
 -              return EXIT_FAILURE;
 -      }
 -
+       add_local_rc_files();
+ 
        show_splash();
  
        create_global_pid();
@@@ -663,17 -699,7 +690,17 @@@
  
        remove_local_pid();
  
-               ui::main();
 +      /* HACK: If ui::main is not called yet,
 +      gtk_main_quit will not quit, so tell main
 +      to not call ui::main. This happens when a
 +      map is loaded from command line and require
 +      a restart because of wrong format.
 +      Delete this when the code to not have to
 +      restart to load another format is merged. */
 +      if ( !g_dontStart )
 +      {
+       ui::main();
 +      }
  
        // avoid saving prefs when the app is minimized
        if ( g_pParentWnd->IsSleeping() ) {

diff --cc radiant/mainframe.cpp
index c413708181aa6dc9a0306064202a9827619b01cb,38c46fafefbcf3a4db7abf1b92ff054242f3a183..8cc59bc18576ae7b622b6c77c5666f5b6cd187d1
--- 1/radiant/mainframe.cpp
--- 2/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@@ -102,19 -102,12 +102,24 @@@
  #include "texwindow.h"
  #include "filterbar.h"
  
 -
 +#if GDEF_OS_WINDOWS
 +#include <process.h>
 +#else
 +#include <spawn.h>
 +#endif
 +
 +#ifdef WORKAROUND_WINDOWS_GTK2_GLWIDGET
 +/* workaround for gtk 2.24 issue: not displayed glwidget after toggle */
 +#define WORKAROUND_GOBJECT_SET_GLWIDGET(window, widget) g_object_set_data( G_OBJECT( window ), "glwidget", G_OBJECT( widget ) )
 +#else
 +#define WORKAROUND_GOBJECT_SET_GLWIDGET(window, widget)
 +#endif
 +
+ #define GARUX_DISABLE_GTKTHEME
+ #ifndef GARUX_DISABLE_GTKTHEME
+ #include "gtktheme.h"
+ #endif
+ 
  struct layout_globals_t
  {
        WindowPosition m_position;
@@@ -1135,8 -1068,11 +1140,12 @@@ ui::MenuItem create_colours_menu()
        create_menu_item_with_mnemonic( menu_3, "Q3Radiant Original", "ColorSchemeQER" );
        create_menu_item_with_mnemonic( menu_3, "Black and Green", "ColorSchemeBlackAndGreen" );
        create_menu_item_with_mnemonic( menu_3, "Maya/Max/Lightwave Emulation", "ColorSchemeYdnar" );
 +      create_menu_item_with_mnemonic(menu_3, "Adwaita Dark", "ColorSchemeAdwaitaDark");
  
+ #ifndef GARUX_DISABLE_GTKTHEME
+       create_menu_item_with_mnemonic( menu_in_menu, "GTK Theme...", "gtkThemeDlg" );
+ #endif
+ 
        menu_separator( menu_in_menu );
  
        create_menu_item_with_mnemonic( menu_in_menu, "_Texture Background...", "ChooseTextureBackgroundColor" );

diff --cc radiant/texwindow.cpp
Simple merge

diff --cc radiant/xywindow.cpp
Simple merge