From c0b71a7151437c681fe832d1e446924a49ab29aa Mon Sep 17 00:00:00 2001 From: Good Guy Date: Thu, 28 Jan 2016 10:37:18 -0700 Subject: [PATCH] font/icon scaling default=1, remove glx probe msgs --- cinelerra-5.0/guicast/bcresources.C | 12 ++++++------ cinelerra-5.0/guicast/bcwindow3d.C | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cinelerra-5.0/guicast/bcresources.C b/cinelerra-5.0/guicast/bcresources.C index 5e1e4e62..fa72be3b 100644 --- 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 32ab1ce0..b3302fa5 100644 --- 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(); -- 2.26.2