[BACK]Return to patch-ai CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / graphics / xpaint / patches
File: [cvs.NetBSD.org] / pkgsrc / graphics / xpaint / patches / Attic / patch-ai (download)

Revision 1.2, Thu Jul 14 09:52:59 2011 UTC (12 years, 9 months ago) by shattered
Branch: MAIN
CVS Tags: pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3
Changes since 1.1: +38 -4 lines 

PR/38129 -- font selection menu is populated in graphics.c, so patch it too

$NetBSD: patch-ai,v 1.2 2011/07/14 09:52:59 shattered Exp $

--- graphic.c.orig	2005-09-02 21:31:56.000000000 +0000
+++ graphic.c
@@ -33,7 +33,7 @@
 #include "xaw_incdir/SmeBSB.h"
 #include "xaw_incdir/Paned.h"
 
-//#include <X11/keysym.h>
+/*#include <X11/keysym.h>*/
 
 #include <xpm.h>
 #ifdef HAVE_COLTOG
@@ -119,7 +119,8 @@ static char *fontNames[] = {
 "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*", /* Lucida 12 */
 "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*", /* Helvetica 12 */
 "-*-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*", /* Helvetica Bold 12 */
-"-*-fixed-medium-r-normal-*-*-120-*-*-m-*-*-*", /* Fixed 12 */
+"-*-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1", /* Sony 16 */
+"-*-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1", /* Sony 24 */
 "-*-courier-medium-r-normal-*-*-120-*-*-m-*-*-*" /* Courier 12 */
 };
 
@@ -262,8 +263,9 @@ static PaintMenuItem fontMenu[] =
     MI_FLAGCB("Lucida 12", MF_CHECK | MF_GROUP1, fontSet, 6),
     MI_FLAGCB("Helvetica 12", MF_CHECK | MF_GROUP1, fontSet, 7),
     MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1, fontSet, 8),
-    MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1, fontSet, 9),
-    MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 10),
+    MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1, fontSet, 9),
+    MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1, fontSet, 10),
+    MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 11),
     MI_SEPARATOR(),
     MI_FLAGCB("select", MF_CHECK | MF_GROUP1, fontSet, NULL),
 };
@@ -515,8 +517,9 @@ static PaintMenuItem popupFontMenu[] =
     MI_FLAGCB("Lucida 12", MF_CHECK | MF_GROUP1, fontSet, 6),
     MI_FLAGCB("Helvetica 12", MF_CHECK | MF_GROUP1, fontSet, 7),
     MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1, fontSet, 8),
-    MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1, fontSet, 9),
-    MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 10),
+    MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1, fontSet, 9),
+    MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1, fontSet, 10),
+    MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 11),
     MI_SEPARATOR(),
     MI_FLAGCB("select", MF_CHECK | MF_GROUP1, fontSet, NULL),
 };
@@ -3606,7 +3609,7 @@ graphicCreate(Widget shell, int width, i
 #endif
     }
     }
-    //checkPaintDimension(shell);
+    /*checkPaintDimension(shell);*/
 
     return paint;
 }
@@ -4145,7 +4148,7 @@ stdPasteCB(Widget paint, XtPointer infoA
 
         PwRegionSet(paint, &rect, pix, newMask);
     }
-    // setToSelectOp();
+    /* setToSelectOp();*/
 }
 
 void 
@@ -4282,7 +4285,7 @@ StdSelectAllCallback(Widget w, XtPointer
     rect.height = dh;
 
     PwRegionSet(paint, &rect, None, None);
-    // setToSelectOp();   
+    /* setToSelectOp();   */
 }
 
 void