diff options
| -rw-r--r-- | kanotix-lxde-extra/compiz-k-stop.desktop | 14 | ||||
| -rw-r--r-- | kanotix-lxde-extra/compton-k-kill.desktop | 16 | ||||
| -rw-r--r-- | kanotix-lxde-extra/kanotix-start-compiz | 73 | ||||
| -rw-r--r-- | kanotix-lxde-extra/vi.desktop | 128 |
4 files changed, 212 insertions, 19 deletions
diff --git a/kanotix-lxde-extra/compiz-k-stop.desktop b/kanotix-lxde-extra/compiz-k-stop.desktop new file mode 100644 index 0000000..e074519 --- /dev/null +++ b/kanotix-lxde-extra/compiz-k-stop.desktop @@ -0,0 +1,14 @@ +# modified from compiz-start.desktop + +[Desktop Entry] +Type=Application +Name=Compiz Stop +GenericName=Stop Compiz +Comment=Start or restart x-window-manager +Comment[de]= x-window-manager starten +TryExec=compiz +Exec=x-window-manager --replace +Icon=application-exit +StartupNotify=true +Categories=Utility; +NotShowIn=MATE diff --git a/kanotix-lxde-extra/compton-k-kill.desktop b/kanotix-lxde-extra/compton-k-kill.desktop new file mode 100644 index 0000000..a2a48b7 --- /dev/null +++ b/kanotix-lxde-extra/compton-k-kill.desktop @@ -0,0 +1,16 @@ +#modified from compton.desktop + +[Desktop Entry] +Version=1.0 +Type=Application +Name=compton stop +Name[de]=compton beenden +GenericName=X compositor +Comment=stop A X compositor +Comment[de]=A X compositor stoppen +Categories=Utility; +TryExec=compton +Exec=killall -9 compton +Icon=application-exit +Keywords=x;x11;compositor; +# Thanks to quequotion for providing this file! diff --git a/kanotix-lxde-extra/kanotix-start-compiz b/kanotix-lxde-extra/kanotix-start-compiz index e2ba431..48002fc 100644 --- a/kanotix-lxde-extra/kanotix-start-compiz +++ b/kanotix-lxde-extra/kanotix-start-compiz @@ -6,19 +6,22 @@ [ "$(id -u)" = "0" ] && exit 2 # do not run as root ! [ -x /usr/bin/lxde-logout ] && exit 3 # only start in lxde +# This is the legacy window-manager for lxde +WM="openbox-lxde" + if [ -e ~/.nocompiz ]; then # write openbox-config and start openbox # keep care we have this config in case fusion-icon is started from # menu later with the -n option -mkdir -p ~/.config/compiz-1/ +mkdir -p ~/.config/compiz/ echo "compiz start disabled per user setting" >&2 -cat <<"_EOF_" > ~/.config/compiz-1/fusion-icon +cat <<"_EOF_" > ~/.config/compiz/fusion-icon [compiz options] loose binding = false indirect rendering = false [window manager] -active wm = openbox-lxde +active wm = openbox _EOF_ @@ -27,16 +30,26 @@ if [ -e ~/.compton ]; then echo "starting compton" >&2 compton -b fi -exit 4 +"$WM" --replace & +exit 0 +fi + +# check for compiz otherwise start openbox-lxde +if ! [ -x /usr/bin/fusion-icon ]; then +"$WM" --replace & +exit 0 fi -! [ -x /usr/bin/compiz ] && exit 1 # check for compiz +if ! [ -x /usr/bin/compiz ]; then +"$WM" --replace & +exit 0 +fi -# startup -if ! [ -e ~/.config/compiz-1/fusion-icon ]; then +# startup with compiz and fusion-icon +if ! [ -e ~/.config/compiz/fusion-icon ]; then # write default config for fusion-icon, this is default, also # this can go to etcskel, but better keep here -cat <<"_EOF_" > ~/.config/compiz-1/fusion-icon +cat <<"_EOF_" > ~/.config/compiz/fusion-icon [compiz options] loose binding = false indirect rendering = false @@ -48,28 +61,40 @@ active wm = compiz _EOF_ fi STARTFLAG="" + +# force no compiz start with llvmpipe +if glxinfo|grep -q llvmpipe; then +echo "disable compiz on llvmpipe" >&2 +sed -i s/"active wm = compiz"/"active wm = openbox"/ ~/.config/compiz/fusion-icon +STARTFLAG="-v" +fi + +# if on virt start with openbox +if command -v systemd-detect-virt > /dev/null ;then + VIRT=$(systemd-detect-virt) + if ! [ "$VIRT" = "none" ]; then + echo "disable compiz on virtual machine" >&2 + sed -i s/"active wm = compiz"/"active wm = openbox"/ ~/.config/compiz/fusion-icon + STARTFLAG="-v" + fi +fi + # catch if system is already running if ps ax |grep -q [f]usion-icon; then echo "ERROR fusion-icon already running, this should not happen, killing" >&2 pkill -9 fusion-icon fusion-icon $STARTFLAG >/dev/null 2>&1 & - exit 5 -fi -# force no compiz start with llvmpipe -if glxinfo|grep -q llvmpipe; then -echo "disable compiz on llvmpipe" >&2 -sed -i s/"active wm = compiz"/"active wm = openbox-lxde"/ ~/.config/compiz-1/fusion-icon -STARTFLAG="-n" + exit 0 fi # start compiz/openbox choosen from config -if grep "openbox-lxde" ~/.config/compiz-1/fusion-icon; then -STARTFLAG="-n" +if grep "openbox" ~/.config/compiz/fusion-icon; then +STARTFLAG="-v" fi if glxinfo|grep -q GLX_EXT_texture_from_pixmap; then if [ -x /usr/bin/fusion-icon ]; then echo "starte fusion-icon" - #if grep "wm = compiz" ~/.config/compiz-1/fusion-icon; then + #if grep "wm = compiz" ~/.config/compiz/fusion-icon; then #compiz --replace & #fi @@ -77,8 +102,18 @@ if [ -x /usr/bin/fusion-icon ]; then fusion-icon -v >/dev/null 2>&1 & # start in verbose mode else - echo "ERROR fusion-icon not found, starting default" >&2 + if [ -e ~/.compiz ]; then + sleep 3 + # test to play around with sleep values + emerald --replace & + compiz --replace & >/dev/null + #sleep 1 + lxpanelctl restart + fi + echo "Start without fusion-icon" >&2 + "$WM" --replace & fi else echo "Error no hardware support to start compiz" >&2 + "$WM" --replace & fi diff --git a/kanotix-lxde-extra/vi.desktop b/kanotix-lxde-extra/vi.desktop new file mode 100644 index 0000000..3867a6d --- /dev/null +++ b/kanotix-lxde-extra/vi.desktop @@ -0,0 +1,128 @@ +# The Vi.desktop file is copied from vim.desktop. +# and modified to match busybox vi. +[Desktop Entry] +Name[ca]=Vi +Name[de]=Vi +Name[eo]=Vi +Name[es]=Vi +Name[fi]=Vi +Name[fr]=Vi +Name[ga]=Vi +Name[it]=Vi +Name[ru]=Vi +Name[sr]=Vi +Name[tr]=Vi +Name[uk]=Vi +Name[zh_CN]=Vi +Name=Vi +GenericName[ca]=Editor de text +GenericName[de]=Texteditor +GenericName[eo]=Tekstoredaktilo +GenericName[es]=Editor de texto +GenericName[fi]=Tekstinmuokkain +GenericName[fr]=Éditeur de texte +GenericName[ga]=Eagarthóir Téacs +GenericName[it]=Editor di testi +GenericName[ja]=テキストエディタ +GenericName[ru]=Текстовый редактор +GenericName[sr]=Едитор текст +GenericName[tr]=Metin Düzenleyici +GenericName[uk]=Редактор Тексту +GenericName[zh_CN]=文本编辑器 +GenericName=Text Editor +Comment[ca]=Edita fitxers de text +Comment[de]=Textdateien bearbeiten +Comment[eo]=Redakti tekstajn dosierojn +Comment[es]=Editar archivos de texto +Comment[fi]=Muokkaa tekstitiedostoja +Comment[fr]=Éditer des fichiers texte +Comment[ga]=Cuir comhaid téacs in eagar +Comment[it]=Edita file di testo +Comment[ja]=テキストファイルを編集します +Comment[ru]=Редактирование текстовых файлов +Comment[sr]=Уређујте текст фајлове +Comment[tr]=Metin dosyaları düzenleyin +Comment[uk]=Редагувати текстові файли +Comment[zh_CN]=编辑文本文件 +Comment=Edit text files +GenericName[da]=Teksteditor +GenericName[pl]=Edytor tekstu +GenericName[is]=Ritvinnsluforrit +Comment[af]=Redigeer tekslêers +Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ +Comment[ar]=حرّر ملفات نصية +Comment[az]=Mətn fayllarını redaktə edin +Comment[be]=Рэдагаваньне тэкставых файлаў +Comment[bg]=Редактиране на текстови файлове +Comment[bn]=টেক্স্ট ফাইল এডিট করুন +Comment[bs]=Izmijeni tekstualne datoteke +Comment[cs]=Úprava textových souborů +Comment[cy]=Golygu ffeiliau testun +Comment[da]=Rediger tekstfiler +Comment[el]=Επεξεργασία αρχείων κειμένου +Comment[en_CA]=Edit text files +Comment[en_GB]=Edit text files +Comment[et]=Redigeeri tekstifaile +Comment[eu]=Editatu testu-fitxategiak +Comment[fa]=ویرایش پروندههای متنی +Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો +Comment[he]=ערוך קבצי טקסט +Comment[hi]=पाठ फ़ाइलें संपादित करें +Comment[hr]=Uređivanje tekstualne datoteke +Comment[hu]=Szövegfájlok szerkesztése +Comment[id]=Edit file teks +Comment[is]=Vinna með textaskrár +Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು +Comment[ko]=텍스트 파일을 편집합니다 +Comment[lt]=Redaguoti tekstines bylas +Comment[lv]=Rediģēt teksta failus +Comment[mk]=Уреди текстуални фајлови +Comment[ml]=വാചക രചനകള് തിരുത്തുക +Comment[mn]=Текст файл боловсруулах +Comment[mr]=गद्य फाइल संपादित करा +Comment[ms]=Edit fail teks +Comment[nb]=Rediger tekstfiler +Comment[ne]=पाठ फाइललाई संशोधन गर्नुहोस् +Comment[nl]=Tekstbestanden bewerken +Comment[nn]=Rediger tekstfiler +Comment[no]=Rediger tekstfiler +Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ +Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ +Comment[pl]=Edytuj pliki tekstowe +Comment[pt]=Editar ficheiros de texto +Comment[pt_BR]=Edite arquivos de texto +Comment[ro]=Editare fişiere text +Comment[sk]=Úprava textových súborov +Comment[sl]=Urejanje datotek z besedili +Comment[sq]=Përpuno files teksti +Comment[sr@Latn]=Izmeni tekstualne datoteke +Comment[sv]=Redigera textfiler +Comment[ta]=உரை கோப்புகளை தொகுக்கவும் +Comment[th]=แก้ไขแฟ้มข้อความ +Comment[tk]=Metin faýllary editle +Comment[vi]=Soạn thảo tập tin văn bản +Comment[wa]=Asspougnî des fitchîs tecses +Comment[zh_TW]=編輯文字檔 +TryExec=busybox +Exec=busybox vi %F +Terminal=true +Type=Application +Keywords[ca]=Text;editor; +Keywords[de]=Text;Editor; +Keywords[eo]=Teksto;redaktilo; +Keywords[es]=Texto;editor; +Keywords[fi]=Teksti;muokkain;editori; +Keywords[fr]=Texte;éditeur; +Keywords[ga]=Téacs;eagarthóir; +Keywords[it]=Testo;editor; +Keywords[ja]=テキスト;エディタ; +Keywords[ru]=текст;текстовый редактор; +Keywords[sr]=Текст;едитор; +Keywords[tr]=Metin;düzenleyici; +Keywords[uk]=текст;редактор; +Keywords[zh_CN]=Text;editor;文本;编辑器; +Keywords=Text;editor; +Icon=emblem-documents +Categories=Utility;TextEditor; +StartupNotify=false +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; |