antiright-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Antiright-devel] antiright ./COPYING ./Makefile.in ./README lib/...


From: Jeffrey Bedard
Subject: [Antiright-devel] antiright ./COPYING ./Makefile.in ./README lib/...
Date: Wed, 25 Aug 2004 19:54:50 -0400

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/08/25 23:50:18

Modified files:
        .              : COPYING Makefile.in README 
        lib            : edit.c edit.h library.h popup.c window.c 
        src            : ACE AntiRight 
        src/arshell    : arshell-util.c dialog.c file.c menubar.c 
                         search.c textedit.h 

Log message:
        Added comment and uncomment features.  Refined edit menu appearance by 
separating relevent items.  The toolbar widget was removed and the toolbar 
buttons are now simply created right on top of arshell.layout.row_manager 
instead.  Debug messages were removed.  No changes were made to COPYING, it was 
just replaced with exactly the same file.  Convenience functions were added to 
the popup menu, allowing certain predefined text clippings to be inserted and 
code to be quickly be commented and uncommented.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/COPYING.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/Makefile.in.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/README.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/edit.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/edit.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/library.h.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/popup.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/window.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/ACE.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/AntiRight.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arshell-util.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/dialog.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/file.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/menubar.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/search.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/textedit.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: antiright/COPYING
diff -u antiright/COPYING:1.9 antiright/COPYING:1.10
--- antiright/COPYING:1.9       Thu Aug 19 00:31:31 2004
+++ antiright/COPYING   Wed Aug 25 23:50:18 2004
@@ -339,3 +339,4 @@
 Public License instead of this License.
 
 
+
Index: antiright/Makefile.in
diff -u antiright/Makefile.in:1.25 antiright/Makefile.in:1.26
--- antiright/Makefile.in:1.25  Thu Aug 19 00:31:31 2004
+++ antiright/Makefile.in       Wed Aug 25 23:50:18 2004
@@ -79,7 +79,7 @@
        $(INSTALL_DATA) doc/*.5 $(man5dir)
        $(INSTALL_DATA) COPYING $(docdir)/antiright
        $(INSTALL_DATA) doc/AUTHORS $(docdir)/antiright
-       $(INSTALL_DATA) doc/README $(docdir)/antiright
+       $(INSTALL_DATA) README $(docdir)/antiright
        $(INSTALL_DATA) doc/TODO $(docdir)/antiright
        $(INSTALL_DATA) doc/INSTALL $(docdir)/antiright
        $(INSTALL_DATA) doc/HACKING $(docdir)/antiright
Index: antiright/README
diff -u antiright/README:1.6 antiright/README:1.7
--- antiright/README:1.6        Thu Aug 19 00:31:31 2004
+++ antiright/README    Wed Aug 25 23:50:18 2004
@@ -42,3 +42,4 @@
     Numbering:   <major>.<minor>
     <minor> is to be increased at least once for every release.  If the 
release is a major feature enhancement, <minor> is increased by three.
     <major> is increased when <minor> reaches 150.
+
Index: antiright/lib/edit.c
diff -u antiright/lib/edit.c:1.1 antiright/lib/edit.c:1.2
--- antiright/lib/edit.c:1.1    Thu Jul  8 18:58:03 2004
+++ antiright/lib/edit.c        Wed Aug 25 23:50:18 2004
@@ -68,3 +68,52 @@
   parent=NULL;
   call_data=(XtPointer)NULL;
 }
+
+void
+antiright_comment_selection(Widget widget, 
+                           XtPointer client_data, XtPointer call_data)
+{
+  XmTextPosition left, right;
+  XmTextGetSelectionPosition((Widget)client_data, &left, &right);
+  XmTextInsert((Widget)client_data, left, "/* ");
+  XmTextInsert((Widget)client_data, right+3, "  */");
+}
+void
+antiright_uncomment_selection(Widget widget,
+                             XtPointer client_data, XtPointer call_data)
+{
+  char *selection;
+  XmTextPosition left, right;
+  unsigned int counter=0;
+  unsigned int length;
+  XmTextGetSelectionPosition((Widget)client_data, &left, &right);
+  selection=XmTextGetSelection((Widget)client_data);
+  for(length=right-left; counter < length; counter++)
+    {
+      if(selection[counter]=='/')
+       {
+         if((counter+1)<length)
+           {
+             if(selection[counter+1]=='*')
+               {
+                 selection[counter]=' ';
+                 selection[counter+1]=' ';
+               }
+           }
+       }
+      else if(selection[counter]=='*')
+       {
+         if((counter+1)<length)
+           {
+             if(selection[counter+1]=='/')
+               {
+                 selection[counter]=' ';
+                 selection[counter+1]=' ';
+               }
+           }
+       }
+    }
+  XmTextReplace((Widget)client_data, left, right, selection);
+  XtFree(selection);
+}
+
Index: antiright/lib/edit.h
diff -u antiright/lib/edit.h:1.2 antiright/lib/edit.h:1.3
--- antiright/lib/edit.h:1.2    Sat Aug  7 17:13:41 2004
+++ antiright/lib/edit.h        Wed Aug 25 23:50:18 2004
@@ -40,5 +40,15 @@
 antiright_paste_cb(Widget parent, 
                   XtPointer client_data, /* Pass the text widget.  */
                   XtPointer call_data);
