*BSD News Article 14617


Return to BSD News archive

Newsgroups: comp.os.386bsd.apps
Path: sserve!newshost.anu.edu.au!munnari.oz.au!network.ucsd.edu!usc!zaphod.mps.ohio-state.edu!darwin.sura.net!haven.umd.edu!uunet!quack!mrapple
From: mrapple@quack.kfu.com (Nick Sayer)
Subject: Re: OLVWM -- anyone interested?
Message-ID: <f14zSqC@quack.kfu.com>
Organization: The Duck Pond public unix: +1 408 249 9630, log in as 'guest'.
References: <9310623.28893@mulga.cs.mu.OZ.AU> <1993Apr16.132035.348@nhqvax.hq.nasa.gov> <JKH.93Apr17011516@whisker.lotus.ie>
Date: 17 Apr 1993 21:01:48 UTC
Lines: 207

jkh@whisker.lotus.ie (Jordan K. Hubbard) writes:

>Do window menus work?

I got them to work. Here's my patch:

*** olvwm-/Makefile.sunpro	Mon Mar 22 08:14:04 1993
--- olvwm/Makefile.sunpro	Thu Mar 18 08:49:13 1993
***************
*** 34,40 ****
  # You shouldn't need to change anything below this line
  
  INC = -I${OPENWINHOME}/include
! CFLAGS = ${INC} ${DEBUG} -DOW_I18N_L3 -DSUNDAE -DSHAPE
  
  HEADERS = cmdstream.h cursors.h defaults.h environ.h events.h gettext.h \
  	  globals.h group.h helpcmd.h i18n.h iconimage.h iconmask.h  \
--- 34,40 ----
  # You shouldn't need to change anything below this line
  
  INC = -I${OPENWINHOME}/include
! CFLAGS = ${INC} ${DEBUG} -DRLIMIT_NOFILE -DREGEXP -DMAXPID=32768 -DSHAPE
  
  HEADERS = cmdstream.h cursors.h defaults.h environ.h events.h gettext.h \
  	  globals.h group.h helpcmd.h i18n.h iconimage.h iconmask.h  \
diff -c olvwm-/mem.c olvwm/mem.c
*** olvwm-/mem.c	Mon Mar 22 08:14:16 1993
--- olvwm/mem.c	Thu Mar 18 08:50:14 1993
***************
*** 13,22 ****
   *
   */
  
  #include <malloc.h>
  #include <memory.h>
  #include <stdio.h>
- #include <sys/types.h>
  
  #include "i18n.h"
  
--- 13,22 ----
   *
   */
  
+ #include <sys/types.h>
  #include <malloc.h>
  #include <memory.h>
  #include <stdio.h>
  
  #include "i18n.h"
  
*** olvwm-/olvwmrc.y	Mon Mar 22 08:14:21 1993
--- olvwm/olvwmrc.y	Thu Mar 18 09:37:53 1993
***************
*** 8,13 ****
--- 8,15 ----
  #ident  "@(#)olvwmrc.y	1.5 olvwm version 12/7/92"
  #endif
  
+ #include <sys/types.h>
+ #include <sys/stat.h>
  #include <stdio.h>
  #include <ctype.h>
  #include <stdlib.h>
***************
*** 501,507 ****
  	    }
  %%
  /* Programs */
! #define YYDEBUG 1
  #include "parse.c"
  
  extern List	*ActiveClientList;
--- 503,509 ----
  	    }
  %%
  /* Programs */
! /* #define YYDEBUG 1 */
  #include "parse.c"
  
  extern List	*ActiveClientList;
*** olvwm-/parse.l	Mon Mar 22 08:14:22 1993
--- olvwm/parse.l	Thu Mar 18 09:33:43 1993
***************
*** 53,59 ****
  
  \"[^"]*\"	{
  	    if (yytext[yyleng - 1] == '\\')
! 		yymore();
  	    else {
  		yylval.sval = strdup(yytext);
  		return WORD;
--- 53,59 ----
  
  \"[^"]*\"	{
  	    if (yytext[yyleng - 1] == '\\')
! 		yymore()
  	    else {
  		yylval.sval = strdup(yytext);
  		return WORD;
***************
*** 62,68 ****
  
  \'[^']*\'	{
  	    if (yytext[yyleng - 1] == '\\')
! 		yymore();
  	    else {
  		yylval.sval = strdup(yytext);
  		return WORD;
--- 62,68 ----
  
  \'[^']*\'	{
  	    if (yytext[yyleng - 1] == '\\')
! 		yymore()
  	    else {
  		yylval.sval = strdup(yytext);
  		return WORD;
*** olvwm-/usermenu.c	Mon Mar 22 08:14:28 1993
--- olvwm/usermenu.c	Mon Mar 22 08:09:51 1993
***************
*** 1721,1727 ****
  void
  SetWindowMenuLabels()
  {
! #ifdef OW_I18N_L3
          windowTitle = gettext(windowTitle);
  
          openButton.label[0].string = gettext("Open");
--- 1721,1727 ----
  void
  SetWindowMenuLabels()
  {
! /* #ifdef OW_I18N_L3 */
          windowTitle = gettext(windowTitle);
  
          openButton.label[0].string = gettext("Open");
***************
*** 1770,1776 ****
          moveDownLeftButton.label[0].string = gettext("Move SouthWest");
  
          moveHomeButton.label[0].string = gettext("Move Home");
! #endif
  }
  
  initMenuButtons(dpy, scrInfo)
--- 1770,1776 ----
          moveDownLeftButton.label[0].string = gettext("Move SouthWest");
  
          moveHomeButton.label[0].string = gettext("Move Home");
! /* #endif */
  }
  
  initMenuButtons(dpy, scrInfo)
*** olvwm-/virtual.c	Mon Mar 22 08:14:30 1993
--- olvwm/virtual.c	Thu Mar 18 09:57:18 1993
***************
*** 3,8 ****
--- 3,9 ----
   * license
   */
  
+ #include <sys/types.h>
  #include <stdio.h>
  #include <string.h>
  #include <dirent.h>
***************
*** 2053,2065 ****
--- 2054,2075 ----
      }
  }
  
+ #ifdef REGEXP
+ #include <regexp.h>
+ regexp *expbuf;
+ #else
  static char expbuf[256];
+ #endif
  
  static
  rexMatch(string)
      char *string;
  {
+ #ifdef REGEXP
+     return regexec(expbuf,string);
+ #else
      return step(string,expbuf);
+ #endif
  }
  
  static
***************
*** 2092,2096 ****
--- 2102,2110 ----
      }
      newPattern[j++] = '$';
      newPattern[j++] = '\0';
+ #ifdef REGEXP
+     expbuf = regcomp (newPattern);
+ #else
      compile(newPattern, expbuf, &expbuf[256], '\0');
+ #endif
  }
-- 
Nick Sayer <mrapple@quack.kfu.com>   | "A man works hard for his filth
N6QQQ @ N0ARY.#NOCAL.CA.USA.NOAM     | just to have vagrants come and
+1 408 249 9630, log in as 'guest'   | steal it. It's a crying shame."
PGP 2.2 public key via finger        | 	     -- man