[Antiright-devel] antiright ./Makefile.in lib/edit.c lib/edit.h l...

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 05/01/24 16:07:56

Modified files:
        .              : Makefile.in 
        lib            : edit.c edit.h label.c label.h library.h popup.c 
                         util.c util.h 
        src            : AntiRight 
        src/arshell    : menubar.c 

Log message:
        Added buffer and selection filling.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/Makefile.in.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/edit.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/edit.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/label.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/label.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/library.h.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/popup.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/util.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/util.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/AntiRight.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/menubar.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: antiright/Makefile.in
diff -u antiright/Makefile.in:1.34 antiright/Makefile.in:1.35
--- antiright/Makefile.in:1.34  Fri Jan 21 22:35:15 2005
+++ antiright/Makefile.in       Mon Jan 24 16:07:54 2005
@@ -33,7 +33,7 @@
        lib/help.o lib/label.o lib/library.o lib/list.o lib/menubar.o\
        lib/popup.o lib/row.o lib/separator.o lib/status.o lib/window.o\
        lib/util.o lib/pixmap.o lib/usage.o lib/app.o lib/resource.o\
-       lib/string.o lib/system.o lib/xmstring.o
+       lib/string.o lib/system.o lib/xmstring.o lib/pipe.o
 
 arcd-objects=src/arcd/arcd.o $(lib-objects)
 arcd: $(arcd-objects)
Index: antiright/lib/edit.c
diff -u antiright/lib/edit.c:1.3 antiright/lib/edit.c:1.4
--- antiright/lib/edit.c:1.3    Sun Aug 29 03:00:31 2004
+++ antiright/lib/edit.c        Mon Jan 24 16:07:55 2005
@@ -121,3 +121,66 @@
   call_data=NULL;
 }
 
+void
+antiright_fill_next_line(unsigned int *line, unsigned *line_char)
+{
+  (*line)++;
+  (*line_char)=0;
+}
+
+void
+antiright_fill_text(char **text)
+{
+  unsigned int length=0;
+  unsigned int counter=0;
+  unsigned int line=0;
+  unsigned int line_char=0;
+
+  for(length=strlen((*text)); counter < length; counter++)
+    {
+      line_char++;
+
+      if((*text)[counter]=='\n')
+       antiright_fill_next_line(&line, &line_char);
+
+      if(line_char > 72)
+       {
+         if((*text)[counter]==' ')
+           {
+             (*text)[counter]='\n';
+             antiright_fill_next_line(&line, &line_char);
+           }
+       }
+    }
+}
+
+void
+antiright_fill_selection(Widget widget,
+                        XtPointer client_data, XtPointer call_data)
+{
+  char *selection;
+  XmTextPosition left, right;
+  XmTextGetSelectionPosition((Widget)client_data, &left, &right);
+  selection=XmTextGetSelection((Widget)client_data);
+  antiright_fill_text(&selection);
+  XmTextReplace((Widget)client_data, left, right, selection);
+  XtFree(selection);
+  widget=NULL;
+  call_data=NULL;
+}
+
+void
+antiright_fill_all(Widget widget,
+                  XtPointer client_data, XtPointer call_data)
+{
+  char *selection;
+  unsigned int right=XmTextGetLastPosition((Widget)client_data);
+  XmTextSetSelection((Widget)client_data, 0, right, 
+                    XtLastTimestampProcessed(antiright.display));
+  selection=XmTextGetSelection((Widget)client_data);
+  antiright_fill_text(&selection);
+  XmTextReplace((Widget)client_data, 0, right, selection);
+  XtFree(selection);
+  widget=NULL;
+  call_data=NULL;
+}
Index: antiright/lib/edit.h
diff -u antiright/lib/edit.h:1.3 antiright/lib/edit.h:1.4
--- antiright/lib/edit.h:1.3    Wed Aug 25 23:50:18 2004
+++ antiright/lib/edit.h        Mon Jan 24 16:07:55 2005
@@ -50,5 +50,16 @@
 antiright_uncomment_selection(Widget widget,
                              XtPointer client_data, XtPointer call_data);
 