+
+/* This puts C-style comments around the selection.  */
+void
+antiright_comment_selection(Widget widget, 
+                           XtPointer client_data, XtPointer call_data);
+/* This removes C-style comments from the selection.  */
+void
+antiright_uncomment_selection(Widget widget,
+                             XtPointer client_data, XtPointer call_data);
+
 #endif /* AR_EDIT_H  */
 
Index: antiright/lib/library.h
diff -u antiright/lib/library.h:1.9 antiright/lib/library.h:1.10
--- antiright/lib/library.h:1.9 Mon Aug 23 01:15:56 2004
+++ antiright/lib/library.h     Wed Aug 25 23:50:18 2004
@@ -40,11 +40,11 @@
 #include "status.h"
 #include "util.h"
 
-#if XmVERSION > 1 & XmREVISION > 1
+#ifdef HAVE_XMXPM
 #include <Xm/XpmP.h>
 #else
-#include <xpm.h>
-#endif /* XmVERSION > 1 & XmREVISION > 1  */
+#include <X11/xpm.h>
+#endif /* HAVE_XMXPM  */
 
 #ifdef HAVE_XLT
 #include <Xlt/Xlt.h>
Index: antiright/lib/popup.c
diff -u antiright/lib/popup.c:1.2 antiright/lib/popup.c:1.3
--- antiright/lib/popup.c:1.2   Sat Aug  7 17:13:41 2004
+++ antiright/lib/popup.c       Wed Aug 25 23:50:18 2004
@@ -42,7 +42,7 @@
 /* Create a popup menu.  To use, add buttons to the returned widget.
    The parent is usually a text widget, but any widget can be used
    (some with difficulty).  */
-Widget 
+Widget
 antiright_popup_menu(Widget parent)
 {
   Widget popup_widget;
@@ -60,27 +60,80 @@
   return(popup_widget);
 }
 
