From 1a1ee2a10d876a51ec7aadd050d39bff0a143376 Mon Sep 17 00:00:00 2001
From: Peng Li <seudut@gmail.com>
Date: Sun, 24 May 2015 21:41:58 +0800
Subject: [PATCH] elscreen

---
 emacs.d/config/init-color-theme.el | 26 +++++++++++++++-----------
 emacs.d/config/init-elscreen.el    | 38 ++++++++++++++++++++++++++++++--------
 emacs.d/init.el                    | 17 +++++++++++++++++
 3 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/emacs.d/config/init-color-theme.el b/emacs.d/config/init-color-theme.el
index e3af12f..978a771 100644
--- a/emacs.d/config/init-color-theme.el
+++ b/emacs.d/config/init-color-theme.el
@@ -160,20 +160,22 @@
                                   (cdr powerline-default-separator-dir))))
                         (lhs
                             (list
-                                (powerline-raw "%*" nil 'l)
-                                (powerline-buffer-id nil 'l)
-                                (powerline-raw " ")
-                                (funcall separator-left mode-line face-blue )
-				(powerline-raw " " face-blue)
+                                (powerline-raw "%*" face-yel 'l)
+                                (powerline-buffer-id face-yel 'l)
+                                (powerline-raw " " face-yel)
+                                (funcall separator-left face-yel face-blue )
+				                (powerline-raw " " face-blue)
                                 (powerline-major-mode face-blue 'r)
-                                (funcall separator-left face-blue face1)
-                                (powerline-narrow face1 'l)
-                                (powerline-simpler-vc-mode (powerline-vc face1))))
+                                (funcall separator-left face-blue mode-line)
+                                (powerline-narrow mode-line 'l)
+                                (powerline-vc mode-line 'r)
+                                (funcall separator-left mode-line face1)))
+;                                (powerline-simpler-vc-mode (powerline-vc face2))))
 			
                         (rhs
                             (list
                                 (funcall separator-right face1 mode-line)
-                                (powerline-raw (concat "%3c, %l/" (format "%d" (count-lines (point-min) (point-max))) " %4p") mode-line)
+                                (powerline-raw (concat "%3c, %l/" (format "%d" (count-lines (point-min) (point-max))) " %4p ") mode-line)
                                 (funcall separator-right mode-line face1)
 			                    (powerline-raw (format-time-string " %m-%d") face1 'r)
                                 (funcall separator-right face1 face-yel)
@@ -209,7 +211,9 @@
 
 (powerline-ha-theme)
 
+(provide 'init-color-theme)
 
 
-
-(provide 'init-color-theme)
+;; TODO
+;; 1. change color when buffer is modified
+;; 2. 
diff --git a/emacs.d/config/init-elscreen.el b/emacs.d/config/init-elscreen.el
index d560032..439752a 100644
--- a/emacs.d/config/init-elscreen.el
+++ b/emacs.d/config/init-elscreen.el
@@ -1,9 +1,26 @@
+;; this config file is based on  seudut/elscreen.git, which added two interface and one property 
+;; default directory
+
+
+;; change default keybinding
+(global-set-key (kbd "<M-tab>") 'elscreen-next) ;; "C-M-I"
+(global-set-key (kbd "M-n") 'elscreen-next)
+(global-set-key (kbd "M-p") 'elscreen-previous)
+(global-set-key (kbd "M-t") 'elscreen-create)
+;;; split 
+
+
+;; tab face
+
+(custom-set-faces
+ '(elscreen-tab-current-screen-face ((t (:background "Yellow" :foreground "black"))))
+ '(elscreen-tab-other-screen-face ((t (:background "gray22" :foreground "black")))))
 
 ;;(add-hook 'elscreen-create-hook
 ;;          (lambda ()
-;;            (elscreen-set-default-directory  (elscreen-get-current-screen) "~/CPVE/")))
-;;;            (elscreen-cd-default-directory "~/"))
-;;
+;;            (elscreen-set-default-directory  
+;;              (elscreen-get-current-screen) "~/")))
+
 
 (add-hook 'elscreen-goto-hook
           (lambda ()
@@ -23,13 +40,18 @@
   (message
   (elscreen-get-default-directory (elscreen-get-current-screen))))
 
+(defun sd-update-elscreen-dir ()
+  "update elscreen dir as current default directory"
+  (interactive)
+  (elscreen-set-default-directory (elscreen-get-current-scren) default-directory))
 
 
-(add-hook 'buffer-list-update-hook
-          (lambda ()
-            (let ((el-dir (elscreen-get-default-directory (elscreen-get-current-screen))))
-              (if (> (length el-dir) 0)
-                 (cd el-dir)))))
+
+;;(add-hook 'buffer-list-update-hook
+;;          (lambda ()
+;;            (let ((el-dir (elscreen-get-default-directory (elscreen-get-current-screen))))
+;;              (if (> (length el-dir) 0)
+;;                 (cd el-dir)))))
 
 
 (provide 'init-elscreen)
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 7934dbe..eea7c4b 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -139,3 +139,20 @@
 (setq ecb-layout-name "leftright3")
 
 
+;(setq mac-command-modifier 'super) ; make cmd key do Meta
+(global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen)
+
+
+
+
+(global-set-key (kbd "M-g M-v") 'split-window-right)
+(global-set-key (kbd "M-g M-s") 'split-window-below)
+(global-set-key (kbd "M-g M-o") 'delete-other-windows)
+
+(global-set-key (kbd "M-g M-w") 'other-window)
+
+;(global-set-key (kbd "C-g C-k") 'windmove-up)
+;(global-set-key (kbd "C-g C-j") 'windmove-down)
+
+;;;; show default directory on mode-line
+
-- 
2.11.0