+void
+antiright_fill_text(char **text);
+
+void
+antiright_fill_selection(Widget widget,
+                        XtPointer client_data, XtPointer call_data);
+
+void
+antiright_fill_all(Widget widget,
+                  XtPointer client_data, XtPointer call_data);
+
 #endif /* AR_EDIT_H  */
 
Index: antiright/lib/label.c
diff -u antiright/lib/label.c:1.3 antiright/lib/label.c:1.4
--- antiright/lib/label.c:1.3   Mon Aug 16 17:27:05 2004
+++ antiright/lib/label.c       Mon Jan 24 16:07:55 2005
@@ -34,28 +34,6 @@
 }
 
 void
-antiright_label_set_bitmap(Widget label,
-                          char icon_bits[], 
-                          int width, 
-                          int height)
-{
-  XtVaSetValues(label,
-               XmNlabelType, XmPIXMAP,
-               XmNlabelPixmap, XCreateBitmapFromData(antiright.display, 
-                                                     antiright.root_window,
-                                                     icon_bits,width, height),
-               NULL);
-}
-
-
-void
-antiright_label_set_bitmap_from_file(Widget label, char* filename)
-{
-  antiright_set_bitmap_from_file(label, filename);
-}
-
-
-void
 antiright_label_string(Widget label_widget,
                       char *label_string)
 {
Index: antiright/lib/label.h
diff -u antiright/lib/label.h:1.4 antiright/lib/label.h:1.5
--- antiright/lib/label.h:1.4   Fri Jan 21 22:36:30 2005
+++ antiright/lib/label.h       Mon Jan 24 16:07:55 2005
@@ -26,19 +26,5 @@
                char *name); /* This is the text of the label.  */
 
 void
-antiright_label_set_bitmap(Widget label,
-                          char icon_bits[], 
-                          int width, 
-                          int height);
-
-void
-antiright_label_set_bitmap_from_file(Widget label, char* filename);
-
-void
-antiright_set_bitmap_from_file(Widget label, char* filename);
-
-void
 antiright_label_string(Widget label_widget,
                       char *label_string);
-Pixmap
-antiright_pixmap_file(char* filename, Pixmap *mask);
Index: antiright/lib/library.h
diff -u antiright/lib/library.h:1.13 antiright/lib/library.h:1.14
--- antiright/lib/library.h:1.13        Sat Jan 22 20:04:36 2005
+++ antiright/lib/library.h     Mon Jan 24 16:07:55 2005
@@ -114,4 +114,11 @@
     fflush(stdout);                                    \
   }
 
+/* The following are function return codes.  */
+#define SUCCESS 0
+#define FAILURE -1
+#define WARNING 1
+#define EALLOC 2
+
 #endif /* AR_LIBRARY_H */
+
Index: antiright/lib/popup.c
diff -u antiright/lib/popup.c:1.5 antiright/lib/popup.c:1.6
--- antiright/lib/popup.c:1.5   Sun Aug 29 03:01:50 2004
+++ antiright/lib/popup.c       Mon Jan 24 16:07:55 2005
@@ -102,6 +102,8 @@
                   antiright_comment_selection, (XtPointer)parent_widget);
   antiright_button(popup_widget, "Uncomment Selected",
                   antiright_uncomment_selection, (XtPointer)parent_widget);
+  antiright_button(popup_widget, "Fill Selected",
+                  antiright_fill_selection, (XtPointer)parent_widget);
   antiright_separator(popup_widget);
   submenu=antiright_menu(popup_widget, "Insert");
   ar_menu=antiright_menu(submenu, "antiright");
Index: antiright/lib/util.c
diff -u antiright/lib/util.c:1.7 antiright/lib/util.c:1.8
--- antiright/lib/util.c:1.7    Fri Jan 21 22:36:30 2005
+++ antiright/lib/util.c        Mon Jan 24 16:07:55 2005
@@ -32,42 +32,6 @@
   return(pointer);
 }
 
