newTabTab.patch

   1 ---
   2
   3  Microline/XmL/Folder.c              |    2 -
   4  Microline/XmL/Makefile.common       |    2 -
   5  Microline/XmL/Makefile.dependencies |    4 ++
   6  source/window.c                     |   60 ++++++++++++++++++++++++++----------
   7  4 files changed, 50 insertions(+), 18 deletions(-)
   8
   9 diff --quilt old/Microline/XmL/Folder.c new/Microline/XmL/Folder.c
  10 --- old/Microline/XmL/Folder.c
  11 +++ new/Microline/XmL/Folder.c
  12 @@ -1658,7 +1658,7 @@ ConstraintInitialize(Widget req,
  13        /* add child to tabs list */
  14        if (f->folder.tabAllocCount < f->folder.tabCount + 1)
  15         {
  16 -         f->folder.tabAllocCount *= 2;
  17 +         f->folder.tabAllocCount += 32;
  18           f->folder.tabs = (Widget *)realloc((char *)f->folder.tabs,
  19                                              sizeof(Widget) * f->folder.tabAllocCount);
  20         }
  21 diff --quilt old/source/window.c new/source/window.c
  22 --- old/source/window.c
  23 +++ new/source/window.c
  24 @@ -154,7 +154,7 @@ static Pixmap createBitmapWithDepth(Widg
  25         unsigned int height);
  26  static WindowInfo *getNextTabWindow(WindowInfo *window, int direction,
  27          int crossWin, int wrap);
  28 -static Widget addTab(Widget folder, const char *string);
  29 +static Widget addTab(Widget folder, const char *string, int isNewTabTab);
  30  static int compareWindowNames(const void *windowA, const void *windowB);
  31  static Widget manageToolBars(Widget toolBarsForm);
  32  static void hideTearOffs(Widget menuPane);
  33 @@ -600,7 +600,7 @@ WindowInfo *CreateWindow(const char *nam
  34      /* create the tab bar */
  35      window->tabBar = XtVaCreateManagedWidget("tabBar",
  36                     xmlFolderWidgetClass, tabForm,
  37 -           XmNresizePolicy, XmRESIZE_PACK,
  38 +            XmNresizePolicy, XmRESIZE_DYNAMIC,
  39             XmNleftAttachment, XmATTACH_FORM,
  40              XmNleftOffset, 0,
  41             XmNrightAttachment, XmATTACH_WIDGET,
  42 @@ -628,7 +628,8 @@ WindowInfo *CreateWindow(const char *nam
  43      XtAddCallback(window->tabBar, XmNactivateCallback,
  44             raiseTabCB, NULL);
  45
  46 -    window->tab = addTab(window->tabBar, name);
  47 +    addTab(window->tabBar, " + ", True);
  48 +    window->tab = addTab(window->tabBar, name, False);
  49
  50      /* A form to hold the stats line text and line/col widgets */
  51      window->statsLineForm = XtVaCreateWidget("statsLineForm",
  52 @@ -837,19 +838,23 @@ static void tabClickEH(Widget w, XtPoint
  53  /*
  54  ** add a tab to the tab bar for the new document.
  55  */
  56 -static Widget addTab(Widget folder, const char *string)
  57 +static Widget addTab(Widget folder, const char *string, int isNewTabTab)
  58  {
  59      Widget tooltipLabel, tab;
  60 -    XmString s1;
  61 +    XmString s1, s2;
  62
  63      s1 = XmStringCreateSimple((char *)string);
  64 +    if (isNewTabTab)
  65 +        s2 = XmStringCreateSimple("New Document");
  66 +    else
  67 +        s2 = s1;
  68      tab = XtVaCreateManagedWidget("tab",
  69             xrwsBubbleButtonWidgetClass, folder,
  70             /* XmNmarginWidth, <default@nedit.c>, */
  71             /* XmNmarginHeight, <default@nedit.c>, */
  72             /* XmNalignment, <default@nedit.c>, */
  73             XmNlabelString, s1,
  74 -           XltNbubbleString, s1,
  75 +            XltNbubbleString, s2,
  76             XltNshowBubble, GetPrefToolTips(),
  77             XltNautoParkBubble, True,
  78             XltNslidingBubble, False,
  79 @@ -857,6 +862,8 @@ static Widget addTab(Widget folder, cons
  80             /* XltNbubbleDuration, 8000,*/
  81             NULL);
  82      XmStringFree(s1);
  83 +    if (isNewTabTab)
  84 +        XmStringFree(s2);
  85
  86      /* there's things to do as user click on the tab */
  87      XtAddEventHandler(tab, ButtonPressMask, False,
  88 @@ -880,10 +887,23 @@ static Widget addTab(Widget folder, cons
  89      AddTabContextMenuAction(tab);
  90  #endif /* LESSTIF_VERSION */
  91
  92 -    if (GetPerfDragDropTabs()) {
  93 +    if (GetPerfDragDropTabs() && !isNewTabTab) {
  94          addTabDragAction(tab);
  95          registerDropSite(tab);
  96      }
  97 +
  98 +    /* maintain newTab-tab as last tab in tablist */
  99 +    if (!isNewTabTab) {
 100 +        WidgetList tabList;
 101 +        int tabCount;
 102 +        Widget t;
 103 +        XtVaGetValues(folder, XmNtabWidgetList, &tabList,
 104 +                      XmNtabCount, &tabCount, NULL);
 105 +        t = tabList[tabCount - 1];
 106 +        tabList[tabCount - 1] = tabList[tabCount - 2];
 107 +        tabList[tabCount - 2] = t;
 108 +    }
 109 +
 110      return tab;
 111  }
 112
 113 @@ -935,7 +955,7 @@ void SortTabBar(WindowInfo *window)
 114      XtVaGetValues(window->tabBar, XmNtabWidgetList, &tabList,
 115                    XmNtabCount, &tabCount, NULL);
 116
 117 -    for (i=0, j=0; i<tabCount && j<nDoc; i++) {
 118 +    for (i=0, j=0; i<(tabCount-1) && j<nDoc; i++) {
 119          if (tabList[i]->core.being_destroyed)
 120              continue;
 121
 122 @@ -2643,7 +2663,7 @@ static void saveYourselfCB(Widget w, Wid
 123         XtVaGetValues(topWin->tabBar, XmNtabWidgetList, &tabs,
 124                 XmNtabCount, &tabCount, NULL);
 125
 126 -       for (i=0; i< tabCount; i++) {
 127 +        for (i=0; i< (tabCount-1); i++) {
 128             win = TabToWindow(tabs[i]);
 129              if (win->filenameSet) {
 130                 /* add filename */
 131 @@ -3644,7 +3664,7 @@ WindowInfo* CreateDocument(WindowInfo* s
 132      /* Set the requested hardware tab distance and useTabs in the text buffer */
 133      BufSetTabDistance(window->buffer, GetPrefTabDist(PLAIN_LANGUAGE_MODE));
 134      window->buffer->useTabs = GetPrefInsertTabs();
 135 -    window->tab = addTab(window->tabBar, name);
 136 +    window->tab = addTab(window->tabBar, name, False);
 137
 138      /* add the window to the global window list, update the Windows menus */
 139      InvalidateWindowMenus();
 140 @@ -3717,7 +3737,7 @@ static WindowInfo *getNextTabWindow(Wind
 141             XtVaGetValues(win->tabBar, XmNtabWidgetList, &tabList,
 142                     XmNtabCount, &tabCount, NULL);
 143
 144 -           for (i=0; i< tabCount; i++) {
 145 +            for (i=0; i< (tabCount-1); i++) {
 146                 tabs[tabTotalCount++] = tabList[i];
 147             }
 148         }
 149 @@ -3727,7 +3747,7 @@ static WindowInfo *getNextTabWindow(Wind
 150         XtVaGetValues(window->tabBar, XmNtabWidgetList, &tabList,
 151                 XmNtabCount, &tabCount, NULL);
 152
 153 -       for (i=0; i< tabCount; i++) {
 154 +        for (i=0; i< (tabCount-1); i++) {
 155             if (TabToWindow(tabList[i]))    /* make sure tab is valid */
 156                 tabs[tabTotalCount++] = tabList[i];
 157         }
 158 @@ -3775,7 +3795,7 @@ int getTabPosition(Widget tab)
 159      XtVaGetValues(tabBar, XmNtabWidgetList, &tabList,
 160              XmNtabCount, &tabCount, NULL);
 161
 162 -    for (i=0; i< tabCount; i++) {
 163 +    for (i=0; i< (tabCount-1); i++) {
 164         if (tab == tabList[i])
 165             return i;
 166      }
 167 @@ -4987,10 +5007,18 @@ static void raiseTabCB(Widget w, XtPoint
 168      XmLFolderCallbackStruct *cbs = (XmLFolderCallbackStruct *)callData;
 169      WidgetList tabList;
 170      Widget tab;
 171 +    int tabCount;
 172
 173 -    XtVaGetValues(w, XmNtabWidgetList, &tabList, NULL);
 174 -    tab = tabList[cbs->pos];
 175 -    RaiseDocument(TabToWindow(tab));
 176 +    XtVaGetValues(w, XmNtabWidgetList, &tabList, XmNtabCount, &tabCount, NULL);
 177 +    if (cbs->pos < (tabCount-1)) {
 178 +        tab = tabList[cbs->pos];
 179 +        RaiseDocument(TabToWindow(tab));
 180 +    } else {
 181 +        WindowInfo *window = GetTopDocument(w);
 182 +        EditNewFile(window, NULL, False, NULL, window->path, False);
 183 +        CheckCloseDim();
 184 +        cbs->allowActivate = 0;
 185 +    }
 186  }
 187
 188  static Widget containingPane(Widget w)
 189 diff --quilt old/Microline/XmL/Makefile.common new/Microline/XmL/Makefile.common
 190 --- old/Microline/XmL/Makefile.common
 191 +++ new/Microline/XmL/Makefile.common
 192 @@ -7,7 +7,7 @@
 193  .c.o:
 194         $(CC) -c -I.. $(CFLAGS) -o $@ $<
 195
 196 -OBJS = Folder.o XmL.o
 197 +OBJS = XmL.o Folder.o Grid.o GridUtil.o Progress.o Tree.o
 198
 199  all: libXmL.a
 200
 201 diff --quilt old/Microline/XmL/Makefile.dependencies new/Microline/XmL/Makefile.dependencies
 202 --- old/Microline/XmL/Makefile.dependencies
 203 +++ new/Microline/XmL/Makefile.dependencies
 204 @@ -1,2 +1,6 @@
 205  XmL.o: XmL.c XmL.h
 206  Folder.o: Folder.c Folder.h FolderP.h XmL.h
 207 +Grid.o: Grid.c Grid.h GridP.h XmL.h
 208 +GridUtil.o: GridUtil.c Grid.h GridP.h XmL.h
 209 +Progress.o: Progress.c Progress.h ProgressP.h XmL.h
 210 +Tree.o: Tree.c Tree.h TreeP.h XmL.h