From 17cff4026608bf19a118899653fddeaba15ed6b1 Mon Sep 17 00:00:00 2001
From: Keiko Katsuragawa <kkatsuragawa@uwaterloo.ca>
Date: Tue, 9 Jan 2018 21:15:09 -0500
Subject: [PATCH] add x examples for 1-4 drawing
---
x/1-4-Drawing/clipping.cpp | 292 ++++++++++++++++++++++++++++++++++
x/1-4-Drawing/displaylist.cpp | 273 +++++++++++++++++++++++++++++++
x/1-4-Drawing/drawing.cpp | 200 +++++++++++++++++++++++
x/1-4-Drawing/drawing.min | Bin 0 -> 14080 bytes
x/1-4-Drawing/drawing.min.cpp | 59 +++++++
x/1-4-Drawing/makefile | 19 +++
6 files changed, 843 insertions(+)
create mode 100644 x/1-4-Drawing/clipping.cpp
create mode 100644 x/1-4-Drawing/displaylist.cpp
create mode 100644 x/1-4-Drawing/drawing.cpp
create mode 100755 x/1-4-Drawing/drawing.min
create mode 100644 x/1-4-Drawing/drawing.min.cpp
create mode 100644 x/1-4-Drawing/makefile
diff --git a/x/1-4-Drawing/clipping.cpp b/x/1-4-Drawing/clipping.cpp
new file mode 100644
index 0000000..dca7e82
--- /dev/null
+++ b/x/1-4-Drawing/clipping.cpp
@@ -0,0 +1,292 @@
+/*
+CS 349 Code Examples: X Windows and XLib
+
+ displaylist Demos Displayable class and display list
+
+- - - - - - - - - - - - - - - - - - - - - -
+
+See associated makefile for compiling instructions
+
+*/
+
+#include <iostream>
+#include <list>
+#include <cstdlib>
+#include <vector>
+/*
+ * Header files for X functions
+ */
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+#include <unistd.h> // needed for sleep
+
+using namespace std;
+
+/*
+ * Information to draw on the window.
+ */
+struct XInfo {
+ Display* display;
+ Window window;
+ GC gc;
+};
+
+
+/*
+ * An abstract class representing displayable things.
+ */
+class Displayable {
+public:
+ virtual void paint(XInfo& xinfo) = 0;
+};
+
+/*
+ * A text displayable
+ */
+class Text : public Displayable {
+public:
+ virtual void paint(XInfo& xinfo) {
+ XDrawImageString( xinfo.display, xinfo.window, xinfo.gc,
+ this->x, this->y, this->s.c_str(), this->s.length() );
+ }
+
+ // constructor
+ Text(int x, int y, string s): x(x), y(y), s(s) {}
+
+private:
+ int x;
+ int y;
+ string s; // string to show
+};
+
+/*
+ * A displayable polyline
+ */
+class Polyline : public Displayable {
+public:
+ virtual void paint(XInfo& xinfo) {
+
+ // CLIPPING CODE HERE!
+ // =====================================
+
+ // create a clip window
+ XRectangle clip_rect;
+
+ clip_rect.x = 50;
+ clip_rect.y = 50;
+ clip_rect.width = 200;
+ clip_rect.height = 200;
+
+ // clips all drawings that use the same GC after this call ...
+ XSetClipRectangles(xinfo.display, xinfo.gc,
+ 0, 0, &clip_rect, 1, Unsorted);
+
+ XDrawLines(xinfo.display, xinfo.window, xinfo.gc,
+ &points[0], points.size(), // vector of points
+ CoordModeOrigin ); // use absolute coordinates
+
+ // turn clipping off again
+ XSetClipMask(xinfo.display, xinfo.gc, None);
+
+ // =====================================
+ // to here
+ }
+
+ // constructor
+ Polyline(int x, int y) {
+ add_point(x, y);
+ }
+
+ // add another point to the line
+ void add_point(int x, int y) {
+ XPoint p; // XPoint is a built in struct
+ p.x = x;
+ p.y = y;
+ points.push_back(p);
+ }
+
+private:
+ // need to use a vector to dynamically add points
+ vector < XPoint > points; // XPoint is a built in struct
+};
+
+
+
+/*
+ * A face displayable
+ */
+class Face : public Displayable {
+public:
+ virtual void paint(XInfo& xinfo) {
+
+ // create a simple graphics context
+ GC gc = XCreateGC(xinfo.display, xinfo.window, 0, 0);
+ int screen = DefaultScreen( xinfo.display );
+ XSetForeground(xinfo.display, gc, BlackPixel(xinfo.display, screen));
+ XSetBackground(xinfo.display, gc, WhitePixel(xinfo.display, screen));
+ XSetFillStyle(xinfo.display, gc, FillSolid);
+ XSetLineAttributes(xinfo.display, gc,
+ 3, // 3 is line width
+ LineSolid, CapButt, JoinRound); // other line options
+
+
+ // draw head
+ XFillArc(xinfo.display, xinfo.window, gc,
+ x - (d / 2), y - (d / 2), d, d, 0, 360 * 64);
+
+ XSetForeground(xinfo.display, gc, WhitePixel(xinfo.display, screen));
+
+ // draw mouth either smiling or serious
+ if (smile) {
+ int dd = d / 2;
+ XDrawArc(xinfo.display, xinfo.window, gc,
+ x - (dd / 2), y - (dd / 2), dd, dd, 210 * 64, 120 * 64);
+ } else {
+ int dd = d / 3;
+ XDrawLine(xinfo.display, xinfo.window, gc,
+ x - dd, y + dd / 2, x + dd, y + dd / 2);
+ }
+ }
+
+ // constructor
+ Face(int x, int y, int d, bool smile): x(x), y(y), d(d), smile(smile) {}
+
+private:
+ int x;
+ int y;
+ int d; // diameter
+ bool smile; // is smiling
+};
+
+
+
+/*
+ * Function to put out a message on error exits.
+ */
+void error( string str ) {
+ cerr << str << endl;
+ exit(0);
+}
+
+
+/*
+ * Create a window
+ */
+void initX(int argc, char* argv[], XInfo& xinfo) {
+
+
+ /*
+ * Display opening uses the DISPLAY environment variable.
+ * It can go wrong if DISPLAY isn't set, or you don't have permission.
+ */
+ xinfo.display = XOpenDisplay( "" );
+ if ( !xinfo.display ) {
+ error( "Can't open display." );
+ }
+
+ /*
+ * Find out some things about the display you're using.
+ */
+ // DefaultScreen is as macro to get default screen index
+ int screen = DefaultScreen( xinfo.display );
+
+ unsigned long white, black;
+ white = XWhitePixel( xinfo.display, screen );
+ black = XBlackPixel( xinfo.display, screen );
+
+ xinfo.window = XCreateSimpleWindow(
+ xinfo.display, // display where window appears
+ DefaultRootWindow( xinfo.display ), // window's parent in window tree
+ 10, 10, // upper left corner location
+ 300, 300, // size of the window
+ 5, // width of window's border
+ black, // window border colour
+ white ); // window background colour
+
+ // extra window properties like a window title
+ XSetStandardProperties(
+ xinfo.display, // display containing the window
+ xinfo.window, // window whose properties are set
+ "clipping", // window's title
+ "CL", // icon's title
+ None, // pixmap for the icon
+ argv, argc, // applications command line args
+ None ); // size hints for the window
+
+ /*
+ * Put the window on the screen.
+ */
+ XMapRaised( xinfo.display, xinfo.window );
+
+ XFlush(xinfo.display);
+
+ // give server time to setup
+ sleep(1);
+}
+
+/*
+ * Function to repaint a display list
+ */
+void repaint( list<Displayable*> dList, XInfo& xinfo) {
+ list<Displayable*>::const_iterator begin = dList.begin();
+ list<Displayable*>::const_iterator end = dList.end();
+
+ XClearWindow(xinfo.display, xinfo.window);
+ while ( begin != end ) {
+ Displayable* d = *begin;
+ d->paint(xinfo);
+ begin++;
+ }
+ XFlush(xinfo.display);
+}
+
+
+int main( int argc, char* argv[] ) {
+
+ XInfo xinfo;
+
+ initX(argc, argv, xinfo);
+
+ // create a simple graphics context
+ GC gc = XCreateGC(xinfo.display, xinfo.window, 0, 0);
+ int screen = DefaultScreen( xinfo.display );
+ XSetForeground(xinfo.display, gc, BlackPixel(xinfo.display, screen));
+ XSetBackground(xinfo.display, gc, WhitePixel(xinfo.display, screen));
+
+ // load a larger font
+ XFontStruct * font;
+ font = XLoadQueryFont (xinfo.display, "12x24");
+ XSetFont (xinfo.display, gc, font->fid);
+
+ xinfo.gc = gc;
+
+ // list of Displayables
+ list<Displayable*> dList;
+
+ Polyline* polyline = new Polyline(0, 0);
+ for (int i = 0; i < 100; i++) {
+ polyline->add_point(rand() % 300, rand() % 300);
+ }
+
+ // try changing the order or commenting out these lines
+
+ dList.push_back(new Text(50, 50, "ABC"));
+
+ dList.push_back(new Text(130, 100, "DEF"));
+
+ dList.push_back(new Text(200, 200, "GHI"));
+
+ dList.push_back(new Face(200, 200, 50, false));
+
+ dList.push_back(polyline);
+
+ // paint everything in the display list
+ repaint(dList, xinfo);
+
+ XFlush(xinfo.display);
+
+ std::cout << "ENTER2exit"; std::cin.get(); // wait for input
+ XCloseDisplay(xinfo.display);
+
+}
\ No newline at end of file
diff --git a/x/1-4-Drawing/displaylist.cpp b/x/1-4-Drawing/displaylist.cpp
new file mode 100644
index 0000000..f63022d
--- /dev/null
+++ b/x/1-4-Drawing/displaylist.cpp
@@ -0,0 +1,273 @@
+/*
+CS 349 Code Examples: X Windows and XLib
+
+ displaylist Demos Displayable class and display list technique
+
+- - - - - - - - - - - - - - - - - - - - - -
+
+See associated makefile for compiling instructions
+
+*/
+
+#include <iostream>
+#include <list>
+#include <cstdlib>
+#include <vector>
+/*
+ * Header files for X functions
+ */
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+#include <unistd.h> // needed for sleep
+
+using namespace std;
+
+/*
+ * Information to draw on the window.
+ */
+struct XInfo {
+ Display* display;
+ Window window;
+ GC gc;
+};
+
+
+/*
+ * An abstract class representing displayable things.
+ */
+class Displayable {
+public:
+ virtual void paint(XInfo& xinfo) = 0;
+};
+
+/*
+ * A text displayable
+ */
+class Text : public Displayable {
+public:
+ virtual void paint(XInfo& xinfo) {
+ XDrawImageString( xinfo.display, xinfo.window, xinfo.gc,
+ this->x, this->y, this->s.c_str(), this->s.length() );
+ }
+
+ // constructor
+ Text(int x, int y, string s): x(x), y(y), s(s) {}
+
+private:
+ int x;
+ int y;
+ string s; // string to show
+};
+
+/*
+ * A displayable polyline
+ */
+class Polyline : public Displayable {
+public:
+ virtual void paint(XInfo& xinfo) {
+ // note the trick to pass a stl vector as an C array
+ XDrawLines(xinfo.display, xinfo.window, xinfo.gc,
+ &points[0], points.size(), // vector of points
+ CoordModeOrigin ); // use absolute coordinates
+ }
+
+ // constructor
+ Polyline(int x, int y) {
+ add_point(x, y);
+ }
+
+ // add another point to the line
+ void add_point(int x, int y) {
+ XPoint p; // XPoint is a built in struct
+ p.x = x;
+ p.y = y;
+ points.push_back(p);
+ }
+
+private:
+ // need to use a vector to dynamically add points
+ vector < XPoint > points; // XPoint is a built in struct
+};
+
+
+
+/*
+ * A face displayable
+ */
+class Face : public Displayable {
+public:
+ virtual void paint(XInfo& xinfo) {
+
+ // create a simple graphics context
+ GC gc = XCreateGC(xinfo.display, xinfo.window, 0, 0);
+ int screen = DefaultScreen( xinfo.display );
+ XSetForeground(xinfo.display, gc, BlackPixel(xinfo.display, screen));
+ XSetBackground(xinfo.display, gc, WhitePixel(xinfo.display, screen));
+ XSetFillStyle(xinfo.display, gc, FillSolid);
+ XSetLineAttributes(xinfo.display, gc,
+ 3, // 3 is line width
+ LineSolid, CapButt, JoinRound); // other line options
+
+
+ // draw head
+ XFillArc(xinfo.display, xinfo.window, gc,
+ x - (d / 2), y - (d / 2), d, d, 0, 360 * 64);
+
+ XSetForeground(xinfo.display, gc, WhitePixel(xinfo.display, screen));
+
+ // draw mouth either smiling or serious
+ if (smile) {
+ int dd = d / 2;
+ XDrawArc(xinfo.display, xinfo.window, gc,
+ x - (dd / 2), y - (dd / 2), dd, dd, 210 * 64, 120 * 64);
+ } else {
+ int dd = d / 3;
+ XDrawLine(xinfo.display, xinfo.window, gc,
+ x - dd, y + dd / 2, x + dd, y + dd / 2);
+ }
+ }
+
+ // constructor
+ Face(int x, int y, int d, bool smile): x(x), y(y), d(d), smile(smile) {}
+
+private:
+ int x;
+ int y;
+ int d; // diameter
+ bool smile; // is smiling
+};
+
+
+
+/*
+ * Function to put out a message on error exits.
+ */
+void error( string str ) {
+ cerr << str << endl;
+ exit(0);
+}
+
+
+/*
+ * Create a window
+ */
+void initX(int argc, char* argv[], XInfo& xinfo) {
+
+
+ /*
+ * Display opening uses the DISPLAY environment variable.
+ * It can go wrong if DISPLAY isn't set, or you don't have permission.
+ */
+ xinfo.display = XOpenDisplay( "" );
+ if ( !xinfo.display ) {
+ error( "Can't open display." );
+ }
+
+ /*
+ * Find out some things about the display you're using.
+ */
+ // DefaultScreen is as macro to get default screen index
+ int screen = DefaultScreen( xinfo.display );
+
+ unsigned long white, black;
+ white = XWhitePixel( xinfo.display, screen );
+ black = XBlackPixel( xinfo.display, screen );
+
+ xinfo.window = XCreateSimpleWindow(
+ xinfo.display, // display where window appears
+ DefaultRootWindow( xinfo.display ), // window's parent in window tree
+ 10, 10, // upper left corner location
+ 300, 300, // size of the window
+ 5, // width of window's border
+ black, // window border colour
+ white ); // window background colour
+
+ // extra window properties like a window title
+ XSetStandardProperties(
+ xinfo.display, // display containing the window
+ xinfo.window, // window whose properties are set
+ "displaylist", // window's title
+ "DL", // icon's title
+ None, // pixmap for the icon
+ argv, argc, // applications command line args
+ None ); // size hints for the window
+
+ /*
+ * Put the window on the screen.
+ */
+ XMapRaised( xinfo.display, xinfo.window );
+
+ XFlush(xinfo.display);
+
+ // give server time to setup
+ sleep(1);
+}
+
+/*
+ * Function to repaint a display list
+ */
+void repaint( list<Displayable*> dList, XInfo& xinfo) {
+ list<Displayable*>::const_iterator begin = dList.begin();
+ list<Displayable*>::const_iterator end = dList.end();
+
+ XClearWindow(xinfo.display, xinfo.window);
+ while ( begin != end ) {
+ Displayable* d = *begin;
+ d->paint(xinfo);
+ begin++;
+ }
+ XFlush(xinfo.display);
+}
+
+
+int main( int argc, char* argv[] ) {
+
+ XInfo xinfo;
+
+ initX(argc, argv, xinfo);
+
+ // create a simple graphics context
+ GC gc = XCreateGC(xinfo.display, xinfo.window, 0, 0);
+ int screen = DefaultScreen( xinfo.display );
+ XSetForeground(xinfo.display, gc, BlackPixel(xinfo.display, screen));
+ XSetBackground(xinfo.display, gc, WhitePixel(xinfo.display, screen));
+
+ // load a larger font
+ XFontStruct * font;
+ font = XLoadQueryFont (xinfo.display, "12x24");
+ XSetFont (xinfo.display, gc, font->fid);
+
+ xinfo.gc = gc;
+
+ // list of Displayables
+ list<Displayable*> dList;
+
+ Polyline* polyline = new Polyline(0, 0);
+ for (int i = 0; i < 100; i++) {
+ polyline->add_point(rand() % 300, rand() % 300);
+ }
+
+ // try changing the order or commenting out these lines
+
+
+ dList.push_back(new Text(50, 50, "ABC"));
+
+ dList.push_back(new Text(130, 100, "DEF"));
+
+ dList.push_back(new Text(200, 200, "GHI"));
+
+ dList.push_back(new Face(200, 200, 50, false));
+
+ dList.push_back(polyline);
+
+
+ // paint everything in the display list
+ repaint(dList, xinfo);
+
+ XFlush(xinfo.display);
+
+ std::cout << "ENTER2exit"; std::cin.get(); // wait for input
+ XCloseDisplay(xinfo.display);
+
+}
\ No newline at end of file
diff --git a/x/1-4-Drawing/drawing.cpp b/x/1-4-Drawing/drawing.cpp
new file mode 100644
index 0000000..987d86a
--- /dev/null
+++ b/x/1-4-Drawing/drawing.cpp
@@ -0,0 +1,200 @@
+/*
+CS 349 Code Examples: X Windows and XLib
+
+ drawing Demos drawing functions and graphics contexts
+
+- - - - - - - - - - - - - - - - - - - - - -
+
+See associated makefile for compiling instructions
+
+*/
+
+#include <iostream>
+#include <list>
+#include <cstdlib>
+#include <unistd.h>
+
+// Header files for X functions
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+using namespace std;
+
+// handy struct to save display, window, and screen
+struct XInfo {
+ Display *display;
+ int screen;
+ Window window;
+};
+
+// Function to put out a message on error and exits
+void error( string str ) {
+ cerr << str << endl;
+ exit(0);
+}
+
+void drawRectanglesInCorners(XInfo &xinfo, GC gc) {
+ Display *display = xinfo.display;
+ Window win = xinfo.window;
+
+ XWindowAttributes windowInfo;
+ XGetWindowAttributes(display, win, &windowInfo);
+ // max x and y coordinate
+ unsigned int maxHeight = windowInfo.height - 1;
+ unsigned int maxWidth = windowInfo.width - 1;
+
+ // draw rectangles in each corner of the window
+ int s = 32; // rectangle size
+ XDrawRectangle(display, win, gc, 0, 0, s, s); // top left
+ XDrawRectangle(display, win, gc, 0, maxHeight - s, s, s); // bottom left
+ XDrawRectangle(display, win, gc, maxWidth - s, 0, s, s); // top right
+ XDrawRectangle(display, win, gc, maxWidth - s, maxHeight - s, s, s); // bottom right
+}
+
+void drawStuff(XInfo &xinfo, GC gc, int x, int y) {
+ Display *display = xinfo.display;
+ Window win = xinfo.window;
+
+ // draw two intersecting lines, one horizontal and one vertical,
+ // which intersect at point "x,y".
+ XDrawLine(display, win, gc, x, y - 30, x, y + 200);
+ XDrawLine(display, win, gc, x - 30, y, x + 200, y);
+
+ // now use the XDrawArc() function to draw a circle whose diameter
+ // is 30 pixels, and whose center is at location 'x,y'.
+ XDrawArc(display, win, gc, x - (30 / 2), y - (30 / 2), 30, 30, 0, 360 * 64);
+
+ // draw a small triangle at the top-left corner of the window.
+ // the triangle is made of a set of consecutive lines, whose
+ // end-point pixels are specified in the 'points' array.
+ {
+ XPoint points[] = {
+ {x + 200, y + 50},
+ {x + 250, y + 80},
+ {x + 200, y + 80},
+ {x + 200, y + 50}
+ };
+ int npoints = sizeof(points) / sizeof(XPoint);
+
+ XDrawLines(display, win, gc, points, npoints, CoordModeOrigin);
+ }
+
+ // draw a rectangle whose top-left corner is at 'x+120,y+50', its width is
+ // 50 pixels, and height is 60 pixels.
+ XDrawRectangle(display, win, gc, x + 120, y + 50, 50, 60);
+
+ // draw a filled rectangle of the same size as above, to the left of the
+ // previous rectangle.
+ XFillRectangle(display, win, gc, x + 60, y + 50, 50, 60);
+}
+
+
+// Initialize X and create a window
+void initX(int argc, char *argv[], XInfo &xinfo) {
+
+ XSizeHints hints;
+ unsigned long white, black;
+
+
+ // Display opening uses the DISPLAY environment variable.
+ // It can go wrong if DISPLAY isn't set, or you don't have permission.
+ xinfo.display = XOpenDisplay( "" );
+ if ( !xinfo.display ) {
+ error( "Can't open display." );
+ }
+
+ // Find out some things about the display you're using.
+ xinfo.screen = DefaultScreen( xinfo.display );
+
+ white = XWhitePixel( xinfo.display, xinfo.screen );
+ black = XBlackPixel( xinfo.display, xinfo.screen );
+
+ hints.x = 100;
+ hints.y = 100;
+ hints.width = 600;
+ hints.height = 600;
+ hints.flags = PPosition | PSize;
+
+ xinfo.window = XCreateSimpleWindow(
+ xinfo.display, // display where window appears
+ DefaultRootWindow( xinfo.display ), // window's parent in window tree
+ hints.x, hints.y, // upper left corner location
+ hints.width, hints.height, // size of the window
+ 5, // width of window's border
+ black, // window border colour
+ white ); // window background colour
+
+ XSetStandardProperties(
+ xinfo.display, // display containing the window
+ xinfo.window, // window whose properties are set
+ "drawing", // window's title
+ "SD", // icon's title
+ None, // pixmap for the icon
+ argv, argc, // applications command line args
+ &hints ); // size hints for the window
+
+ // Put the window on the screen.
+ XMapRaised( xinfo.display, xinfo.window );
+
+ XFlush(xinfo.display);
+
+ // give server time to setup before sending drawing commands
+ sleep(1);
+}
+
+
+
+/*
+ * Start executing here.
+ * First initialize window.
+ * Next loop responding to events.
+ * Exit forcing window manager to clean up - cheesy, but easy.
+ */
+int main ( int argc, char *argv[] ) {
+ XInfo xinfo;
+
+ initX(argc, argv, xinfo);
+
+ // an array of graphics contexts to demo
+ GC gc[3];
+
+ // Create 3 Graphics Contexts
+ int i = 0;
+ gc[i] = XCreateGC(xinfo.display, xinfo.window, 0, 0);
+ XSetForeground(xinfo.display, gc[i], BlackPixel(xinfo.display, xinfo.screen));
+ XSetBackground(xinfo.display, gc[i], WhitePixel(xinfo.display, xinfo.screen));
+ XSetFillStyle(xinfo.display, gc[i], FillSolid);
+ XSetLineAttributes(xinfo.display, gc[i],
+ 1, LineSolid, CapButt, JoinRound);
+
+ i = 1;
+ gc[i] = XCreateGC(xinfo.display, xinfo.window, 0, 0);
+ XSetForeground(xinfo.display, gc[i], BlackPixel(xinfo.display, xinfo.screen));
+ XSetBackground(xinfo.display, gc[i], WhitePixel(xinfo.display, xinfo.screen));
+ XSetFillStyle(xinfo.display, gc[i], FillSolid);
+ XSetLineAttributes(xinfo.display, gc[i],
+ 7, LineSolid, CapRound, JoinMiter);
+
+ i = 2;
+ gc[i] = XCreateGC(xinfo.display, xinfo.window, 0, 0);
+ XSetForeground(xinfo.display, gc[i], BlackPixel(xinfo.display, xinfo.screen));
+ XSetBackground(xinfo.display, gc[i], WhitePixel(xinfo.display, xinfo.screen));
+ XSetFillStyle(xinfo.display, gc[i], FillSolid);
+ XSetLineAttributes(xinfo.display, gc[i],
+ 7, LineOnOffDash, CapButt, JoinBevel);
+
+ // make the drawing
+ drawRectanglesInCorners(xinfo, gc[1]);
+ drawStuff(xinfo, gc[0], 50, 50);
+ drawStuff(xinfo, gc[1], 150, 200);
+ drawStuff(xinfo, gc[2], 250, 350);
+
+ // flush all pending requests to the X server.
+ XFlush(xinfo.display);
+
+ // wait for user input to quit
+ cout << "press ENTER to exit";
+ cin.get();
+
+ XCloseDisplay(xinfo.display);
+}
diff --git a/x/1-4-Drawing/drawing.min b/x/1-4-Drawing/drawing.min
new file mode 100755
index 0000000000000000000000000000000000000000..50f17210e879890e38db6181cca7c3708080352c
GIT binary patch
literal 14080
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
WapU!muFq2K3-w}NXSrak?f*C0Gbnig
literal 0
HcmV?d00001
diff --git a/x/1-4-Drawing/drawing.min.cpp b/x/1-4-Drawing/drawing.min.cpp
new file mode 100644
index 0000000..255e21a
--- /dev/null
+++ b/x/1-4-Drawing/drawing.min.cpp
@@ -0,0 +1,59 @@
+/*
+CS 349 Code Examples: X Windows and XLib
+
+ drawing.min Demos drawing and graphics context (minimal version).
+
+- - - - - - - - - - - - - - - - - - - - - -
+
+See associated makefile for compiling instructions
+
+*/
+
+#include <cstdlib>
+#include <iostream>
+#include <X11/Xlib.h>
+
+#include <unistd.h> // needed for sleep
+
+Display* display;
+Window window;
+
+int main( int argc, char* argv[] ) {
+ // see openwindow.min for the setup code ...
+ display = XOpenDisplay("");
+ if (!display) exit (-1);
+ int screen = XDefaultScreen(display);
+ int w = 300;
+ int h = 300;
+ window = XCreateSimpleWindow(display,
+ DefaultRootWindow(display),
+ 10, 10, w, h, 2,
+ XBlackPixel(display, screen),
+ XWhitePixel(display, screen));
+ XMapRaised(display, window);
+ XFlush(display);
+
+ // give server 10ms to get set up before sending drawing commands
+ usleep(10 * 1000);
+
+
+ // drawing demo with graphics context here ...
+ GC gc = XCreateGC(display, window, 0, 0); // create a graphics context
+ XSetForeground(display, gc, XBlackPixel(display, screen));
+ XSetBackground(display, gc, XWhitePixel(display, screen));
+ XSetFillStyle(display, gc, FillSolid);
+ XSetLineAttributes(display, gc,
+ 3, // 3 is line width
+ LineSolid, CapButt, JoinRound); // other line options
+
+ // draw some things
+ XDrawLine(display, window, gc, 10, 10, w - 10, h - 10);
+ XFillRectangle(display, window, gc, 50, 50, w - (2 * 50), h - (2 * 50));
+ XSetForeground(display, gc, XWhitePixel(display, screen));
+ XDrawLine(display, window, gc, w - 10, 10, 10, h - 10);
+
+ XFlush(display);
+
+ std::cout << "ENTER2exit"; std::cin.get(); // wait for input
+ XCloseDisplay(display);
+}
diff --git a/x/1-4-Drawing/makefile b/x/1-4-Drawing/makefile
new file mode 100644
index 0000000..4db1c15
--- /dev/null
+++ b/x/1-4-Drawing/makefile
@@ -0,0 +1,19 @@
+# super simple makefile
+# call it using 'make NAME=name_of_code_file_without_extension'
+# (assumes a .cpp extension)
+NAME = "drawing.min"
+
+# Add $(MAC_OPT) to the compile line for macOS
+# (should be ignored by Linux, set to nothing if causing problems)
+MAC_OPT = -I/opt/X11/include
+
+all:
+ @echo "Compiling..."
+ g++ -o $(NAME) $(NAME).cpp -L/opt/X11/lib -lX11 -lstdc++ $(MAC_OPT)
+
+run: all
+ @echo "Running..."
+ ./$(NAME)
+
+clean:
+ -rm *o
--
GitLab