-/* Make sure that you free the returned string.  */
-char*
-antiright_pipe_read(char *command_string)
-{
-  char *text_string;
-  char buffer[BUFSIZ];
-  FILE *pipe_fp=popen(command_string, "r");
-  fgets(buffer, BUFSIZ, pipe_fp);
-  asprintf(&text_string, "%s", buffer);
-  while(fgets(buffer, BUFSIZ, pipe_fp))
-    asprintf(&text_string, "%s%s", text_string, buffer);
-  pclose(pipe_fp);
-  return(text_string);
-}
-void
-antiright_pipe_write(char *command_string, char* data)
-{
-  FILE *pipe_fp=popen(command_string, "w");
-  fprintf(pipe_fp, data);
-  pclose(pipe_fp);
-}
-void
-antiright_fifo_server(char *command_string, char *fifo)
-{
-  FILE *fifo_fp;
-  FILE *pipe_fp=popen(command_string, "w");
-  char buffer[80];
-  while(1)
-    {
-      fifo_fp=fopen(fifo, "r");
-      fgets(buffer, 80, fifo_fp);
-      fprintf(pipe_fp, buffer);
-      fclose(fifo_fp);
-    }
-}
-
 char *
 antiright_get_file_extension(char *filename)
 {
Index: antiright/lib/util.h
diff -u antiright/lib/util.h:1.3 antiright/lib/util.h:1.4
--- antiright/lib/util.h:1.3    Fri Jan 21 22:36:30 2005
+++ antiright/lib/util.h        Mon Jan 24 16:07:55 2005
@@ -23,20 +23,6 @@
 #ifndef AR_UTIL_H
 #define AR_UTIL_H
 
-/* This is a function that launches a command and returns the output.
-   Make sure that you free the returned string when finished.  */
-char*
-antiright_pipe_read(char *command_string);
-
-/* This command pipes DATA into the command specified by
-   COMMAND_STRING.  */
-void
-antiright_pipe_write(char *command_string, char* data);
-
-/* This pipes FIFO into COMMAND.  */
-void
-antiright_fifo_server(char *command_string, char *fifo);
-
 /* This is the xmalloc function for AntiRight applications.  It
    verifies the allocation with an assertion.  */
 void *
Index: antiright/src/AntiRight
diff -u antiright/src/AntiRight:1.6 antiright/src/AntiRight:1.7
--- antiright/src/AntiRight:1.6 Sun Nov 21 21:49:27 2004
+++ antiright/src/AntiRight     Mon Jan 24 16:07:56 2005
@@ -78,6 +78,10 @@
 *Uncomment Selected.mnemonic: U
 *Uncomment Selected.accelerator: Alt<Key>J
 *Uncomment Selected.acceleratorText: Alt-J
+*Fill Selected.mnemonic: t
+*Fill All.mnemonic: A
+*Fill All.accelerator: Alt<Key>Q
+*Fill All.acceleratorText: Alt-Q
 *Go to Line.mnemonic: G
 *Go to Line.accelerator: Alt<Key>G
 *Go to Line.acceleratorText: Alt-G
Index: antiright/src/arshell/menubar.c
diff -u antiright/src/arshell/menubar.c:1.9 antiright/src/arshell/menubar.c:1.10
--- antiright/src/arshell/menubar.c:1.9 Mon Dec 27 07:53:41 2004
+++ antiright/src/arshell/menubar.c     Mon Jan 24 16:07:56 2005
@@ -270,6 +270,11 @@
                       antiright_comment_selection, arshell.gui.widgets.work);
       antiright_button(arshell.gui.menubar.edit_widget, "Uncomment Selected",
                       antiright_uncomment_selection, arshell.gui.widgets.work);
+      antiright_separator(arshell.gui.menubar.edit_widget);
+      antiright_button(arshell.gui.menubar.edit_widget, "Fill Selected",
+                      antiright_fill_selection, arshell.gui.widgets.work);
+      antiright_button(arshell.gui.menubar.edit_widget, "Fill All",
+                      antiright_fill_all, arshell.gui.widgets.work);
       antiright_separator(arshell.gui.menubar.view_widget);
       ARCLARG;
       toggle_widget=XmCreateToggleButton(arshell.gui.menubar.view_widget,