Introduction
Introduction Statistics Contact Development Disclaimer Help
Remove more unused code. - sam - An updated version of the sam text editor.
git clone git://vernunftzentrum.de/sam.git
Log
Files
Refs
LICENSE
---
commit 2c4a17e0c7e6362d8fa93722602d2d9484065a12
parent e5b9ea1e41e774e3b578ab0ccb717e357a6b591d
Author: Rob King <[email protected]>
Date: Tue, 4 Oct 2016 00:23:23 -0500
Remove more unused code.
Diffstat:
libXg/gwin.c | 7 -------
libXg/wrbitmap.c | 3 ---
libXg/xtbinit.c | 23 -----------------------
sam/sam.h | 2 +-
4 files changed, 1 insertion(+), 34 deletions(-)
---
diff --git a/libXg/gwin.c b/libXg/gwin.c
@@ -9,13 +9,6 @@
#include <X11/XKBlib.h>
#include <X11/keysym.h>
-#ifndef XtSpecificationRelease
-#define R3
-#define XtPointer caddr_t
-#define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
-#define XtExposeCompressMultiple true
-#endif
-
#include "GwinP.h"
#include "libgint.h"
diff --git a/libXg/wrbitmap.c b/libXg/wrbitmap.c
@@ -4,9 +4,6 @@
#include <libg.h>
#include "libgint.h"
#include <X11/Intrinsic.h>
-#ifndef XtSpecificationRelease
-#define R3
-#endif
#include <stdio.h>
void
diff --git a/libXg/xtbinit.c b/libXg/xtbinit.c
@@ -6,8 +6,6 @@
#include <string.h>
#include "libgint.h"
-#define COMPRESSMOUSE
-
#define Font xFont
#define Event xEvent
@@ -17,17 +15,6 @@
#include <X11/XKBlib.h>
#include "Gwin.h"
-#ifndef XtSpecificationRelease
-#define R3
-#define XtAppInitialize(a,b,c,d,e,f,g,h,i) XtInitialize(0,b,c,d,e,f)
-#define XtConvertAndStore(a,b,c,d,e) (XtConvert(a,b,c,d,e),1)
-#define XtAppPending(a) XtPending()
-#define XtAppProcessEvent(a,b) XtProcessEvent(b)
-#define XtAppAddTimeOut(a,b,c,d) XtAddTimeOut(b,c,d)
-#define XtAppAddInput(a,b,c,d,e) XtAddInput(b,c,d,e)
-#define XtPointer caddr_t
-#endif
-
#undef Font
#undef Event
@@ -73,9 +60,7 @@ Colormap _libg_cmap;
int _cmap_installed;
/* xbinit implementation globals */
-#ifndef R3
static XtAppContext app;
-#endif
static Widget widg;
static bool exposed = 0;
static Atom wm_take_focus;
@@ -127,13 +112,11 @@ String _fallbacks[] = {
NULL
};
-#ifndef R3
static char *shelltrans =
"<ClientMessage> WM_PROTOCOLS : WMProtocolAction()";
static XtActionsRec wmpactions[] = {
{"WMProtocolAction", wmproto}
};
-#endif
void
xtbinit(Errfunc f, char *class, int *pargc, char **argv, char **fallbacks)
@@ -247,7 +230,6 @@ xtbinit(Errfunc f, char *class, int *pargc, char **argv, ch…
static void
focinit(Widget w)
{
-#ifndef R3
XrmValue src, dst;
src.addr = "WM_TAKE_FOCUS";
@@ -258,10 +240,8 @@ focinit(Widget w)
XSetWMProtocols(XtDisplay(w), XtWindow(w), &wm_take_focus, 1);
XtAppAddActions(app, wmpactions, XtNumber(wmpactions));
XtAugmentTranslations(w, XtParseTranslationTable(shelltrans));
-#endif
}
-#ifndef R3
static void
wmproto(Widget w, XEvent *e , String *p, Cardinal *np)
{
@@ -273,7 +253,6 @@ wmproto(Widget w, XEvent *e , String *p, Cardinal *np)
XtCallAcceptFocus(widg, &t);
}
}
-#endif
static void
reshaped(int minx, int miny, int maxx, int maxy)
@@ -645,7 +624,6 @@ ebread(Esrc *s)
while(s->head == 0)
waitevent();
eb = s->head;
-#ifdef COMPRESSMOUSE
if(s == &esrc[Smouse]) {
while(eb->next) {
s->head = eb->next;
@@ -654,7 +632,6 @@ ebread(Esrc *s)
eb = s->head;
}
}
-#endif
s->head = s->head->next;
if(s->head == 0) {
s->tail = 0;
diff --git a/sam/sam.h b/sam/sam.h
@@ -18,7 +18,7 @@
#define STRSIZE (2*BLOCKSIZE)
typedef int64_t Posn; /* file position or address */
-typedef uint16_t Mod; /* modification number */
+typedef uint64_t Mod; /* modification number */
typedef struct Address Address;
typedef struct Block Block;
You are viewing proxied material from vernunftzentrum.de. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.