xiki 0.5.1a → 0.5.3a

data/lib/{styles.rb → xiki/styles.rb}

@@ -4,9 +4,6 @@ class Styles
 
     '
     - .font size/
-    - .background color/
-      - white/
-      - black/
     - .list faces/
     - api/
       > Summary
@@ -31,31 +28,23 @@ class Styles
       | For styling specific text (not just a pattern):
       <<< @overlay/
     - see/
-      > List styles in current page in web browser
       <<< @css/list/
+      <<< @themes/
     '
     #       > Apply multiple fonts and groups
 
   end
 
-  def self.background_color color
-
-    $el.customize_set_variable(:background_mode_type, color == "black" ? :dark : :light)
-
+  def self.reload_styles
     Notes.define_styles
     FileTree.define_styles
-    Styles.use_xiki_color_scheme
-    Styles.define_misc_face_colors
     Color.define_styles
-
-    nil
   end
 
   def self.font_size size=nil
 
     # If nothing passed, show default sizes
 
-
     if ! size
       return "
         - original) #{Styles.height}
@@ -71,7 +60,6 @@ class Styles
     Styles.define :default, :size=>size.to_i
 
     # To resize mode lines
-    Themes.use "Shiny Blue"
     Notes.define_styles
     FileTree.define_styles
 
@@ -106,13 +94,8 @@ class Styles
     nil
   end
 
-  def self.inverse_bg enable=true
-    $el.customize_set_variable(:background_mode_type, enable ? :dark : :light)
-  end
-
-  def self.inverse
-    $el.boundp(:background_mode_type) &&
-      $el.elvar.background_mode_type.to_s == 'dark'
+  def self.dark_bg?
+    Styles.attribute(:default, :background)[1..1][/[0-7]/]
   end
 
   def self.exand_colors options, keys
@@ -166,30 +149,6 @@ class Styles
     $el.el4r_lisp_eval code
   end
 
-  def self.define_misc_face_colors
-
-    if Styles.inverse
-
-      Styles.define :font_lock_comment_face, :fg=>'777'   # gray
-      Styles.define :font_lock_function_name_face, :fg=>'f50'   # orange
-      Styles.define :font_lock_type_face, :fg=>'0a1'   # green
-      Styles.define :font_lock_variable_name_face, :fg=>'fd0'   # yellow
-      Styles.define :font_lock_string_face, :fg=>'e10'   # red
-      Styles.define :font_lock_keyword_face, :fg=>'999'
-
-    else
-
-      Styles.define :font_lock_comment_face, :fg=>'aaa'   # gray
-      Styles.define :font_lock_function_name_face, :fg=>'f50'   # orange
-      Styles.define :font_lock_type_face, :fg=>'090', :bold=>nil   # green
-      Styles.define :font_lock_variable_name_face, :fg=>'00c', :bold=>1   # yellow
-      Styles.define :font_lock_string_face, :fg=>'e10', :bold=>nil   # red
-      Styles.define :font_lock_keyword_face, :fg=>'888', :bold=>1   # blue
-
-    end
-
-  end
-
   def self.apply(pattern, *styles)
     # Make back-slashes double
     pattern.gsub!("\\", '\\\\\\\\')
@@ -232,6 +191,10 @@ class Styles
     $el.el4r_lisp_eval "(face-attribute 'default :height)"
   end
 
+  #
+  # Styles.attribute "mode-line", "background"
+  # Styles.attribute "mode-line", "box"
+  #
   def self.attribute style, attribute
     $el.el4r_lisp_eval "(face-attribute '#{style} :#{attribute})"
   end
@@ -243,32 +206,5 @@ class Styles
     size + relative * 5
   end
 
-  def self.use_xiki_color_scheme
-    if Styles.inverse   # Use black
-      # Mode line (bar between windows)
-
-      $el.set_face_background :trailing_whitespace, "#333333"
-      Styles.define :default, :bg=>'111111', :fg=>'ffffff'
-      Styles.define :cursor, :bg=>'ffffff', :fg=>'000000'
-
-      Styles.define :fringe, :bg=>'111111', :fg=>'666666'
-
-      # Dark gray scheme
-      Styles.define :mode_line, :bg=>'333', :border=>['666', -1], :face=>'Lucida Grande', :size=>'3', :bold=>false, :fg=>'fff'
-      Styles.define :mode_line_inactive, :bg=>'666', :border=>['888', -1], :face=>'Lucida Grande', :size=>'3', :bold=>false, :fg=>'fff'
-
-    else
-      $el.set_face_background :trailing_whitespace, "#aaaaaa"
-      Styles.define :default, :bg=>'ffffff', :fg=>'000000'# , :height=>110
-      Styles.define :cursor, :bg=>'333333', :fg=>'ffffff'
-      Styles.define :fringe, :bg=>'ffffff', :fg=>'cccccc'   # eg border / status
-
-      Styles.define :mode_line, :fg=>'222222', :bg=>'555', :border=>['333', -1], :face=>'Lucida Grande', :size=>'3', :bold=>false
-      Styles.define :mode_line_inactive, :fg=>'999999', :bg=>'888', :border=>['666', -1], :face=>'Lucida Grande', :size=>'3', :bold=>false
-
-    end
-
-  end
-
 end
 Styles.init

