temp commit

include/data.h

@@ -33,15 +33,12 @@ typedef enum {
  */
 typedef struct {
     int buffer_id;        // Which buffer this pane displays
-    int start_row;        // Starting row on screen
-    int start_col;        // Starting column on screen
     int height;           // Height of this pane
     int width;            // Width of this pane
+    int origin_x, origin_y;
     int cursor_x;         // Local cursor x in this pane
     int cursor_y;         // Local cursor y in this pane
-  int rx, ry;
-    int row_offset;       // Scroll offset for rows
-    int col_offset;       // Scroll offset for columns
+    int x_offset, y_offset;
     int is_active;        // Is this pane currently active
 } EditorPane;
 
@@ -95,15 +92,12 @@ enum buffer_type { FILE_BUFF, TERMINAL_BUFF };
 struct buffer_t {
   enum buffer_type type;
   int buffer_id;
-  int width, height;
-  int x, y; /**< Position in the buffer (cursor) */
-  frow *row;
+  int x, y; /**< Position in the file */
+  row_t *row;
   int numrows;
   char *filename;
   enum bufferStatus_e state;
   int dirty;             /**< Has this buffer been modified since last save */
-  int row_offset;        /**< Scroll offset for rows in this buffer */
-  int col_offset;        /**< Scroll offset for columns in this buffer */
 };
 
 /**
@@ -112,19 +106,16 @@ struct buffer_t {
  */
 struct editorConfig {
   int cursor_x, cursor_y; /**< Cursor position */
-  int rx;                 /**< Position in the render*/
-  int row_offset;         /**< Position scroll of lines */
-  int col_offset;         /**< Position scroll of colomns*/
   int screenrows;         /**< Terminal height*/
   int screencols;         /**< Terminal width*/
 
   ScreenLayout layout;
 
-  int numrows;            /**< Number of rows contained */
-  row_t *rows;              /**< Store all the rows printed */
+  row_t *rows;        /**< Store all the rows printed */
+
   int dirty;
-  int prefix_state;
-  char status_msg[80];
+
+  char *status_msg;
   time_t status_msg_time;
   struct termios orig_termios; /**< Terminal communication interface */
 
@@ -143,6 +134,7 @@ struct editorConfig {
 
   struct prefix_t *prefix;
   int number_of_prefix;
+  int prefix_state;
 
   struct buffer_t buffers[64];
   int number_of_buffer;