font/icon scaling default=1, remove glx probe msgs

diff --git a/cinelerra-5.0/guicast/bcresources.C b/cinelerra-5.0/guicast/bcresources.C
index 5e1e4e6265928b13673231c11cbf5c831f0acc02..fa72be3b2d54b4bc068fdcc938a010984a31cdad 100644 (file)
--- a/cinelerra-5.0/guicast/bcresources.C
+++ b/cinelerra-5.0/guicast/bcresources.C
@@ -209,12 +209,12 @@ BC_Resources::BC_Resources()
 {
        synchronous = 0;
        vframe_shm = 0;
-
-       display_info = new BC_DisplayInfo("", 0);
-       int display_w = display_info->get_root_w();
-       int display_h = display_info->get_root_h();
-       int display_size = display_h < display_w ? display_h : display_w;
-       double default_scale = display_size/1000.;
+       /* causes more problems than it fixes */
+       //display_info = new BC_DisplayInfo("", 0);
+       //int display_w = display_info->get_root_w();
+       //int display_h = display_info->get_root_h();
+       //int display_size = display_h < display_w ? display_h : display_w;
+       double default_scale = 1.0; // display_size/1000.;
        char *env = getenv("BC_FONT_SCALE");
        font_scale = env ? atof(env) : default_scale;
        if( font_scale <= 0 ) font_scale = 1;

diff --git a/cinelerra-5.0/guicast/bcwindow3d.C b/cinelerra-5.0/guicast/bcwindow3d.C
index 32ab1ce04d48e92bcf5476d3c3a71eb8db320552..b3302fa5b4316df05c71baa75cedca31a9bb3c76 100644 (file)
--- a/cinelerra-5.0/guicast/bcwindow3d.C
+++ b/cinelerra-5.0/guicast/bcwindow3d.C
@@ -48,17 +48,17 @@ int BC_WindowBase::glx_test_fb_configs(int *attrs, GLXFBConfig *&cfgs,
 {
        int ncfgs = glx_fb_configs(attrs+2, cfgs);
        if( ncfgs ) return ncfgs;
-       if( msgs < 1 ) { ++msgs;  printf(_("%s: trying fallback 1\n"), msg); }
+       if( msgs < 1 ) { ++msgs; /* printf(_("%s: trying fallback 1\n"), msg); */ }
        ncfgs = glx_fb_configs(attrs+0, cfgs);
        if( ncfgs ) return ncfgs;
-       if( msgs < 2 ) { ++msgs;  printf(_("%s: trying single buffering\n"), msg); }
+       if( msgs < 2 ) { ++msgs; /* printf(_("%s: trying single buffering\n"), msg); */ }
        attrs[5] = False;
        ncfgs = glx_fb_configs(attrs+0, cfgs);
        if( ncfgs ) return ncfgs;
-       if( msgs < 3 ) { ++msgs;  printf(_("%s: trying fallback 2\n"), msg); }
+       if( msgs < 3 ) { ++msgs; /* printf(_("%s: trying fallback 2\n"), msg); */ }
        ncfgs = glx_fb_configs(attrs+2, cfgs);
        if( ncfgs ) return ncfgs;
-       if( msgs < 4 ) { ++msgs;  printf(_("%s: trying attributes None\n"), msg); }
+       if( msgs < 4 ) { ++msgs; /* printf(_("%s: trying attributes None\n"), msg); */ }
        ncfgs = glx_fb_configs(None, cfgs);
        if( ncfgs ) return ncfgs;
        disable_opengl();