more changes, read the Changelog

[lyx.git] / src / TableLayout.C

diff --git a/src/TableLayout.C b/src/TableLayout.C
index 16b77b659c13486785f1ad89ea5af4fc9f91f168..810b281358a25b943585dd52b28b26a5079546c2 100644 (file)
--- a/src/TableLayout.C
+++ b/src/TableLayout.C
@@ -12,10 +12,10 @@
 #include "vspace.h"
 #include "lyx_gui_misc.h"
 #include "BufferView.h"
-#include "lyxscreen.h"
 #include "gettext.h"
 #include "lyxtext.h"
 #include "layout.h"
+#include "insets/lyxinset.h"
 
 
 // Prototypes
@@ -23,6 +23,11 @@ extern FD_form_table_options * fd_form_table_options;
 extern FD_form_table_extra * fd_form_table_extra;
 extern BufferView * current_view;
 
+extern bool UpdateLayoutTabular(int);
+extern void TabularOptionsCB(FL_OBJECT * ob, long l);
+extern void SetPWidthTabularCB(FL_OBJECT * ob, long l);
+
+
 static int Confirmed = false;
 static int ActCell;
 
@@ -36,22 +41,24 @@ static int extra_col_cursor_x; // need no y's, one-line input fields
 static int extra_multicol_cursor_x;
 // Joacim
 
+#define IS_TABULAR  (current_view->the_locking_inset && \
+                    current_view->the_locking_inset->GetFirstLockingInsetOfType(Inset::TABULAR_CODE))
 
 bool UpdateLayoutTable(int flag)
 {
     bool update = true;
-    if (!current_view->getScreen() || !current_view->available())
+    if (!current_view->available())
         update = false;
     
-    if (update && current_view->text->cursor.par->table) {
+    if (update && current_view->text->cursor.par()->table) {
         char buf[12];
         string pwidth, special;
    
-        LyXTable * table = current_view->text->cursor.par->table;
+        LyXTable * table = current_view->text->cursor.par()->table;
 
         int cell = current_view->text->
-            NumberOfCell(current_view->text->cursor.par, 
-                         current_view->text->cursor.pos);
+            NumberOfCell(current_view->text->cursor.par(), 
+                         current_view->text->cursor.pos());
         ActCell = cell;
         int column = table->column_of_cell(cell)+1;
         fl_set_object_label(fd_form_table_options->text_warning, "");
@@ -240,7 +247,6 @@ void OpenLayoutTableExtra()
        }
 }
 
-
 void MenuLayoutTable(int flag)
 {
     if (UpdateLayoutTable(flag)) {
@@ -256,20 +262,25 @@ void MenuLayoutTable(int flag)
 }
 
 
-void TableOptionsCB(FL_OBJECT * ob, long)
+void TableOptionsCB(FL_OBJECT * ob, long l)
 {
+    if (IS_TABULAR) {
+       TabularOptionsCB(ob, l);
+       return;
+    }
+
     LyXTable * table = 0;
     int s, num = 0;
     string special, str;
 
     if (!current_view->available()
-       || !(table = current_view->text->cursor.par->table)) {
+       || !(table = current_view->text->cursor.par()->table)) {
         MenuLayoutTable(0);
        return;
       }
     int cell = current_view->text->
-        NumberOfCell(current_view->text->cursor.par, 
-                     current_view->text->cursor.pos);
+        NumberOfCell(current_view->text->cursor.par(), 
+                     current_view->text->cursor.pos());
     if (ActCell != cell) {
         MenuLayoutTable(0);
         fl_set_object_label(fd_form_table_options->text_warning,
@@ -420,17 +431,17 @@ void TableOptionsCB(FL_OBJECT * ob, long)
     } else
         return;
     if (current_view->available()) {
-        current_view->getScreen()->HideCursor();
+        current_view->hideCursor();
         if (!current_view->text->selection){
             current_view->beforeChange();
-            current_view->update(-2);
+            current_view->update(BufferView::SELECT|BufferView::FITCUR);
         }
         if ((num == LyXTable::SET_SPECIAL_COLUMN) ||
             (num == LyXTable::SET_SPECIAL_MULTI))
-            current_view->text->TableFeatures(num, special);
+            current_view->text->TableFeatures(current_view, num, special);
         else
-            current_view->text->TableFeatures(num);
-        current_view->update(1);
+            current_view->text->TableFeatures(current_view, num);
+        current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
     }
     if (num == LyXTable::DELETE_TABLE) {
        fl_set_focus_object(fd_form_table_options->form_table_options,
@@ -458,8 +469,13 @@ void TableSpeCloseCB(FL_OBJECT *, long)
     return;
 }
 
-void SetPWidthCB(FL_OBJECT * ob, long)
+void SetPWidthCB(FL_OBJECT * ob, long l)
 {
+    if (IS_TABULAR) {
+       SetPWidthTabularCB(ob, l);
+       return;
+    }
+
     fl_set_object_label(fd_form_table_options->text_warning, "");
     Confirmed = false;
     if (ob == fd_form_table_options->input_column_width) {
@@ -471,13 +487,13 @@ void SetPWidthCB(FL_OBJECT * ob, long)
             return;
         }
         if (current_view->available()){
-            current_view->getScreen()->HideCursor();
+            current_view->hideCursor();
             if (!current_view->text->selection) {
                 current_view->beforeChange(); 
-                current_view->update(-2);
+                current_view->update(BufferView::SELECT|BufferView::FITCUR);
             }
-            current_view->text->TableFeatures(LyXTable::SET_PWIDTH, str);
-            current_view->update(1);
+            current_view->text->TableFeatures(current_view, LyXTable::SET_PWIDTH, str);
+            current_view->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
         }
         MenuLayoutTable(0); // update for alignment
     }