From e962e1889909fd7c4e89b8f613d15457987bcbc6 Mon Sep 17 00:00:00 2001 From: Philip Chimento Date: Wed, 20 May 2009 23:10:48 +0000 Subject: [PATCH] - In the documentation, replaced by |[...]| for readability. - Removed mouse pointer from fig11.png. git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@58 ddfedd41-794f-dd11-ae45-00112f111e67 --- docs/reference/images/fig11.png | Bin 2753 -> 2050 bytes src/chimara-glk.c | 4 ++-- src/doc.c | 40 ++++++++++++++------------------ src/main.c | 2 +- src/stream.c | 8 +++---- src/window.c | 9 ++----- 6 files changed, 27 insertions(+), 36 deletions(-) diff --git a/docs/reference/images/fig11.png b/docs/reference/images/fig11.png index 04baff63bf14a9a2464806e16da08f45c639d501..b763c700630dd2a3adfcaf1db89732f88b96aa2a 100644 GIT binary patch literal 2050 zcmc&#dr%Sv7^k^SRzu^wEHicKHs&$2yfnR1oA|ag@d07rqtMQ`LMkelS(&SJcbYFi zZyMs1@P(!`vHG>amiBsNZD?igHE^kA%*f_t<&3lRHcqUV9|v^qkk`DTk@%K9up?sgqYKJpL%$Z3-6eNe5Gi_Jne% zDY)O-1L+C83H-a0zTm?p4_#~FMw$5BU)9jUC^{LC?csA)od}{t6JF6QaEqT;FCJif@~Lv?ypi8 zXIaB7LhTszQ%wmor;h#-odiSLeXg{^a5%xTN|L%loTf^hD5gR8IzBgzT%Y*z;Ntn%`+rH2a3Z)oevm9u@?Hr#W1 z=6H31!7+L6iZNLn!ew;@%a+XuyfZBVXqAKCxPTd0|kvE3Vyy|E{_~LU`K)A9BphYZ^#7 z9{Z*{Bh7Xp|Fj__BU}UK6N;^bziJQ~dWJnaVUkiFv@yfKL@To?X>oOPUQGDP3u*I4 z)U99T#ergGF=`kxg6fVQpfDfy?d>B*{eu2Pn!YyXHM2~G#gX9VZrL;)_&O?^Ov6ACz$_P?hMm-DcOOzs2vDEkmThCK9SAY zC{d$wef^emlR$RoRMm<2PLwTH`FbMG(nzJW+~g^0Hbq5aW;aPHEiW=l#_$)M_P*_X z{&7(&%Go5mV^S*##-$2CimjosI4OHuytft=IobZqA36WhngI_~>(VwCtX3$iUHKt} zP@yB?w$ZRFKkKv{gYq}CbPiYkp!$Nb`g&^+Mk{0XAP}y1U4b$sh)R-I8I+t;b4O`q z&yz%OB}Mh(cg@L0sQj}by%Lg)$#zFw!iMDtZ?-pK)XLgQA z;0|A4IO&gxT-Yg_Dtu&MFK(NI-6zgBi3xdmQ3G|~dv}7=$oYvQmvrh3Nu)nvBjP@S zO#=aCpi0sJB*2!A+4P!#2`{&bFY8P+{AY<(s)4s)?HtxPid#mgr zSn;YI6LgySx13_fn%tP}*;0C(o%XSfJEx&POx~Y)&F%Dd$>Mazx_9rD{Qo)M>Tv79_1wx0i*qsO+WrCk#x@{oC{&Wz S1=-Snae$v!peNHK>dJ3gwTXuS literal 2753 zcmc&$X;>0i7q*&=D6>T^Q^(4!acMKdWP~(Z%(VnVOHCayDO5xtF=1RA*X%Jf7c|=} zMMfV#w^A(4$k41-uK*_?(KO-3%DDo zp`oGWde-HF+P>4!SQ7|XtKNCVFig~D9oE?u1^@tfLa%Z4Q9t$+BGxAg8A}L`3DXFV zj6#RmU_)cV!XmL(qhclN+8`PlK$xqG6YNIGr?G3-FUj;7U#6GvhA%yNrYKa=G5xh` zsz=h9u(uBAu~P$l>Z`X1mk2OExj!E>JF``1m;2_l6Is{np28pcfH1R~&L@39=ejZ) z5`Qv!z{VFf9$)8d}8Woe46nl9OiIZ~Ka9=Jpg z+OIRh<8=t%4OMI7@OX&w+W;Dkris%!gx>pM^{)Hi3Uk;ki2|vYSwZ73VQs-LY;3Fi zFQvfCLi*lNr{vij$dxtq@YecmY@KYg@W=kQHYh-<85Nq>U=u`dX>0@)Fm*FKFFc2( zu0hn!`B)dBP!R+J|Fkn(R>t3#`Lj7TzSL!%^ro%}YGIE>TDw+9hjM4oO?W=18ffL~ zK)FXUi@ho6ot7e};+maFN9R8L;c{6Z<@Xr-*H7_~LtJiicyDPlcKWU8O9m&Md%a<$ zgF`292HO_z^b}-+FYKk(-ag&)%Pn?a-<^Y-w-^$^(9wckt%7skFZ>d2MxK11kDn;9 zC#zPzIszCNOVZ#QUxuq}F-Q38^nJ=KDY>#TU#m!>$j+R)l+vOC*+dpgWA|E%fzcxwhm2d*E?t{Mvf z7bAN|)t7Ad$teRxd74Y*nFr}GYrW7~#IHYlnQo_vPw(4y9*&%Hzv=r99{kA?YL(R) z;^^p@oSamay8Dt%cNe;}`GVeDn2ni9e(a4_3|fzh)@(UMBYr_Q`^ry{o;FoFg(+w)jzC`oYS!XP#c6O_nJ?1v@3x zTq&J4lJ=TfBTQrF8%I*sZ){Kc%fH77k-NwG>{dNfz^3g##?AM_#FDYr^Y)$tt{_cE zx9q*t#R2J?5xR3%x2AmTTSek!mS}K$I}y4VIgCb5mvI&pomGU{5}y@0A@V-A zGRd`^?qdO@j6!r1KE2TK#w6|cib|stxSybkGY=_o>$w!~iA^q~)Xd4BiM~PVoEMA)_N4jo$}$_< zIwNtTCg`HgUMi4(<77#ql^$W=TM>@-QbUzUrmTJx-njP zz}CQMwBb5ebjFx)GDo6I8(kR*0$Fdl`kx}^~$WBRJyimd3utl|T9b)ZrNPvSwO zrED9r2Or>}ke{p;P=MpQf@|m59-aGPT>3xI_a93B z;r{F09%L1C!`x=8zX|GLJ3QEdLQ@$&i`XGCtqD;J@*mRtU_JhuNGzlIR`cfmU_FYm zIy<1X!|ArKZHc?N?Si)hWy^1OXFD*4wwGFoxbIIu4#UbtXxr!B#Ir3*PJEDRc|||b z6J(?w)|fMZs-zeMU9!5ED?v9;hyfgb-JivKVGaTvxKid4R`&=sh!G`BrDR%JWRT8UPEt-wQ+>sLqW9ofl(i3s*CJ2^N zm@wJk;dI-_V4surp@e*bf9S)m+W~cx&&#L|d!NOjHU)d2=JCmXn9nDsz6S&}{@GTO zDP;>g(gHFUY6jPn=|LmLq(0Ga6LU;#Q=b z)%m}fr?rQw{hA_+vo(mD7OJtWNs;ZH(8S;O8>a01w#V-Gnx~bp8;YTPaksV7&ok9H zt4Hy8i0X%(VDx(j$-jr=WriPmuPR1E+m3@?Jx8tY1zPPQY+z#A(+9hA^6uTlbgsV` z)pRv7D~!~V-V5}rwcNG1q`$gOwe)Xx`v>H9G5`5JvW{K04wt6;w+HKs@tia@iG7>R RRewS?Tu*tr(44O%{TGlP%yIw# diff --git a/src/chimara-glk.c b/src/chimara-glk.c index 3e2dabe..7ad1f81 100644 --- a/src/chimara-glk.c +++ b/src/chimara-glk.c @@ -27,11 +27,11 @@ * On Linux systems, this is a file with a name like * plugin.so. For portability, you can use libtool and * automake: - * + * |[ * pkglib_LTLIBRARIES = plugin.la * plugin_la_SOURCES = plugin.c foo.c bar.c * plugin_la_LDFLAGS = -module -shared -avoid-version -export-symbols-regex "^glk_main$$" - * + * ]| * This will produce plugin.la which is a text file * containing the correct plugin file to open (see the relevant section of the * * For each class of opaque objects, there is an iterate function, which you can * use to obtain a list of all existing objects of that class. It takes the form - * + * |[ * CLASSid_t glk_CLASS_iterate(CLASSid_t obj, #glui32 *rockptr); - * + * ]| * ...where CLASS represents one of the * opaque object classes. * @@ -202,13 +202,13 @@ * * * You usually use this as follows: - * + * |[ * obj = glk_CLASS_iterate(NULL, NULL); * while (obj) { * /* ...do something with obj... */ * obj = glk_CLASS_iterate(obj, NULL); * } - * + * ]| * * * If you create or destroy objects inside this loop, obviously, the results are @@ -772,10 +772,10 @@ * * For an example of the gestalt mechanism, consider the selector * #gestalt_Version. If you do - * + * |[ * #glui32 res; * res = #glk_gestalt(#gestalt_Version, 0); - * + * ]| * res will be set to a 32-bit number which encodes the version of * the Glk spec which the library implements. The upper 16 bits stores the major * version number; the next 8 bits stores the minor version number; the low 8 @@ -788,10 +788,10 @@ * The current Glk specification version is 0.7.0, so this selector will return * 0x00000700. * - * + * |[ * #glui32 res; * res = #glk_gestalt_ext(#gestalt_Version, 0, NULL, 0); - * + * ]| * does exactly the same thing. Note that, in either case, the second argument * is not used; so you should always pass 0 to avoid future surprises. */ @@ -801,10 +801,10 @@ * * If you set ch to a character code, or a special code (from * 0xFFFFFFFF down), and call - * + * |[ * #glui32 res; * res = #glk_gestalt(#gestalt_CharInput, ch); - * + * ]| * then res will be %TRUE (1) if that character can be typed by * the player in character input, and %FALSE (0) if not. See Character Input. @@ -814,10 +814,10 @@ * gestalt_LineInput: * * If you set ch to a character code, and call - * + * |[ * #glui32 res; * res = #glk_gestalt(#gestalt_LineInput, ch); - * + * ]| * then res will be %TRUE (1) if that character can be typed by the * player in line input, and %FALSE (0) if not. Note that if ch is * a nonprintable Latin-1 character (0 to 31, 127 to 159), then this is @@ -829,10 +829,10 @@ * gestalt_CharOutput: * * If you set ch to a character code (Latin-1 or higher), and call - * + * |[ * #glui32 res, len; * res = #glk_gestalt_ext(#gestalt_CharOutput, ch, &len, 1); - * + * ]| * then res will be one of #gestalt_CharOutput_CannotPrint, * #gestalt_CharOutput_ExactPrint, or #gestalt_CharOutput_ApproxPrint (see * below.) @@ -859,15 +859,11 @@ * Make sure you do not get confused by signed byte values. If you set a * char variable ch to 0xFE, the * small-thorn character (þ), and then call - * - * res = #glk_gestalt(#gestalt_CharOutput, ch); - * + * |[ res = #glk_gestalt(#gestalt_CharOutput, ch); ]| * then (by the definition of C/C++) ch will be sign-extended to * 0xFFFFFFFE, which is not a legitimate character, even in Unicode. You * should write - * - * res = #glk_gestalt(#gestalt_CharOutput, (unsigned char)ch); - * + * |[ res = #glk_gestalt(#gestalt_CharOutput, (unsigned char)ch); ]| * instead. * * @@ -915,10 +911,10 @@ * The basic text functions will be available in every Glk library. The Unicode * functions may or may not be available. Before calling them, you should use * the following gestalt selector: - * + * |[ * glui32 res; * res = #glk_gestalt(#gestalt_Unicode, 0); - * + * ]| * * This returns 1 if the Unicode functions are available. If it returns 0, you * should not try to call them. They may print nothing, print gibberish, or diff --git a/src/main.c b/src/main.c index 496f1b2..c34e4c5 100644 --- a/src/main.c +++ b/src/main.c @@ -118,7 +118,7 @@ main(int argc, char *argv[]) g_object_unref( G_OBJECT(builder) ); - if( !chimara_glk_run(CHIMARA_GLK(glk), ".libs/splittest.so", &error) ) { + if( !chimara_glk_run(CHIMARA_GLK(glk), ".libs/first.so", &error) ) { error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: "); return 1; } diff --git a/src/stream.c b/src/stream.c index 358d06b..42d77ba 100644 --- a/src/stream.c +++ b/src/stream.c @@ -154,10 +154,10 @@ glk_put_char_uni(glui32 ch) * * Prints a null-terminated string to the current stream. It is exactly * equivalent to - * + * |[ * for (ptr = @s; *ptr; ptr++) * #glk_put_char(*ptr); - * + * ]| * However, it may be more efficient. */ void @@ -189,10 +189,10 @@ glk_put_string_uni(glui32 *s) * * Prints a block of characters to the current stream. It is exactly equivalent * to: - * + * |[ * for (i = 0; i < @len; i++) * #glk_put_char(@buf[i]); - * + * ]| * However, it may be more efficient. */ void diff --git a/src/window.c b/src/window.c index cd0961c..719816f 100644 --- a/src/window.c +++ b/src/window.c @@ -211,15 +211,11 @@ glk_window_get_root() * * So to create a text buffer window which takes the top 40% of the original * window's space, you would execute - * - * newwin = #glk_window_open(win, #winmethod_Above | #winmethod_Proportional, 40, #wintype_TextBuffer, 0); - * + * |[ newwin = #glk_window_open(win, #winmethod_Above | #winmethod_Proportional, 40, #wintype_TextBuffer, 0); ]| * * To create a text grid which is always five lines high, at the bottom of the * original window, you would do - * - * newwin = #glk_window_open(win, #winmethod_Below | #winmethod_Fixed, 5, #wintype_TextGrid, 0); - * + * |[ newwin = #glk_window_open(win, #winmethod_Below | #winmethod_Fixed, 5, #wintype_TextGrid, 0); ]| * * Note that the meaning of the @size argument depends on the @method argument. * If the method is #winmethod_Fixed, it also depends on the @wintype argument. @@ -563,7 +559,6 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, /* Set the window as a child of the Glk widget */ gtk_widget_set_parent(win->frame, GTK_WIDGET(glk_data->self)); gtk_widget_queue_resize(GTK_WIDGET(glk_data->self)); - gdk_window_process_all_updates(); gdk_threads_leave(); -- 2.30.2