+void
+antiright_popup_insert_cb(Widget parent, 
+                         XtPointer client_data, XtPointer call_data)
+{
+  Widget work=(Widget)client_data;
+  XmTextInsert(work, XmTextGetInsertionPosition(work), parent->core.name);
+}
+
 Widget
 antiright_defined_popup_menu(Widget parent_widget)
 {
   Widget popup_widget;
-  
+  Widget submenu, ar_menu, c_menu, motif_menu, shell_menu, awk_menu;
   popup_widget=antiright_popup_menu(parent_widget);
 
   (Widget)antiright_button(popup_widget,
                           "Copy",
                           antiright_copy_cb,
-                          (Widget)parent_widget);
+                          (XtPointer)parent_widget);
 
   (Widget)antiright_button(popup_widget,
                           "Cut",
                           antiright_cut_cb,
-                          (Widget)parent_widget);
+                          (XtPointer)parent_widget);
 
   (Widget)antiright_button(popup_widget,
                           "Paste",
                           antiright_paste_cb,
-                          (Widget)parent_widget);
-  
+                          (XtPointer)parent_widget);
+  antiright_separator(popup_widget);
+  antiright_button(popup_widget, "Comment Selected",
+                  antiright_comment_selection, (XtPointer)parent_widget);
+  antiright_button(popup_widget, "Uncomment Selected",
+                  antiright_uncomment_selection, (XtPointer)parent_widget);
+  antiright_separator(popup_widget);
+  submenu=antiright_menu(popup_widget, "Insert");
+  ar_menu=antiright_menu(submenu, "antiright");
+  antiright_button(ar_menu, "antiright_button();", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(ar_menu, "antiright_label_string(,);", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  awk_menu=antiright_menu(submenu, "AWK");
+  antiright_button(awk_menu, "getline", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(awk_menu, "BEGIN {}", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(awk_menu, "END {}", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(awk_menu, "// {}", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  c_menu=antiright_menu(submenu, "C");
+  antiright_button(c_menu, "printf(\"\",); fflush(stdout);", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(awk_menu, "malloc();", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(awk_menu, "(char*)malloc(strlen()+1);", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  motif_menu=antiright_menu(submenu, "Motif");
+  antiright_button(motif_menu, "XtManageChild();", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(motif_menu, "XtUnmanageChild();", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(motif_menu, "XtVaSetValues(,NULL);", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(motif_menu, "XmCreatePushButton(,"",,);", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(motif_menu, "XtAddCallback();", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  shell_menu=antiright_menu(submenu, "Shell");
+  antiright_button(shell_menu, "#!/usr/bin/env bash", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(shell_menu, "if [   ]; then", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
+  antiright_button(shell_menu, "while [   ]; do", 
+                  antiright_popup_insert_cb, (XtPointer)parent_widget);
   return(popup_widget);
 }
Index: antiright/lib/window.c
diff -u antiright/lib/window.c:1.5 antiright/lib/window.c:1.6
--- antiright/lib/window.c:1.5  Mon Aug 23 01:15:56 2004
+++ antiright/lib/window.c      Wed Aug 25 23:50:18 2004
@@ -33,7 +33,6 @@
                XmNtitle, name, 
                NULL);
 }
-
 /* Set the icon and window title.  */
 void
 antiright_set_title(const char* name)
@@ -100,9 +99,9 @@
                XmNlabelPixmap, bitmap,
                XmNiconPixmap, bitmap,
                NULL);
-#if XmVERSION > 1 & XmREVISION > 1
+#ifdef XmNpixmap
   XtVaSetValues(label, XmNpixmap, bitmap, NULL);
-#endif /* XmVERSION > 1 & XmREVISION > 1  */
+#endif /* XmNpixmap  */
 }
 void
 antiright_set_pixmap_from_data(Widget widget, char **data)
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.18 antiright/src/ACE:1.19
--- antiright/src/ACE:1.18      Mon Aug 23 01:15:56 2004
+++ antiright/src/ACE   Wed Aug 25 23:50:18 2004
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 ###############################################################################
 #
@@ -31,15 +31,6 @@
 use_icons=false
 bmdir=/usr/X11R6/include/X11/bitmaps
 
-# Define utility functions here.  
-ACE_extract()
-{
-    $AWK -F$1 "{print "$2"}" $3
-}
-ACE_extract_field_value()
-{
-    ACE_extract : '$2'
-}
 ACE_Verification()
 {
     $ARSHELL -W Verify -E -Al "$1"\
Index: antiright/src/AntiRight
diff -u antiright/src/AntiRight:1.4 antiright/src/AntiRight:1.5
--- antiright/src/AntiRight:1.4 Thu Aug 19 00:31:32 2004
+++ antiright/src/AntiRight     Wed Aug 25 23:50:18 2004
@@ -72,6 +72,12 @@
 *Raise Selection Case.accelerator: Alt<Key>U
 *Raise Selection Case.acceleratorText: Alt-U
 *Raise Selection Case.mnemonic: a
+*Comment Selected.mnemonic: o
+*Comment Selected.accelerator: Alt<Key>I
+*Comment Selected.acceleratorText: Alt-I
+*Uncomment Selected.mnemonic: U
+*Uncomment Selected.accelerator: Alt<Key>J
+*Uncomment Selected.acceleratorText: Alt-J
 *Go to Line.mnemonic: G
 *Go to Line.accelerator: Alt<Key>G
 *Go to Line.acceleratorText: Alt-G
Index: antiright/src/arshell/arshell-util.c
diff -u antiright/src/arshell/arshell-util.c:1.5 
antiright/src/arshell/arshell-util.c:1.6
--- antiright/src/arshell/arshell-util.c:1.5    Thu Aug 19 22:02:49 2004
+++ antiright/src/arshell/arshell-util.c        Wed Aug 25 23:50:18 2004
@@ -61,7 +61,15 @@
                        XtCallbackProc callback,
                        char* command_string)
 {
-  Widget button_widget=antiright_button(parent_widget, command_string,
+  Widget button_widget;
+  if(parent_widget != NULL)
+    {
+      if(!XtIsManaged(parent_widget))
+       {
+         XtManageChild(parent_widget);
+       }
+    }
+  button_widget=antiright_button(parent_widget, command_string,
                                        callback, command_string);
   antiright_set_tooltip(button_widget, command_string);
   arshell_beautify_label(button_widget, command_string);
Index: antiright/src/arshell/dialog.c
diff -u antiright/src/arshell/dialog.c:1.5 antiright/src/arshell/dialog.c:1.6
--- antiright/src/arshell/dialog.c:1.5  Mon Aug 23 01:15:56 2004
+++ antiright/src/arshell/dialog.c      Wed Aug 25 23:50:18 2004
@@ -34,7 +34,7 @@
   call_data=NULL;
   exit(0);
 }
-
+#if XmVERSION > 1 & XmREVISION > 1
 void
 arshell_font_select_cb(ARCBARG)
 {
@@ -49,7 +49,7 @@
   printf(font);
   exit(0);
 }
-
+#endif /* XmVERSION > 1 & XmREVISION > 1  */
 /*#define DEBUG_OLD_MOTIF
   #define DEBUG_NO_XLT*/
 
Index: antiright/src/arshell/file.c
diff -u antiright/src/arshell/file.c:1.3 antiright/src/arshell/file.c:1.4
--- antiright/src/arshell/file.c:1.3    Tue Aug 17 20:36:22 2004
+++ antiright/src/arshell/file.c        Wed Aug 25 23:50:18 2004
@@ -23,9 +23,7 @@
 
 void
 arshell_insert_file_cb()
-{
-  ARBUG;
-  
+{ 
   char *file=antiright_pipe_read("cat `arshell -ADf`");
   XmTextInsert(arshell.gui.widgets.work, 
               XmTextGetInsertionPosition(arshell.gui.widgets.work),
@@ -37,9 +35,7 @@
 arshell_open_file_cb(Widget parent_widget,
                     XtPointer client_data,
                     XtPointer call_data)
-{
-  ARBUG;
-  
+{ 
   char *label;
   XmString motif_string;
   ARCLARG;
@@ -57,9 +53,7 @@
 
 void
 arshell_open_file()
-{
-  ARBUG;
-  
+{ 
   char *command_string;
   char *buffer;
   asprintf(&command_string, "cat %s", arshell.edit.filename);
@@ -86,13 +80,11 @@
                          XtPointer client_data,
                          XtPointer call_data)
 {
-  ARBUG;
   XmFileSelectionBoxCallbackStruct *call_pointer=call_data;
   char *c_string;
  
   if(arshell.flags.file_open)
-    {
-      ARBUG;
+    { 
       arshell_save_work_area();
     }
   c_string=antiright_c_string(call_pointer->value);
@@ -100,15 +92,13 @@
   XtFree(c_string);
   XtDestroyWidget(widget);
   if(arshell.flags.saving)
-    {
-      ARBUG;
+    {     
       arshell.flags.file_open=True;
       arshell_save_work_area();
       arshell.flags.saving=False;
     }
   if(arshell.flags.opening)
-    {
-      ARBUG;
+    { 
       arshell.flags.file_open=True;
       arshell_open_file();
       arshell.flags.opening=False;
@@ -119,7 +109,7 @@
 void
 arshell_select_filename()
 {
-  ARBUG;
+  
   Widget file_selection_widget;
   ARCLARG;
   antiright_set(XmNtitle, (XtArgVal)"File Selector");
@@ -138,8 +128,7 @@
 }
 void
 arshell_put_text_into_file(FILE *file)
-{
-  ARBUG;
+{ 
   char *text_string;
   assert(arshell.gui.widgets.work != NULL);
   text_string=XmTextGetString(arshell.gui.widgets.work);
@@ -148,8 +137,7 @@
 }
 void
 arshell_open_file_for_writing(FILE **file_pointer)
-{
-  ARBUG;
+{ 
   (*file_pointer)=fopen(arshell.edit.filename, "w");
   if((*file_pointer)==NULL)
     {
@@ -160,17 +148,14 @@
 void
 arshell_save_work_area()
 {
-  ARBUG;
   FILE* file_pointer;
   arshell.flags.saving=True;
   if(arshell.flags.file_open==False)
-    {
-      ARBUG;
+    { 
       arshell_select_filename();
     }
   else
-    {
-      ARBUG;
+    {     
       arshell_open_file_for_writing(&file_pointer);
       arshell_put_text_into_file(file_pointer);
       fclose(file_pointer);
@@ -182,8 +167,7 @@
 
 void
 arshell_save_as_cb()
-{
-  ARBUG;
+{ 
   arshell.flags.saving=True;
   arshell_select_filename();
 }
@@ -191,7 +175,6 @@
 void
 arshell_open_cb()
 {
-  ARBUG;
   arshell.flags.opening=True;
   arshell.flags.saving=False;
   arshell_select_filename();
Index: antiright/src/arshell/menubar.c
diff -u antiright/src/arshell/menubar.c:1.5 antiright/src/arshell/menubar.c:1.6
--- antiright/src/arshell/menubar.c:1.5 Mon Aug 23 01:15:56 2004
+++ antiright/src/arshell/menubar.c     Wed Aug 25 23:50:18 2004
@@ -123,7 +123,7 @@
   antiright_get_values(antiright.parent_widget);
   if((title[0]=='S') & (title[1]=='t') & (title[2]=='i'))
     {
-      XtUnmanageChild(XtParent(XtParent(arshell.edit.toolbar)));
+      XtUnmanageChild(XtParent(arshell.gui.layout.row_manager_widget));
     }
   ARCLARG;
 }
@@ -146,7 +146,8 @@
 arshell_toolbar_button(char *description, char **icon, 
                       XtCallbackProc callback, XtPointer client_data)
 {
-  return(antiright_toolbar_button(arshell.edit.toolbar, description, icon, 
+  return(antiright_toolbar_button(arshell.gui.layout.row_manager_widget, 
+                                 description, icon, 
                                  callback, client_data));
 }
 
@@ -156,16 +157,16 @@
 {
   if(XmToggleButtonGetState(widget))
     {
-      if(!XtIsManaged(XtParent(XtParent(arshell.edit.toolbar))))
+      if(!XtIsManaged(XtParent(arshell.gui.layout.row_manager_widget)))
        {
-         XtManageChild(XtParent(XtParent(arshell.edit.toolbar)));
+         XtManageChild(XtParent(arshell.gui.layout.row_manager_widget));
        }
     }
   else
     {
-      if(XtIsManaged(XtParent(XtParent(arshell.edit.toolbar))))
+      if(XtIsManaged(XtParent(arshell.gui.layout.row_manager_widget)))
        {
-         XtUnmanageChild(XtParent(XtParent(arshell.edit.toolbar)));
+         XtUnmanageChild(XtParent(arshell.gui.layout.row_manager_widget));
        }
     }
   client_data=NULL;
@@ -176,14 +177,14 @@
 arshell_setup_editor_toolbar()
 {
   arshell_initialize_row_manager();
-  ARCLARG;
+  /*  ARCLARG;
   antiright_set(XmNmarginWidth, 0);
   antiright_set(XmNmarginHeight, 0);
   antiright_set(XmNpacking, XmPACK_TIGHT);
   antiright_set(XmNorientation, XmHORIZONTAL);
   antiright_set(XmNspacing, 0);
   arshell.edit.toolbar=
-    antiright_row(arshell.gui.layout.row_manager_widget);
+  antiright_row(arshell.gui.layout.row_manager_widget);*/
 
   arshell_hide_sticky_note_toolbar();
   arshell_toolbar_button("Open a file.", open_xpm, 
@@ -200,6 +201,7 @@
                         antiright_paste_cb, arshell.gui.widgets.work);
   arshell_toolbar_button("Search for and optionally replace text.", search_xpm,
                         arshell_search_replace_cb, NULL);
+  arshell_row_layout();
 }
 
 void
@@ -229,24 +231,30 @@
       antiright_separator(arshell.gui.menubar.edit_widget);
       antiright_button(arshell.gui.menubar.edit_widget, "Select All",
                       arshell_select_all, NULL);
+      antiright_separator(arshell.gui.menubar.edit_widget);
       antiright_button(arshell.gui.menubar.edit_widget, "Search/Replace",
                       arshell_search_replace_cb, NULL);
-      antiright_button(arshell.gui.menubar.edit_widget, "Find Selected",
-                      arshell_find_selected, NULL);
       antiright_button(arshell.gui.menubar.edit_widget, "Find at Cursor",
                       arshell_find_at_cursor_cb, NULL);
+      antiright_button(arshell.gui.menubar.edit_widget, "Find Selected",
+                      arshell_find_selected, NULL);
       antiright_button(arshell.gui.menubar.edit_widget, "Go to Line",
                       arshell_goto_line_cb, NULL);
+      antiright_separator(arshell.gui.menubar.edit_widget);
       antiright_button(arshell.gui.menubar.edit_widget, "Lower Selection Case",
                       arshell_lower_selection_case, NULL);
       antiright_button(arshell.gui.menubar.edit_widget, "Raise Selection Case",
                       arshell_upper_selection_case, NULL);
-      antiright_separator(arshell.gui.menubar.view_widget);
+      antiright_separator(arshell.gui.menubar.edit_widget);
+      antiright_button(arshell.gui.menubar.edit_widget, "Comment Selected",
+                      antiright_comment_selection, arshell.gui.widgets.work);
+      antiright_button(arshell.gui.menubar.edit_widget, "Uncomment Selected",
+                      antiright_uncomment_selection, arshell.gui.widgets.work);
       ARCLARG;
       toggle_widget=XmCreateToggleButton(arshell.gui.menubar.view_widget, 
                                         "Show/Hide Toolbar", ARARGS);
       XtManageChild(toggle_widget);
-      if(XtIsManaged(XtParent(XtParent(arshell.edit.toolbar))))
+      if(XtIsManaged(XtParent(arshell.gui.layout.row_manager_widget)))
        XmToggleButtonSetState(toggle_widget, True, True);
       XtAddCallback(toggle_widget, XmNvalueChangedCallback, 
                    arshell_toggle_toolbar_cb, NULL);
Index: antiright/src/arshell/search.c
diff -u antiright/src/arshell/search.c:1.3 antiright/src/arshell/search.c:1.4
--- antiright/src/arshell/search.c:1.3  Mon Aug 23 01:15:56 2004
+++ antiright/src/arshell/search.c      Wed Aug 25 23:50:18 2004
@@ -43,8 +43,9 @@
   char *selection=XmTextGetSelection(arshell.gui.widgets.work);
   XmTextPosition left;
   XmTextPosition right;
-  XmTextPosition position=XmTextGetSelectionPosition(arshell.gui.widgets.work,
-                                                    &left, &right);
+  XmTextPosition position;
+  XmTextGetSelectionPosition(arshell.gui.widgets.work,
+                            &left, &right);
   if(selection != NULL)
     {
       Boolean found=XmTextFindString(arshell.gui.widgets.work, 
Index: antiright/src/arshell/textedit.h
diff -u antiright/src/arshell/textedit.h:1.6 
antiright/src/arshell/textedit.h:1.7
--- antiright/src/arshell/textedit.h:1.6        Mon Aug 23 01:15:56 2004
+++ antiright/src/arshell/textedit.h    Wed Aug 25 23:50:18 2004
@@ -51,7 +51,6 @@
   char operation_string[ARSHELL_MAX_STRLEN];
   Widget find_widget;
   Widget replace_widget;
-  Widget toolbar;
   Boolean open_is_MDI;
   Boolean hungry_delete;
   struct arshell_search_replace_data_struct search_options;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]