From 95cfe7b8cdfa507346bed04dd9b980f9be552eac Mon Sep 17 00:00:00 2001 From: kapalua Date: Sun, 11 Nov 2018 03:35:16 +0500 Subject: [PATCH 1/4] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D1=83=D1=8E?= =?UTF-8?q?=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catwm2.pro | 15 +++ catwm2.pro.user | 334 ++++++++++++++++++++++++++++++++++++++++++++++++ config.h | 2 + 3 files changed, 351 insertions(+) create mode 100644 catwm2.pro create mode 100644 catwm2.pro.user diff --git a/catwm2.pro b/catwm2.pro new file mode 100644 index 0000000..5ed3571 --- /dev/null +++ b/catwm2.pro @@ -0,0 +1,15 @@ +TEMPLATE = app +CONFIG += console +CONFIG -= app_bundle +CONFIG -= qt + +SOURCES += \ + catwm.c + +DISTFILES += \ + README.md \ + LICENCE_DWM \ + Makefile + +HEADERS += \ + config.h diff --git a/catwm2.pro.user b/catwm2.pro.user new file mode 100644 index 0000000..c51619d --- /dev/null +++ b/catwm2.pro.user @@ -0,0 +1,334 @@ + + + + + + EnvironmentId + {437d6960-ddf7-4dc3-a328-f584cb2f862b} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + {d8e38483-5d8c-4c20-8720-82d8b7db8e0d} + 0 + 0 + 0 + + /home/kapalua/projects/build-catwm2-Desktop-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/kapalua/projects/build-catwm2-Desktop-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/kapalua/projects/build-catwm2-Desktop-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + + + + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/config.h b/config.h index 3369dfe..cfe8d3a 100755 --- a/config.h +++ b/config.h @@ -40,6 +40,8 @@ #define FOCUS "rgb:bc/57/66" #define UNFOCUS "rgb:88/88/88" +#define BORDERW 4 + const char* dmenucmd[] = {"dmenu_run",NULL}; const char* urxvtcmd[] = {"urxvt",NULL}; const char* lockcmd[] = {"slock",NULL}; From de693019a0844bc8e62bb1012cc436a08c0190eb Mon Sep 17 00:00:00 2001 From: kapalua Date: Sun, 11 Nov 2018 03:37:40 +0500 Subject: [PATCH 2/4] delete depr. func --- catwm.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/catwm.c b/catwm.c index 87dbe53..6186546 100755 --- a/catwm.c +++ b/catwm.c @@ -287,13 +287,15 @@ void increase() { } void keypress(XEvent *e) { - int i; - XKeyEvent ke = e->xkey; - KeySym keysym = XKeycodeToKeysym(dis,ke.keycode,0); + unsigned int i; + //XKeyEvent ke = e->xkey; + int keysyms_per_keycode; + KeySym keysym = XGetKeyboardMapping(dis, (unsigned char)(e->xkey.keycode), 1, &keysyms_per_keycode)[0]; for(i=0;ixkey.state && keys[i].keysym == keysym ) { keys[i].function(keys[i].arg); + break; } } } @@ -614,18 +616,18 @@ void tile() { // If only one window if(head != NULL && head->next == NULL) { - XMoveResizeWindow(dis,head->win,0,0,sw-2,sh-2); + XMoveResizeWindow(dis,head->win,0,0,sw-2*BORDERW,sh-2*BORDERW); } else if(head != NULL) { switch(mode) { case 0: // Master window - XMoveResizeWindow(dis,head->win,0,0,master_size-2,sh-2); + XMoveResizeWindow(dis,head->win,0,0,master_size-2*BORDERW,sh-2*BORDERW); // Stack for(c=head->next;c;c=c->next) ++n; for(c=head->next;c;c=c->next) { - XMoveResizeWindow(dis,c->win,master_size,y,sw-master_size-2,(sh/n)-2); + XMoveResizeWindow(dis,c->win,master_size,y,sw-master_size-2*BORDERW,(sh/n)-2*BORDERW); y += sh/n; } break; From 66e0953e3588bc2c3622e3c3b6b6d195483e3988 Mon Sep 17 00:00:00 2001 From: kapalua40 Date: Sun, 11 Nov 2018 03:51:48 +0500 Subject: [PATCH 3/4] Delete catwm2.pro.user --- catwm2.pro.user | 334 ------------------------------------------------ 1 file changed, 334 deletions(-) delete mode 100644 catwm2.pro.user diff --git a/catwm2.pro.user b/catwm2.pro.user deleted file mode 100644 index c51619d..0000000 --- a/catwm2.pro.user +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - EnvironmentId - {437d6960-ddf7-4dc3-a328-f584cb2f862b} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - {d8e38483-5d8c-4c20-8720-82d8b7db8e0d} - 0 - 0 - 0 - - /home/kapalua/projects/build-catwm2-Desktop-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/kapalua/projects/build-catwm2-Desktop-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/kapalua/projects/build-catwm2-Desktop-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - - - - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - From ad1903cc20b744acd849f9cb2f1c3f9af92db6b1 Mon Sep 17 00:00:00 2001 From: kapalua40 Date: Sun, 11 Nov 2018 03:52:03 +0500 Subject: [PATCH 4/4] Delete catwm2.pro --- catwm2.pro | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 catwm2.pro diff --git a/catwm2.pro b/catwm2.pro deleted file mode 100644 index 5ed3571..0000000 --- a/catwm2.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app -CONFIG += console -CONFIG -= app_bundle -CONFIG -= qt - -SOURCES += \ - catwm.c - -DISTFILES += \ - README.md \ - LICENCE_DWM \ - Makefile - -HEADERS += \ - config.h