data/lib/{text_util.rb → xiki/text_util.rb}

@@ -1,5 +1,5 @@
-require 'line'
-require 'ol'
+require 'xiki/line'
+require 'xiki/ol'
 
 class TextUtil
 

data/lib/{tree.rb → xiki/tree.rb}

@@ -1,4 +1,4 @@
-require 'tree_cursor'
+require 'xiki/tree_cursor'
 
 class Tree
   def self.menu
@@ -46,7 +46,9 @@ class Tree
 
     # Make cursor blue
     Cursor.remember :before_file_tree
-    Cursor.blue
+
+    Cursor.box
+
     error = ""
 
     pattern = ""
@@ -69,10 +71,8 @@ class Tree
 
     # While chars to search for (alpha chars etc.), narrow down list...
 
-    while (ch =~ /[ -"&-),-.\/-:<?A-~]/ &&   # Be careful editing, due to ranges (_-_)
-        (ch_raw < 67108912 || ch_raw > 67108921) && ch_raw != 67108909) ||   # If not control-<number> or C--
-        (recursive && ch_raw == 2 || ch_raw == 6) ||
-        ch == :up || ch == :down
+    while ch.is_a?(String) && (ch =~ /[ -"&-),-.\/-:<?A-~]/ &&   # Be careful editing, due to ranges (_-_)
+        (ch_raw < 67108912 || ch_raw > 67108921) && ch_raw != 67108909) # ||   # If not control-<number> or C--
 
       if ch == ' ' && pattern != ""   # If space and not already cleared out
         pattern = ''
@@ -89,12 +89,6 @@ class Tree
           Line.to_words
           break   # Otherwise, stop
         end
-      elsif ch == :up
-        Line.previous
-        Line.to_words
-      elsif ch == :down
-        Line.next
-        Line.to_words
 
       else
         if ch == "\\"  # If escape, get real char
@@ -151,13 +145,13 @@ class Tree
         else
           Line.to_beginning
         end
-
       end
 
       message = "filter... #{pattern}#{error}"
       message << "    (space for 'and')" if pattern.present?
       Message << message
       ch, ch_raw = Keys.char
+
       if ch.nil?
         return Cursor.restore(:before_file_tree)
       end
@@ -191,6 +185,19 @@ class Tree
         self.to_parent
         self.kill_under
         FileTree.dir
+      elsif ch == 'a'   # just_all
+
+        # If a quote, insert lines indented lower
+        if Line.matches(/\|/)
+          CodeTree.kill_siblings
+          self.enter_under
+        elsif FileTree.dir?  # A Dir, so do recursive search
+          $el.delete_region(Line.left(2), right)
+          FileTree.dir_recursive
+        else   # A file, so enter lines
+          $el.delete_region(Line.left(2), right)
+          FileTree.enter_lines(//)  # Insert all lines
+        end
       end
     when :return   # If return, just stop (like isearch)
       # Do nothing
@@ -198,15 +205,14 @@ class Tree
       Keys.clear_prefix
       Launcher.launch
 
-      #     when :control_return, :return, "\C-m", :control_period, :right   # If C-., go in but don't collapse siblings
-    when :control_return, "\C-m", :control_period, :right   # If C-., go in but don't collapse siblings
+    when :control_return, "\C-m", :control_period #, :right   # If C-., go in but don't collapse siblings
       Keys.clear_prefix
       Launcher.launch
     when "\t"   # If tab, hide siblings and go in
       $el.delete_region(Line.left(2), right)
       Keys.clear_prefix
       Launcher.launch
-    when :backspace, :left   # Collapse tree
+    when :backspace #, :left   # Collapse tree
       self.to_parent
       self.kill_under
       self.search(:left => Line.left, :right => Line.left(2))
@@ -299,18 +305,12 @@ class Tree
       View.create
       Launcher.launch
 
+    when "\C-e"   # Also C-a
+      return Line.to_right
+
     when "\C-a"   # Also C-a
-      # If a quote, insert lines indented lower
-      if Line.matches(/\|/)
-        CodeTree.kill_siblings
-        self.enter_under
-      elsif FileTree.dir?  # A Dir, so do recursive search
-        $el.delete_region(Line.left(2), right)
-        FileTree.dir_recursive
-      else   # A file, so enter lines
-        $el.delete_region(Line.left(2), right)
-        FileTree.enter_lines(//)  # Insert all lines
-      end
+
+      return Line.to_left
 
     when "\C-o"   # When 9 or C-o, show methods, or outline
       $el.delete_region(Line.left(2), right)   # Delete other files
@@ -320,9 +320,7 @@ class Tree
         $el.delete_region(Line.left(2), right)  # Delete other files
         View.bar
         Keys.clear_prefix
-        # Expand or open
-        Launcher.launch
-        return
+        return Launcher.launch   # Expand or open
       end
       Keys.clear_prefix
       n = ch.to_i
@@ -401,6 +399,14 @@ class Tree
 
     when "\a"   # Typed C-g
       View.beep
+    when :left
+      Move.backward
+    when :right
+      Move.forward
+    when :up
+      $el.previous_line
+    when :down
+      $el.next_line
     else
       $el.command_execute ch
     end
@@ -1146,7 +1152,8 @@ class Tree
       # Go through lines in file until end of section
       matches = ""
       found_yet = false
-      IO.foreach(path) do |l|
+
+      IO.foreach(path, *Files.encoding_binary) do |line|
         l.sub!(/[\r\n]+$/, '')
         l.gsub!("\c@", '.')   # Replace out characters that el4r can't handle
         # Swallow up until match
@@ -1170,7 +1177,8 @@ class Tree
       indent = line[/^\s*/].gsub("\t", '        ').length
       matches = ""
       found_yet = false
-      IO.foreach(path) do |l|
+
+      IO.foreach(path, *Files.encoding_binary) do |line|
         l.sub!(/[\r\n]+$/, '')
         l.gsub!("\c@", '.')   # Replace out characters that el4r can't handle
         # Swallow up until match

data/lib/{view.rb → xiki/view.rb}

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Represents a division of a window (in emacs terms, it's a window (which is within a frame))
 #
@@ -103,7 +104,7 @@ class View
 
 
   def self.enlarge height=nil
-    default_height = 3
+    default_height = 4
     small = Keys.prefix || height || default_height
     small = default_height if small == :u
 
@@ -121,10 +122,23 @@ class View
     biggest = usable_height - ((wnum-1) * (small-1))
     selected = $el.selected_window
 
-    # Do multiple times (emacs daesn't get it right he first time)
-    5.times do
-      self.enlarge_internal :up, ws, selected, biggest, small
-    end
+
+    # Remember borders, and get rid of external border temporarily (it messes up heights)
+    $el.elvar.xiki_modeline_box_tmp = Styles.attribute "mode-line", "box"
+    $el.elvar.xiki_modeline_inactive_box_tmp = Styles.attribute "mode-line-inactive", "box"
+    Styles.mode_line_inactive :border=>:nil
+    Styles.mode_line :border=>:nil
+
+    # Maybe have to redraw here?!
+    View.refresh
+
+    # Set border to 0
+
+    self.enlarge_internal :up, ws, selected, biggest, small
+
+    # Restore borders
+    $el.set_face_attribute :mode_line, nil, ':box'.to_sym, $el.elvar.xiki_modeline_box_tmp
+    $el.set_face_attribute :mode_line_inactive, nil, ':box'.to_sym, $el.elvar.xiki_modeline_inactive_box_tmp
 
     nil
   end
@@ -132,16 +146,19 @@ class View
   def self.enlarge_internal direction, ws, selected, biggest, small
     ws = ws.reverse if direction != :up
 
-    ws.each do |w|
-      # If current window, set to remaining
-      if w == selected
-        height = biggest # - 1
-        $el.set_window_text_height w, height
-      else
-        height = small - 1
-        $el.set_window_text_height w, height
+    3.times do
+      ws.each_with_index do |w, i|
+        # If current window, set to remaining
+        if w == selected
+          height = biggest
+          $el.set_window_text_height w, height
+        else  # Other small windows
+          height = small - 1
+          $el.set_window_text_height w, height
+        end
       end
     end
+
   end
 
   # Creates a new window by splitting the current one
@@ -1047,6 +1064,12 @@ class View
   end
 
   def self.kill
+
+    # To avoid "Buffer has a running process; keep the buffer? (y or n)" message
+    if process = $el.get_buffer_process(View.buffer)
+      $el.set_process_query_on_exit_flag process, nil
+    end
+
     $el.kill_this_buffer
     nil
   end
@@ -1255,7 +1278,7 @@ class View
   end
 
   def self.gsub! from, to
-    with(:save_excursion) do
+    $el.with(:save_excursion) do
       View.to_highest
       $el.replace_regexp(from, to)
     end
@@ -1402,7 +1425,7 @@ class View
     txt = txt.reverse.uniq.join
   end
 
-  def self.refresh
+  def self.refresh   # redraw
     $el.sit_for 0
   end
 
@@ -1454,7 +1477,7 @@ class View
 
     if scale = options[:scale]
       nth = 3
-      val = {0=>' ', 1=>'e', 2=>'i', 3=>'v', 4=>'�', 5=>'�'}[scale]
+      val = {0=>' ', 1=>'e', 2=>'i', 3=>'v', 4=>'ø', 5=>'ß'}[scale]
     end
 
     key = "xiki_status#{nth}".to_sym

data/lib/xiki/vim/line.rb

@@ -0,0 +1,8 @@
+class Line
+  def self.number
+    $curbuf.line_number
+  end
+  def self.value
+    $curbuf.line
+  end
+end

data/lib/xiki/vim/tree.rb

@@ -0,0 +1,9 @@
+class Tree
+  def self.<< txt
+    line_number, line = Line.number, Line.value
+    indent = line[/^ +/]
+    txt.split("\n").each_with_index do |line, i|
+      $curbuf.append(line_number + i, "#{indent}  #{line}")
+    end
+  end
+end