13 files changed, 26 insertions, 16 deletions
diff --git a/src/cairo/cdcairodbuf.c b/src/cairo/cdcairodbuf.c
index 91f1649..845a24b 100644
--- a/src/cairo/cdcairodbuf.c
+++ b/src/cairo/cdcairodbuf.c
@@ -137,7 +137,8 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdDBufferContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE ),
-  0,
+  1,
+  CD_CTX_IMAGE,
   cdcreatecanvas,  
   cdinittable,
   NULL,             
diff --git a/src/cairo/cdcairoemf.c b/src/cairo/cdcairoemf.c
index 979caa7..f83ae11 100644
--- a/src/cairo/cdcairoemf.c
+++ b/src/cairo/cdcairoemf.c
@@ -108,7 +108,8 @@ static cdContext cdEMFCairoContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_GETIMAGERGB |
                  CD_CAP_WRITEMODE | CD_CAP_PALETTE | CD_CAP_IMAGESRV),
-  0,
+  1,
+  CD_CTX_FILE,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcairoimg.c b/src/cairo/cdcairoimg.c
index bc39129..3786de1 100644
--- a/src/cairo/cdcairoimg.c
+++ b/src/cairo/cdcairoimg.c
@@ -38,7 +38,8 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdImageContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE ),
-  0,
+  1,
+  CD_CTX_IMAGE,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcairoirgb.c b/src/cairo/cdcairoirgb.c
index b326834..21ff6c5 100644
--- a/src/cairo/cdcairoirgb.c
+++ b/src/cairo/cdcairoirgb.c
@@ -146,7 +146,8 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdCairoImageRGBContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
-  0,
+  0,  /* not a plus driver */
+  CD_CTX_IMAGE,
   cdcreatecanvas,  
   cdinittable,
   NULL,                 
diff --git a/src/cairo/cdcaironative_gdk.c b/src/cairo/cdcaironative_gdk.c
index 143efaf..1e177a4 100644
--- a/src/cairo/cdcaironative_gdk.c
+++ b/src/cairo/cdcaironative_gdk.c
@@ -96,6 +96,7 @@ static cdContext cdNativeWindowContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
   1,
+  CD_CTX_WINDOW,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcaironative_win32.c b/src/cairo/cdcaironative_win32.c
index e0b860e..3cc1972 100644
--- a/src/cairo/cdcaironative_win32.c
+++ b/src/cairo/cdcaironative_win32.c
@@ -145,6 +145,7 @@ static cdContext cdNativeWindowContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
   1,
+  CD_CTX_WINDOW,
   cdcreatecanvas,
   cdinittable,
   NULL,
@@ -156,5 +157,3 @@ cdContext* cdContextCairoNativeWindow(void)
 {
   return &cdNativeWindowContext;
 }
-
-// cairo_win32_printing_surface_create  CD_PRINTER 
diff --git a/src/cairo/cdcaironative_x11.c b/src/cairo/cdcaironative_x11.c
index 1030745..ae08420 100644
--- a/src/cairo/cdcaironative_x11.c
+++ b/src/cairo/cdcaironative_x11.c
@@ -85,6 +85,7 @@ static cdContext cdNativeWindowContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE ),
   1,
+  CD_CTX_WINDOW,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcairopdf.c b/src/cairo/cdcairopdf.c
index f17fff4..980da72 100644
--- a/src/cairo/cdcairopdf.c
+++ b/src/cairo/cdcairopdf.c
@@ -109,7 +109,8 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdCairoPDFContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
-  0,
+  0,  /* not a plus driver */
+  CD_CTX_FILE,
   cdcreatecanvas,  
   cdinittable,
   NULL,                 
diff --git a/src/cairo/cdcairoplus.c b/src/cairo/cdcairoplus.c
index a46d9f3..d37efa7 100644
--- a/src/cairo/cdcairoplus.c
+++ b/src/cairo/cdcairoplus.c
@@ -16,14 +16,14 @@ void cdInitContextPlus(void)
   cdContext* ctx_list[NUM_CONTEXTPLUS];
   memset(ctx_list, 0, sizeof(ctx_list));
 
-  ctx_list[CD_CTX_NATIVEWINDOW] = cdContextCairoNativeWindow();
-  ctx_list[CD_CTX_IMAGE] = cdContextCairoImage();
-  ctx_list[CD_CTX_DBUFFER] = cdContextCairoDBuffer();
+  ctx_list[CD_CTXPLUS_NATIVEWINDOW] = cdContextCairoNativeWindow();
+  ctx_list[CD_CTXPLUS_IMAGE] = cdContextCairoImage();
+  ctx_list[CD_CTXPLUS_DBUFFER] = cdContextCairoDBuffer();
 #ifndef CAIRO_X11
-  ctx_list[CD_CTX_PRINTER] = cdContextCairoPrinter();
+  ctx_list[CD_CTXPLUS_PRINTER] = cdContextCairoPrinter();
 #endif
 #ifdef WIN32
-  ctx_list[CD_CTX_EMF] = cdContextCairoEMF();
+  ctx_list[CD_CTXPLUS_EMF] = cdContextCairoEMF();
 #endif
 
   cdInitContextPlusList(ctx_list);
diff --git a/src/cairo/cdcairoprn_unix.c b/src/cairo/cdcairoprn_unix.c
index 67fad83..0c4544c 100644
--- a/src/cairo/cdcairoprn_unix.c
+++ b/src/cairo/cdcairoprn_unix.c
@@ -194,7 +194,8 @@ static cdContext cdPrinterCairoContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_GETIMAGERGB |
                  CD_CAP_WRITEMODE | CD_CAP_PALETTE | CD_CAP_IMAGESRV),
-  0,
+  1,
+  CD_CTX_DEVICE,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcairoprn_win32.c b/src/cairo/cdcairoprn_win32.c
index cbf4d66..a5fadbd 100644
--- a/src/cairo/cdcairoprn_win32.c
+++ b/src/cairo/cdcairoprn_win32.c
@@ -181,7 +181,8 @@ static cdContext cdPrinterCairoContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_GETIMAGERGB |
                  CD_CAP_WRITEMODE | CD_CAP_PALETTE | CD_CAP_IMAGESRV),
-  0,
+  1,
+  CD_CTX_DEVICE,
   cdcreatecanvas,
   cdinittable,
   NULL,
diff --git a/src/cairo/cdcairops.c b/src/cairo/cdcairops.c
index 78cd3db..8880255 100644
--- a/src/cairo/cdcairops.c
+++ b/src/cairo/cdcairops.c
@@ -158,7 +158,8 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdCairoPSContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
-  0,
+  0,  /* not a plus driver */
+  CD_CTX_FILE,
   cdcreatecanvas,  
   cdinittable,
   NULL,                 
diff --git a/src/cairo/cdcairosvg.c b/src/cairo/cdcairosvg.c
index d97cb24..116d39d 100644
--- a/src/cairo/cdcairosvg.c
+++ b/src/cairo/cdcairosvg.c
@@ -70,7 +70,8 @@ static void cdinittable(cdCanvas* canvas)
 static cdContext cdCairoSVGContext =
 {
   CD_CAP_ALL & ~(CD_CAP_PLAY | CD_CAP_YAXIS | CD_CAP_REGION | CD_CAP_WRITEMODE | CD_CAP_PALETTE),
-  0,
+  0,  /* not a plus driver */
+  CD_CTX_FILE,
   cdcreatecanvas,  
   cdinittable,
   NULL,