From 7e12aeb5975f8e1ecb191eb770a86e281463e8af Mon Sep 17 00:00:00 2001 From: QC Date: Mon, 17 Mar 2014 19:28:11 +0100 Subject: [PATCH] Remove profile. --- Makefile.am | 2 - include/profile-dialog.h | 10 --- include/rofi.h | 3 - source/profile-dialog.c | 168 --------------------------------------- source/rofi.c | 8 -- 5 files changed, 191 deletions(-) delete mode 100644 include/profile-dialog.h delete mode 100644 source/profile-dialog.c diff --git a/Makefile.am b/Makefile.am index dc33a97d..d0553bc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,13 +23,11 @@ rofi_SOURCES=\ source/dmenu-dialog.c\ source/run-dialog.c\ source/ssh-dialog.c\ - source/profile-dialog.c\ config/config.c\ include/rofi.h\ include/run-dialog.h\ include/ssh-dialog.h\ include/dmenu-dialog.h\ - include/profile-dialog.h\ include/xrmoptions.h\ include/textbox.h diff --git a/include/profile-dialog.h b/include/profile-dialog.h deleted file mode 100644 index 5a965651..00000000 --- a/include/profile-dialog.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __PROFILE_DIALOG_H__ -#define __PROFILE_DIALOG_H__ -#ifdef __QC_MODE__ - - - -SwitcherMode profile_switcher_dialog ( char **input ); - -#endif //__QC_MODE__ -#endif diff --git a/include/rofi.h b/include/rofi.h index 74d4fe7d..e1839879 100644 --- a/include/rofi.h +++ b/include/rofi.h @@ -18,9 +18,6 @@ typedef enum { WINDOW_SWITCHER, RUN_DIALOG, SSH_DIALOG, -#ifdef __QC_MODE__ - PROFILE_DIALOG, -#endif NUM_DIALOGS, DMENU_DIALOG, MODE_EXIT, diff --git a/source/profile-dialog.c b/source/profile-dialog.c deleted file mode 100644 index 824b52a4..00000000 --- a/source/profile-dialog.c +++ /dev/null @@ -1,168 +0,0 @@ -/** - * rofi - * - * MIT/X11 License - * Copyright 2013-2014 Qball Cow - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ - -#ifdef __QC_MODE__ -#define _GNU_SOURCE -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "rofi.h" -#include "profile-dialog.h" - -static inline int execshprofile( const char *profile ) -{ - return execlp( config.terminal_emulator, config.terminal_emulator, "-e","switch_profile.sh", profile, NULL ); -} -// execute sub-process -static pid_t exec_profile( const char *cmd ) -{ - if ( !cmd || !cmd[0] ) return -1; - - signal( SIGCHLD, catch_exit ); - pid_t pid = fork(); - - if ( !pid ) { - setsid(); - execshprofile( cmd ); - exit( EXIT_FAILURE ); - } - - return pid; -} -static inline char ** add_elements( char **retv, char *element, unsigned int *retv_index ) -{ - retv = realloc( retv, ( ( *retv_index )+2 )*sizeof( char* ) ); - retv[( *retv_index )] = element; - retv[( *retv_index )+1] = NULL; - ( *retv_index )++; - return retv; -} - -static char ** get_profile ( ) -{ - unsigned int retv_index = 0; - char *path; - char **retv = NULL; - - if ( getenv( "HOME" ) == NULL ) return NULL; - - const char *hd = getenv( "HOME" ); - unsigned int path_length = strlen( hd ) + strlen( ".switch_profile.conf" )+3; - path = allocate( path_length ); - snprintf( path, path_length, "%s/%s", hd, ".switch_profile.conf" ); - FILE *fd = fopen ( path, "r" ); - - if ( fd != NULL ) { - char buffer[1024]; - char *element = NULL; - int enabled = 0; - - while ( fgets( buffer,1024,fd ) != NULL ) { - buffer[strlen( buffer )-1] = '\0'; - char *entry = index( buffer, '=' ); - - // skip - if ( entry == NULL ) { - if ( element != NULL && enabled ) { - retv = add_elements( retv, element, &retv_index ); - } - - element = NULL; - continue; - } - - *entry = '\0'; - - if ( element == NULL ) { - element = strdup( buffer ); - enabled = strtol( entry+1, NULL, 10 ); - } else { - if ( strncmp( buffer, element, strlen( element ) ) == 0 ) - continue; - - // New entry? Store old one - if ( enabled ) { - retv = add_elements( retv, element, &retv_index ); - } - - element = strdup( buffer ); - enabled = strtol( entry+1, NULL, 10 ); - } - } - - if ( element != NULL && enabled ) { - retv = add_elements( retv, element, &retv_index ); - } - - fclose( fd ); - } - - free( path ); - return retv; -} - - -SwitcherMode profile_switcher_dialog ( char **input ) -{ - SwitcherMode retv = MODE_EXIT; - // act as a launcher - char **cmd_list = get_profile( ); - - if ( cmd_list == NULL ) { - unsigned int retv_index = 0; - cmd_list = add_elements( cmd_list, "No profiles found", &retv_index ); - } - - int shift=0; - int selected_line = 0; - int retvm = menu( cmd_list, input, "profile:", NULL, &shift,token_match, NULL, &selected_line ); - - if ( retvm == MENU_NEXT ) { - retv = NEXT_DIALOG; - } else if ( retvm == MENU_OK && cmd_list[selected_line] != NULL ) { - exec_profile( cmd_list[selected_line] ); - } - - for ( int i=0; cmd_list[i] != NULL; i++ ) { - free( cmd_list[i] ); - } - - free( cmd_list ); - - return retv; -} -#endif //__QC_MODE__ diff --git a/source/rofi.c b/source/rofi.c index f5f5082b..f4e659c4 100644 --- a/source/rofi.c +++ b/source/rofi.c @@ -65,7 +65,6 @@ #include "rofi.h" #include "run-dialog.h" #include "ssh-dialog.h" -#include "profile-dialog.h" #include "dmenu-dialog.h" #include "xrmoptions.h" @@ -1324,13 +1323,6 @@ void run_switcher( int fmode, SwitcherMode mode ) } else if ( mode == SSH_DIALOG ) { retv = ssh_switcher_dialog( &input ); } - -#ifdef __QC_MODE__ - else if ( mode == PROFILE_DIALOG ) { - retv = profile_switcher_dialog ( &input ); - } - -#endif // __QC_MODE__ else if ( mode == DMENU_DIALOG ) { retv = dmenu_switcher_dialog ( &input ); }