@ -4,7 +4,7 @@
# ifdef WEBKIT_FOUND # ifdef WEBKIT_FOUND
# include <webkit2/webkit2.h>
# include <webkit2/webkit2.h>
# endif # endif
# include <vte -2.91/vte /vte.h># include <vte /vte.h>
# include <locale.h> # include <locale.h>
# include <stdio.h> # include <stdio.h>
# include <time.h> # include <time.h>
@ -17,13 +17,17 @@
# include <libintl.h> # include <libintl.h>
# include <time.h> # include <time.h>
# include <json-c/json.h> # include <json-c/json.h>
# include "ubl-utils.h" // #include "ubl-utils.h"
# include "ubl-strings.h" # include "ubl-strings.h"
# define VTE_INCLUDE
# include <libublsettings.h>
# include <libublsettings-gtk3.h>
# include <libublsettingsui-gtk3.h>
# ifndef UBL_SETINGS_VIDEO_H # ifndef UBL_SETINGS_VIDEO_H
# define UBL_SETINGS_VIDEO_H # define UBL_SETINGS_VIDEO_H
# define UBLINUX_WIKI_LINK " https: //wiki.ublinux.ru/ru/Пр о г р а о е о б е с е е е р о г р а у В с е # define WIKI_LINK " https://wiki.ublinux.ru/ru/Пр о г р а о е о б е с е е е р о г р а у В с е
# define UBLINUX_ HOMEPAGE_LINK _("https://wiki.ublinux.com")
# define HOMEPAGE_LINK _("https://wiki.ublinux.com")
# define icon_name "com.ublinux.ubl-settings-video" # define icon_name "com.ublinux.ubl-settings-video"
@ -49,7 +53,7 @@
# define get_proprietary_drivers_info_command "cut -d';' -f2- / usr / share / ubl-settings-video / csv / video-drivers.csv" # define get_proprietary_drivers_info_command "cut -d';' -f2- / usr / share / ubl-settings-video / csv / video-drivers.csv"
# define get_resolutions_supportable_command " cut -d, -f1- / usr / share / ubl-settings-video / csv / resolutions.csv |sed 's/ , / / g' "# define get_resolutions_supportable_command " / usr / share / ubl-settings-video / csv / resolutions.csv "
# define get_frequences_command "xrandr |grep -v -n \"[a-z][a-z]\" |sed 's / * / / g' |cut -d' ' -f1,3-" # define get_frequences_command "xrandr |grep -v -n \"[a-z][a-z]\" |sed 's / * / / g' |cut -d' ' -f1,3-"
@ -86,6 +90,43 @@
# define get_adapter_info_json "lshw -c display -quiet -json" # define get_adapter_info_json "lshw -c display -quiet -json"
# define XORG_MONITOR(port) yon_char_append("XORG_MONITOR[",yon_char_append(port,"]")) # define XORG_MONITOR(port) yon_char_append("XORG_MONITOR[",yon_char_append(port,"]"))
# define VGADRV_AUTO "VGADRV_AUTO"
# define VGADRV_NOFREE "VGADRV_NOFREE"
# define XORG_EXT "XORG_EXT"
# define XORG_DPI "XORG_DPI"
# define FAILSAFEATI "FAILSAFEATI"
# define FAILSAFENVIDIA "FAILSAFENVIDIA"
# define OPTIRUN "OPTIRUN"
# define PRIMUSRUN "PRIMUSRUN"
# define INTEGRATEDVGA "INTEGRATEDVGA"
# define KWIN_TRIPLE_BUFFER "\"export KWIN_TRIPLE_BUFFER"
# define GL_YIELD "\"export __GL_YIELD"
# define VGADRV_AUTO_command "ubconfig --source global get [video] VGADRV_AUTO"
# define VGADRV_NOFREE_command "ubconfig --source global get [video] VGADRV_NOFREE"
# define XORG_EXT_command "ubconfig --source global get [video] XORG_EXT"
# define XORG_DPI_command "ubconfig --source global get [video] XORG_DPI"
# define FAILSAFEATI_command "ubconfig --source global get [video] FAILSAFEATI"
# define FAILSAFENVIDIA_command "ubconfig --source global get [video] FAILSAFENVIDIA"
# define OPTIRUN_command "ubconfig --source global get [video] OPTIRUN"
# define PRIMUSRUN_command "ubconfig --source global get [video] PRIMUSRUN"
# define INTEGRATEDVGA_command "ubconfig --source global get [video] INTEGRATEDVGA"
# define KWIN_TRIPLE_BUFFER_command "ubconfig --source global get [ / etc / profile.d / ublinux.sh] \"export KWIN_TRIPLE_BUFFER\""
# define GL_YIELD_command "ubconfig --source global get [ / etc / profile.d / ublinux.sh] \"export __GL_YIELD\""
# define XORG_PARAMETER "XORG_MONITOR"
# define config_get_command(target) yon_char_append("cat ",target)
# define yon_config_get_custom_command(target) yon_char_unite("ubconfig --source ",target," get [video] XORG_MONITOR[*] VGADRV_AUTO VGADRV_NOFREE XORG_EXT XORG_DPI FAILSAFEATI FAILSAFENVIDIA OPTIRUN PRIMUSRUN INTEGRATEDVGA",NULL), yon_char_unite("ubconfig --source ",target," get [ / etc / profile.d / ublinux.sh] \"export KWIN_TRIPLE_BUFFER\" \"export __GL_YIELD\"",NULL)
# define config_get_local_command "ubconfig --source system get [video] XORG_MONITOR[*] VGADRV_AUTO VGADRV_NOFREE XORG_EXT XORG_DPI FAILSAFEATI FAILSAFENVIDIA OPTIRUN PRIMUSRUN INTEGRATEDVGA", "ubconfig --source system get [ / etc / profile.d / ublinux.sh] \"export KWIN_TRIPLE_BUFFER\" \"export __GL_YIELD\""
# define config_get_global_command yon_char_new("ubconfig --source global get [video] XORG_MONITOR[*] VGADRV_AUTO VGADRV_NOFREE XORG_EXT XORG_DPI FAILSAFEATI FAILSAFENVIDIA OPTIRUN PRIMUSRUN INTEGRATEDVGA"), "ubconfig --source global get [ / etc / profile.d / ublinux.sh] \"export KWIN_TRIPLE_BUFFER\" \"export __GL_YIELD\""
# define config_get_default_command ""
# define config_get_global_only_parameters ""
# define config_get_local_only_parameters ""
# define XORG_MONITOR_get_command "ubconfig --source global get [video] XORG_MONITOR[*]"
char * drivers_always_active [ ] = { " mesa " , " lib32-vulkan-intel " , " xf86-video-intel " } ; char * drivers_always_active [ ] = { " mesa " , " lib32-vulkan-intel " , " xf86-video-intel " } ;
int drivers_always_active_size = 3 ; int drivers_always_active_size = 3 ;
@ -117,7 +158,77 @@ typedef struct {
typedef struct typedef struct
{ {
int alwaysredirect ;
template_window_fields
GtkWidget * AutoDriverCombo ;
GtkWidget * FreeDriverCombo ;
GtkWidget * FailsafeNvidiaCombo ;
GtkWidget * FailsafeAMDCombo ;
GtkWidget * MonitorsBox ;
GtkWidget * DontSwitchDisplaysOffCombo ;
GtkWidget * DisplayScalingCombo ;
GtkWidget * DisplayDiscreteOnly ;
GtkWidget * OptirunCombo ;
GtkWidget * OptirunEntry ;
GtkWidget * OptirunButton ;
GtkWidget * PrimusrunCombo ;
GtkWidget * PrimusrunEntry ;
GtkWidget * PrimusrunButton ;
GtkWidget * FrameGapCombo ;
GtkWidget * proprietaryTreeView ;
GtkWidget * proprietaryInfoButton ;
GtkWidget * proprietaryDeleteButton ;
GtkWidget * proprietaryInstallButton ;
GtkTreeSelection * proprietaryTreeSelection ;
GtkWidget * driversTreeView ;
GtkWidget * driversInfoButton ;
GtkWidget * driversDeleteButton ;
GtkWidget * driversInstallButton ;
GtkTreeSelection * driversTreeSelection ;
GtkTreeViewColumn * proprietartInstalledColumn ;
GtkTreeViewColumn * ProprietaryPackageColumn ;
GtkTreeViewColumn * ProprietaryDriverColumn ;
GtkTreeViewColumn * ProprietaryDescriptionColumn ;
GtkTreeViewColumn * ProprietarySupportedColumn ;
GtkTreeViewColumn * driverInstalledColumn ;
GtkTreeViewColumn * driverPackageColumn ;
GtkTreeViewColumn * driverDriverColumn ;
GtkTreeViewColumn * driverDescriptionColumn ;
GtkTreeViewColumn * driverSupportedColumn ;
GtkWidget * DriverModulesTab ;
GtkWidget * DriversTab ;
GtkWidget * MainTabLabel ;
GtkWidget * DriversTabLabel ;
GtkWidget * InformationTabLabel ;
GtkWidget * InformationFrameLabel ;
GtkWidget * InformationOverlay ;
GtkWidget * InformationCompanyLogoImage ;
GtkWidget * InformationOverlay2 ;
GtkWidget * InformationCompanyLogoImage2 ;
GtkWidget * InformationLabel ;
GtkWidget * InformationLabel2 ;
GtkWidget * TerminalOverlay ;
GtkWidget * TerminalBox ;
GtkWidget * TerminalRevealer ;
GtkWidget * TerminalInfoLabel ;
GtkWidget * TerminalMoreButton ;
GtkWidget * TerminalScroll ;
GtkWidget * TerminalMoreRevieler ;
GtkWidget * MenusTab ;
GtkWidget * LoadDriversButton ;
GtkWidget * proprietaryNotebook ;
} main_window ;
typedef struct
{
template_config_fields
config_str loaded_config ;
config_str loaded_config ;
int configsize ;
int configsize ;
int autoChooseDrivers ;
int autoChooseDrivers ;
@ -139,16 +250,11 @@ typedef struct
int resolutionssize ;
int resolutionssize ;
render_data status_render ;
render_data status_render ;
int socket_id ;
int save_socket_id ;
int load_socket_id ;
int lock_save_local ;
int lock_save_global ;
int lock_load_global ;
int lock_help ;
dictionary * monitor_output_layers ;
dictionary * monitor_output_layers ;
GtkWidget * pack_box ;
GtkWidget * pack_box ;
int dblock ;
int dblock ;
int save_config ;
main_window * widgets ;
} config ; } config ;
typedef struct typedef struct
@ -176,180 +282,48 @@ typedef struct {
GtkWidget * tree ;
GtkWidget * tree ;
} combo_tree ; } combo_tree ;
typedef struct
{
dictionary * monitors ;
dictionary * overlays ;
GtkBuilder * builder ;
GtkWidget * appsPackBox ;
GtkWidget * appsPackWindow ;
GtkWidget * extraOptirunChooseAppsButton ;
GtkWidget * extraPrimusunChooseAppsButton ;
GtkWidget * MainWindow ;
GtkWidget * headBox ;
GtkWidget * headTitleLabel ;
GtkWidget * headInfoLabel ;
GtkWidget * mainPlugBox ;
GtkWidget * mainErrorBox ;
GtkWidget * mainHeadOverlay ;
GtkWidget * mainHeadBackgroundImage ;
GtkWidget * mainDriverAutomaticallyChooseCheck ;
GtkWidget * mainDriverProprietaryDriverLabel ;
GtkWidget * mainDriverFailsafeNvidiaLabel ;
GtkWidget * mainDriverFailsafeAMDLabel ;
GtkWidget * mainDriverProprietaryDriverCombo ;
GtkWidget * mainDriverProprietaryDriverButton ;
GtkWidget * mainExtraFixGapCombo ;
GtkWidget * mainDriverFailsafeNvidiaCombo ;
GtkWidget * mainDriverFailsafeAMDCombo ;
GtkWidget * mainDriverFrameLabel ;
GtkWidget * monitorConfigurationMethodLabel ;
GtkWidget * monitorConfigurationMethodCombo ;
GtkWidget * mainMonitorVisualConfigurationBox ;
GtkWidget * mainMonitorConfigurationBox ;
GtkWidget * mainMonitorConfigurationFrameLabel ;
GtkWidget * mainHybridGraphicsDiscreteLabel ;
GtkWidget * mainHybridGraphicsDiscreteCheck ;
GtkWidget * mainHybridGraphicsFrameLabel ;
GtkWidget * mainExtraLaunchOptirunCheck ;
GtkWidget * mainExtraLaunchPrismusunCheck ;
GtkWidget * mainExtraFixGapLabel ;
GtkWidget * mainExtraLaunchOptirunEntry ;
GtkWidget * mainExtraLaunchPrismusunEntry ;
GtkWidget * mainExtraLaunchThroughEntry ;
GtkWidget * mainExtraFixGapLabelCombo ;
GtkWidget * mainExtraLaunchThroughButton ;
GtkWidget * mainExtraFrameLabel ;
GtkWidget * mainHeaderTitleLabel ;
GtkWidget * mainHeaderLoadButton ;
GtkWidget * mainHeaderConfigLoadLabel ;
GtkWidget * mainHeaderSaveConfigurationLabel ;
GtkWidget * mainHeaderSaveButton ;
GtkWidget * mainHeaderSettingsButton ;
GtkWidget * mainHeaderLoadGlobalMenuItem ;
GtkWidget * mainHeaderLoadLocalMenuItem ;
GtkWidget * mainHeaderSaveGlobalLocalMenuItem ;
GtkWidget * mainHeaderSaveGlobalMenuItem ;
GtkWidget * mainHeaderSaveLocalMenuItem ;
GtkWidget * mainHeaderSettingsDocumentationMenuItem ;
GtkWidget * mainHeaderSettingsAboutMenuItem ;
GtkWidget * mainStatusBox ;
GtkWidget * mainStatusIcon ;
GtkWidget * mainStatusLabel ;
GtkWidget * templateMonitorConfigurationBox ;
GtkWidget * templateMonitorConfigurationMonitorLabel ;
GtkWidget * templateMonitorConfigurationResolutionLabel ;
GtkWidget * templateMonitorConfigurationResolutionCombo ;
GtkWidget * templateMonitorConfigurationFrequencyLabel ;
GtkWidget * templateMonitorConfigurationFrequencyCombo ;
GtkWidget * templateMonitorConfigurationRotationLabel ;
GtkWidget * templateMonitorConfigurationRotationCombo ;
GtkWidget * templateMonitorConfigurationMainRadio ;
GtkWidget * templateMonitorConfigurationParameterLineCheck ;
GtkWidget * templateMonitorConfigurationParameterLineEntry ;
GtkWidget * templateMonitorConfigurationDoNotSwitchOffLabel ;
GtkWidget * templateMonitorConfigurationDoNotSwitchOffCheck ;
GtkWidget * proprietaryTreeView ;
GtkWidget * proprietaryInfoButton ;
GtkWidget * proprietaryDeleteButton ;
GtkWidget * proprietaryInstallButton ;
GtkTreeSelection * proprietaryTreeSelection ;
GtkWidget * driversTreeView ;
GtkWidget * driversInfoButton ;
GtkWidget * driversDeleteButton ;
GtkWidget * driversInstallButton ;
GtkTreeSelection * driversTreeSelection ;
GtkTreeViewColumn * proprietartInstalledColumn ;
GtkTreeViewColumn * ProprietaryPackageColumn ;
GtkTreeViewColumn * ProprietaryDriverColumn ;
GtkTreeViewColumn * ProprietaryDescriptionColumn ;
GtkTreeViewColumn * ProprietarySupportedColumn ;
GtkTreeViewColumn * driverInstalledColumn ;
GtkTreeViewColumn * driverPackageColumn ;
GtkTreeViewColumn * driverDriverColumn ;
GtkTreeViewColumn * driverDescriptionColumn ;
GtkTreeViewColumn * driverSupportedColumn ;
GtkWidget * DriverModulesTab ;
GtkWidget * DriversTab ;
GtkWidget * MainTabLabel ;
GtkWidget * DriversTabLabel ;
GtkWidget * InformationTabLabel ;
GtkWidget * InformationFrameLabel ;
GtkWidget * InformationOverlay ;
GtkWidget * InformationCompanyLogoImage ;
GtkWidget * InformationOverlay2 ;
GtkWidget * InformationCompanyLogoImage2 ;
GtkWidget * TerminalOverlay ;
GtkWidget * TerminalBox ;
GtkWidget * TerminalRevealer ;
GtkWidget * TerminalInfoLabel ;
GtkWidget * TerminalMoreButton ;
GtkWidget * TerminalScroll ;
GtkWidget * TerminalMoreRevieler ;
GtkWidget * PlugBox ;
GtkWidget * PlugSaveBox ;
GtkWidget * PlugLoadBox ;
GtkWidget * MenusTab ;
GtkWidget * LoadDriversButton ;
GtkWidget * proprietaryNotebook ;
} widgets_dict ;
typedef struct typedef struct
{ {
char * curport ;
char * curport ;
config_str resolutions ;
config_str resolutions ;
int resolutionssize ;
int resolutionssize ;
GtkWidget * templateMonitorConfigurationWindow ;
GtkWidget * MainWindow ;
GtkWidget * mainMonitorConfigurationBox ;
GtkWidget * StatusBox ;
GtkWidget * templateMonitorConfigurationBox ;
GtkWidget * HeadLabel ;
GtkWidget * templateMonitorConfigurationEnableCheck ;
GtkWidget * EnableConfigurationBox ;
GtkWidget * templateMonitorConfigurationPortLabel ;
GtkWidget * InterfaceConfigurationBox ;
GtkWidget * templateMonitorConfigurationPortCombo ;
GtkWidget * EnableCheck ;
GtkWidget * templateMonitorConfigurationMainCheck ;
GtkWidget * PortCombo ;
GtkWidget * templateMonitorConfigurationResolutionLabel ;
GtkWidget * MainCheck ;
GtkWidget * templateMonitorConfigurationResolutionCombo ;
GtkWidget * ResolutionCombo ;
GtkWidget * templateMonitorConfigurationShowUnsupportedCheck ;
GtkWidget * UnsupportedCheck ;
GtkWidget * templateMonitorConfigurationFrequencyLabel ;
GtkWidget * FrequencyCombo ;
GtkWidget * templateMonitorConfigurationFrequencyCombo ;
GtkWidget * RotationCombo ;
GtkWidget * templateMonitorConfigurationRotationLabel ;
GtkWidget * PositionPosCombo ;
GtkWidget * templateMonitorConfigurationRotationCombo ;
GtkWidget * PositionPortCombo ;
GtkWidget * templateMonitorConfigurationPositionLabel ;
GtkWidget * DoNotSwitchOffCheck ;
GtkWidget * templateMonitorConfigurationPositionPosCombo ;
GtkWidget * ModelineCVTCheck ;
GtkWidget * templateMonitorConfigurationPositionPortCombo ;
GtkWidget * UseCVTReducedCheck ;
GtkWidget * templateMonitorConfigurationDoNotSwitchOffCheck ;
GtkWidget * ModelineGTFCheck ;
GtkWidget * templateMonitorConfigurationModelineCVTCheck ;
GtkWidget * ParameterLineCheck ;
GtkWidget * templateMonitorConfigurationUseCVTReducedCheck ;
GtkWidget * ParameterLineEntry ;
GtkWidget * templateMonitorConfigurationModelineGTFCheck ;
GtkWidget * CancelButton ;
GtkWidget * templateMonitorConfigurationParameterLineCheck ;
GtkWidget * SaveButton ;
GtkWidget * templateMonitorConfigurationParameterLineEntry ;
GtkWidget * templateMonitorConfigurationCancelButton ;
GtkWidget * templateMonitorConfigurationSaveButton ;
dictionary * config ;
} monitor_edit_window ; } monitor_edit_window ;
typedef struct { typedef struct {
GtkWidget * templateMonitorscreenOverlay ;
GtkWidget * ScreenOverlay ;
GtkWidget * templateMonitorImage ;
GtkWidget * MonitorImage ;
GtkWidget * templateMonitorInfoBox ;
GtkWidget * MonitorInfoBox ;
GtkWidget * templateMonitorInfoNameLabel ;
GtkWidget * NameLabel ;
GtkWidget * templateMonitorInfoResolutionLabel ;
GtkWidget * ResoulutionLabel ;
GtkWidget * templateMonitorDeleteButton ;
GtkWidget * DeleteButton ;
GtkWidget * templateMonitorSwitchButton ;
GtkWidget * SwitchButton ;
GtkWidget * templateMonitorInfoConfigureButton ;
GtkWidget * ConfigureButton ;
GtkWidget * templateMonitorInfoAddButton ;
GtkWidget * AddButton ;
monitor_config config ;
} monitor_data ;
} monitor_window ;
typedef struct typedef struct
{ {
@ -364,34 +338,35 @@ typedef struct
GtkWidget * ProprietaryAcceptButton ;
GtkWidget * ProprietaryAcceptButton ;
} driver_window ; } driver_window ;
monitor_data * yon_monitor_new ( main_window * widgets , int dull ) ;
// void on_closed_configuration(GtkWidget *self, MonitorSettings *monitors);
// void on_closed_configuration(GtkWidget *self, MonitorSettings *monitors);
// void on_save_configuration(GtkWidget self, MonitorSettings *monitors);
// void on_save_configuration(GtkWidget self, MonitorSettings *monitors);
void yon_parse_monitor ( ) ; // void yon_parse_monitor();
void on_config_fill_interface ( widgets_dict * widgets ) ; // void on_config_fill_interface(main_window *widgets);
void yon_update_config ( widgets_dict * widgets ) ; // void yon_update_config(main_window *widgets);
void on_configuration_save_global ( GtkWidget * self , widgets_dict * widgets ) ; // void on_configuration_save_global(GtkWidget *self, main_window *widgets);
void on_configuration_save__local_global ( GtkWidget * self , widgets_dict * widgets ) ; // void on_configuration_save__local_global(GtkWidget *self, main_window *widgets);
void on_configuration_save__local ( GtkWidget * self , widgets_dict * widgets ) ; // void on_configuration_save__local(GtkWidget *self, main_window *widgets);
void yon_config_monitor_string_parse ( char * parameters , int * size ) ; // void yon_config_monitor_string_parse(char *parameters, int *size);
char * yon_char_parsed_get_resolution ( config_str parsed_string , int size ) ; // char *yon_char_parsed_get_resolution(config_str parsed_string, int size);
void yon_monitor_set_resolutions ( ) ; // void yon_monitor_set_resolutions();
monitor_config yon_monitor_config_new ( char * port ) ; // monitor_config yon_monitor_config_new(char *port);
void yon_monitor_config_update ( monitorconfig * monitor , char * port , char * config_string ) ; // void yon_monitor_config_update(monitorconfig* monitor, char *port, char *config_string);
void yon_monitor_view_new ( monitor_config monitor ) ; // void yon_monitor_view_new(monitor_config monitor);
void on_configuration_save_global_local ( GtkWidget * self , widgets_dict * widgets ) ; // void on_configuration_save_global_local(GtkWidget *self, main_window *widgets);
// void on_confugure_monitor_settings(GtkWidget *self, MonitorSettings *settings);
// // void on_confugure_monitor_settings(GtkWidget *self, MonitorSettings *settings);
void yon_monitor_view_draw_all ( ) ; // void yon_monitor_view_draw_all();
void on_monitor_configure ( GtkWidget * self , monitor_window * window ) ; // void on_monitor_configure(GtkWidget *self,monitor_window *window);
void on_monitor_add ( GtkWidget * self , monitor_window * window ) ; // void on_monitor_add(GtkWidget *self,monitor_window *window);
void on_monitor_switch ( GtkWidget * self , monitor_window * window ) ; // void on_monitor_switch(GtkWidget *self,monitor_window *window);
void on_monitor_delete ( GtkWidget * self , monitor_view windowd ) ; // void on_monitor_delete(GtkWidget *self,monitor_view windowd);
void yon_monitor_view_update ( ) ; // void yon_monitor_view_update();
void yon_monitor_window_update ( monitor_edit_window * window ) ; // void yon_monitor_window_update(monitor_edit_window *window);
char * yon_monitor_make_string ( monitorconfig * config ) ; // char *yon_monitor_make_string(monitorconfig* config);
void yon_launch_with_output ( char * command ) ; void yon_launch_with_output ( char * command ) ;
dictionary * yon_proprieary_get ( ) ; dictionary * yon_proprieary_get ( ) ;
void yon_gtk_list_store_fill_with_proprietaries ( GtkListStore * list ) ; void yon_gtk_list_store_fill_with_proprietaries ( GtkListStore * list ) ;
void yon_setup_config ( char * configcommand ) ; void yon_monitor_view_update ( ) ;
void yon_monitor_view_setup ( GtkWidget * container ) ; // void yon_setup_config(char *configcommand);
// void yon_monitor_view_setup(GtkWidget *container);
# endif # endif
