diff --git a/Makefile.am b/Makefile.am index f26c0a2e..c76b1e3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,7 @@ config-paths.h: Makefile ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = wrlib WINGs src util po WindowMaker WPrefs.app doc +SUBDIRS = wrlib WINGs src util po WindowMaker wmlib WPrefs.app doc EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N INSTALL \ INSTALL-WMAKER README.definable-cursor \ diff --git a/configure.ac b/configure.ac index 7ec0f696..9cf51077 100644 --- a/configure.ac +++ b/configure.ac @@ -636,6 +636,9 @@ if test "$xpm" = yes; then fi fi +# for wmlib +AC_SUBST(XCFLAGS) +# for test AC_SUBST(XLFLAGS) AC_SUBST(XLIBS) AC_SUBST(X_EXTRA_LIBS) @@ -862,11 +865,11 @@ fi gl_LD_VERSION_SCRIPT -AC_OUTPUT(Makefile po/Makefile util/Makefile util/po/Makefile \ +AC_OUTPUT(Makefile po/Makefile util/Makefile util/po/Makefile test/Makefile \ WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile \ WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile \ WINGs/Extras/Makefile WINGs/po/Makefile \ - wrlib/Makefile wrlib/tests/Makefile \ + wmlib/Makefile wrlib/Makefile wrlib/tests/Makefile \ src/Makefile src/wconfig.h \ doc/Makefile doc/sk/Makefile doc/cs/Makefile \ doc/ru/Makefile \ diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 00000000..b1fd47a4 --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,25 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = no-dependencies + +EXTRA_DIST = notest.c + +noinst_PROGRAMS = wtest + +wtest_SOURCES = wtest.c + +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ + + +INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib + +LIBTOOL = $(QUIET) $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG) + +.c.o: + $(QUIET)$(COMPILE) -c $< + +.c.obj: + $(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: + $(QUIET)$(LTCOMPILE) -c -o $@ $< diff --git a/test/notest.c b/test/notest.c new file mode 100644 index 00000000..e3fdc166 --- /dev/null +++ b/test/notest.c @@ -0,0 +1,122 @@ +/* quick and dirty test application that demonstrates: Notify grabbing + * + * TODO: remake + */ + +#include +#include +#include +#include +#include + +Display *dpy; +Window leader; +WMAppContext *app; +Atom delete_win; +Atom prots[6]; +XWMHints *hints; +WMMenu *menu; + +static void quit(void *foo, int item, Time time) +{ + exit(0); +} + +static void hide(void *foo, int item, Time time) +{ + WMHideApplication(app); +} + +int notify_print(int id, XEvent * event, void *data) +{ + printf("Got notification 0x%x, window 0x%lx, data '%s'\n", id, event->xclient.data.l[1], (char *)data); + return True; +} + +static void newwin(void *foo, int item, Time time) +{ + Window win; + XClassHint classhint; + char title[100]; + + win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 0, 0, 200, 100, 0, 0, 0); + prots[0] = delete_win; + XSetWMProtocols(dpy, win, prots, 1); + sprintf(title, "Notify Test Window"); + XStoreName(dpy, win, title); + + /* set class hint */ + classhint.res_name = "notest"; + classhint.res_class = "Notest"; + XSetClassHint(dpy, win, &classhint); + + hints = XAllocWMHints(); + /* set window group leader */ + hints->window_group = leader; + hints->flags = WindowGroupHint; + XSetWMHints(dpy, win, hints); + + WMAppAddWindow(app, win); + XMapWindow(dpy, win); +} + +int main(int argc, char **argv) +{ + XClassHint classhint; + + dpy = XOpenDisplay(""); + if (!dpy) { + puts("could not open display!"); + exit(1); + } + delete_win = XInternAtom(dpy, "WM_DELETE_WINDOW", False); + + leader = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10, 10, 10, 10, 0, 0, 0); + /* set class hint */ + classhint.res_name = "notest"; + classhint.res_class = "Notest"; + XSetClassHint(dpy, leader, &classhint); + + /* set window group leader to self */ + hints = XAllocWMHints(); + hints->window_group = leader; + hints->flags = WindowGroupHint; + XSetWMHints(dpy, leader, hints); + + /* create app context */ + app = WMAppCreateWithMain(dpy, DefaultScreen(dpy), leader); + menu = WMMenuCreate(app, "Notify Test Menu"); + WMMenuAddItem(menu, "Hide", (WMMenuAction) hide, NULL, NULL, NULL); + WMMenuAddItem(menu, "Quit", (WMMenuAction) quit, NULL, NULL, NULL); + + WMAppSetMainMenu(app, menu); + WMRealizeMenus(app); + + /* Get some WindowMaker notifications */ + WMNotifySet(app, WMN_APP_START, notify_print, (void *)"App start"); + WMNotifySet(app, WMN_APP_EXIT, notify_print, (void *)"App end"); + WMNotifySet(app, WMN_WIN_FOCUS, notify_print, (void *)"Focus in"); + WMNotifySet(app, WMN_WIN_UNFOCUS, notify_print, (void *)"Focus out"); + WMNotifySet(app, WMN_NOTIFY_ALL, notify_print, (void *)"Unknown type"); + WMNotifyMaskUpdate(app); /* Mask isn't actually set till we do this */ + + /* set command to use to startup this */ + XSetCommand(dpy, leader, argv, argc); + + /* create first window */ + newwin(NULL, 0, 0); + + XFlush(dpy); + while (1) { + XEvent ev; + XNextEvent(dpy, &ev); + if (ev.type == ClientMessage) { + if (ev.xclient.data.l[0] == delete_win) { + XDestroyWindow(dpy, ev.xclient.window); + break; + } + } + WMProcessEvent(app, &ev); + } + exit(0); +} diff --git a/test/wtest.c b/test/wtest.c new file mode 100644 index 00000000..8490e9ca --- /dev/null +++ b/test/wtest.c @@ -0,0 +1,159 @@ +/* quick and dirty test application that demonstrates: application hiding, + * application defined titlebar button images, application defined + * titlebar button actions, application menus, docking and + * window manager commands + * + * Note that the windows don't have a window command menu. + * + * TODO: remake + */ + +#include +#include +#include +#include +#include +#include + +static char bits[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; + +static char mbits[] = { + 0xff, 0x03, 0xff, 0x01, 0xff, 0x00, 0x7f, 0x00, 0x3f, 0x00, 0x1f, 0x00, + 0x0f, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00 +}; + +Display *dpy; +Window leader; +WMAppContext *app; + +static void callback(void *foo, int item, Time time) +{ + printf("pushed item %i\n", item); +} + +static void quit(void *foo, int item, Time time) +{ + exit(0); +} + +static void hide(void *foo, int item, Time time) +{ + WMHideApplication(app); +} + +Atom delete_win, miniaturize_win; +Atom prots[6]; +GNUstepWMAttributes attr; +XWMHints *hints; +WMMenu *menu; +WMMenu *submenu; +int wincount = 0; + +static void newwin(void *foo, int item, Time time) +{ + Window win; + XClassHint classhint; + char title[100]; + + wincount++; + win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10 * wincount, 10 * wincount, 200, 100, 0, 0, 0); + prots[0] = delete_win; + prots[1] = miniaturize_win; + XSetWMProtocols(dpy, win, prots, 2); + sprintf(title, "Test Window %i", wincount); + XStoreName(dpy, win, title); + + /* set class hint */ + classhint.res_name = "test"; + classhint.res_class = "Test"; + XSetClassHint(dpy, win, &classhint); + + /* set WindowMaker hints */ + attr.flags = GSMiniaturizePixmapAttr | GSMiniaturizeMaskAttr; + attr.miniaturize_pixmap = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), bits, 10, 10); + + attr.miniaturize_mask = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), mbits, 10, 10); + /* + attr.flags |= GSWindowStyleAttr; + attr.window_style = NSTitledWindowMask|NSClosableWindowMask; + */ + + WMSetWindowAttributes(dpy, win, &attr); + + hints = XAllocWMHints(); + /* set window group leader */ + hints->window_group = leader; + hints->flags = WindowGroupHint; + XSetWMHints(dpy, win, hints); + + WMAppAddWindow(app, win); + XMapWindow(dpy, win); +} + +int main(int argc, char **argv) +{ + XClassHint classhint; + + dpy = XOpenDisplay(""); + if (!dpy) { + puts("could not open display!"); + exit(1); + } + delete_win = XInternAtom(dpy, "WM_DELETE_WINDOW", False); + miniaturize_win = XInternAtom(dpy, "_GNUSTEP_WM_MINIATURIZE_WINDOW", False); + + leader = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10, 10, 10, 10, 0, 0, 0); + /* set class hint */ + classhint.res_name = "test"; + classhint.res_class = "Test"; + XSetClassHint(dpy, leader, &classhint); + + /* set window group leader to self */ + hints = XAllocWMHints(); + hints->window_group = leader; + hints->flags = WindowGroupHint; + XSetWMHints(dpy, leader, hints); + + /* create app context */ + app = WMAppCreateWithMain(dpy, DefaultScreen(dpy), leader); + menu = WMMenuCreate(app, "Test Menu"); + submenu = WMMenuCreate(app, "File"); + WMMenuAddSubmenu(menu, "File", submenu); + + WMMenuAddItem(menu, "Hide", (WMMenuAction) hide, NULL, NULL, NULL); + WMMenuAddItem(menu, "Quit", (WMMenuAction) quit, NULL, NULL, NULL); + WMMenuAddItem(submenu, "New", (WMMenuAction) newwin, NULL, NULL, NULL); + WMMenuAddItem(submenu, "Open", (WMMenuAction) callback, NULL, NULL, NULL); + WMMenuAddItem(submenu, "Save", (WMMenuAction) callback, NULL, NULL, NULL); + WMMenuAddItem(submenu, "Save As...", (WMMenuAction) callback, NULL, NULL, NULL); + + WMAppSetMainMenu(app, menu); + + WMRealizeMenus(app); + + /* set command to use to startup this */ + XSetCommand(dpy, leader, argv, argc); + + /* create first window */ + newwin(NULL, 0, 0); + + XFlush(dpy); + puts("Run xprop on the test window to see the properties defined"); + while (wincount > 0) { + XEvent ev; + XNextEvent(dpy, &ev); + if (ev.type == ClientMessage) { + if (ev.xclient.data.l[0] == delete_win) { + XDestroyWindow(dpy, ev.xclient.window); + wincount--; + } else if (ev.xclient.data.l[0] == miniaturize_win) { + puts("You've pushed the maximize window button"); + } + } + WMProcessEvent(app, &ev); + } + exit(0); +} diff --git a/wmlib/COPYING.LIB b/wmlib/COPYING.LIB new file mode 100644 index 00000000..eb685a5e --- /dev/null +++ b/wmlib/COPYING.LIB @@ -0,0 +1,481 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am new file mode 100644 index 00000000..0f8201f0 --- /dev/null +++ b/wmlib/Makefile.am @@ -0,0 +1,31 @@ + +AUTOMAKE_OPTIONS = no-dependencies + +libWMaker_la_LDFLAGS = -version-info 1:1:0 +lib_LTLIBRARIES = libWMaker.la + +include_HEADERS = WMaker.h + +INCLUDES = $(DFLAGS) @XCFLAGS@ + +libWMaker_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS) + +libWMaker_la_SOURCES = \ + menu.c \ + app.c \ + event.c \ + command.c \ + app.h \ + menu.h + +DISTCLEANFILES = wmlib.pc + +install-exec-local: + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig + @list='wmlib.pc'; for p in $$list; do \ + if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \ + else :; fi; \ + done diff --git a/wmlib/WMaker.h b/wmlib/WMaker.h new file mode 100644 index 00000000..23def87d --- /dev/null +++ b/wmlib/WMaker.h @@ -0,0 +1,161 @@ +/* + * WindowMaker interface definitions + * + * Copyright (C) 1997-2003 Alfredo K. Kojima + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef _WMLIB_H_ +#define _WMLIB_H_ + +/* the definitions in this file can change at any time. WINGs has more + * stable definitions */ + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +typedef struct { + CARD32 flags; + CARD32 window_style; + CARD32 window_level; + CARD32 reserved; + Pixmap miniaturize_pixmap; /* pixmap for miniaturize button */ + Pixmap close_pixmap; /* pixmap for close button */ + Pixmap miniaturize_mask; /* miniaturize pixmap mask */ + Pixmap close_mask; /* close pixmap mask */ + CARD32 extra_flags; +} GNUstepWMAttributes; + +#define GSWindowStyleAttr (1<<0) +#define GSWindowLevelAttr (1<<1) +#define GSMiniaturizePixmapAttr (1<<3) +#define GSClosePixmapAttr (1<<4) +#define GSMiniaturizeMaskAttr (1<<5) +#define GSCloseMaskAttr (1<<6) +#define GSExtraFlagsAttr (1<<7) + + + +#define GSClientResizeFlag (1<<0) +#define GSFullKeyboardEventsFlag (1<<1) +#define GSMenuWindowFlag (1<<2) +#define GSIconWindowFlag (1<<3) +#define GSSkipWindowListFlag (1<<4) +#define GSNoApplicationIconFlag (1<<5) +#define GSDarkGrayTitlebarFlag (1<<8) + + +#define WMFHideOtherApplications 10 +#define WMFHideApplication 12 + + +#ifndef _DEFINED_GNUSTEP_WINDOW_INFO +#define _DEFINED_GNUSTEP_WINDOW_INFO +/* + * Window levels are taken from GNUstep (gui/AppKit/NSWindow.h) + * NSDesktopWindowLevel intended to be the level at which things + * on the desktop sit ... so you should be able + * to put a desktop background just below it. + * + * Applications are actually permitted to use any value in the + * range INT_MIN+1 to INT_MAX + */ +enum { + WMDesktopWindowLevel = -1000, /* GNUstep addition */ + WMNormalWindowLevel = 0, + WMFloatingWindowLevel = 3, + WMSubmenuWindowLevel = 3, + WMTornOffMenuWindowLevel = 3, + WMMainMenuWindowLevel = 20, + WMDockWindowLevel = 21, /* Deprecated - use NSStatusWindowLevel */ + WMStatusWindowLevel = 21, + WMModalPanelWindowLevel = 100, + WMPopUpMenuWindowLevel = 101, + WMScreenSaverWindowLevel = 1000 +}; + + +/* window attributes */ +enum { + WMBorderlessWindowMask = 0, + WMTitledWindowMask = 1, + WMClosableWindowMask = 2, + WMMiniaturizableWindowMask = 4, + WMResizableWindowMask = 8, + WMIconWindowMask = 64, + WMMiniWindowMask = 128 +}; +#endif + +typedef struct _wmAppContext WMAppContext; + +typedef struct _wmMenu WMMenu; + +typedef void (*WMMenuAction)(void *clientdata, int code, Time timestamp); + +typedef void (*WMFreeFunction)(void *clientdata); + +int WMProcessEvent(WMAppContext *app, XEvent *event); + + +WMAppContext *WMAppCreateWithMain(Display *display, int screen_number, + Window main_window); + +WMAppContext *WMAppCreate(Display *display, int screen_number); + +int WMAppAddWindow(WMAppContext *app, Window window); + +int WMAppSetMainMenu(WMAppContext *app, WMMenu *menu); + + +int WMRealizeMenus(WMAppContext *app); + + +void WMSetWindowAttributes(Display *dpy, Window window, + GNUstepWMAttributes *attributes); + + +void WMHideApplication(WMAppContext *app); +void WMHideOthers(WMAppContext *app); + +/* + * WARNING: the menu related functions might be removed in the future. + */ +WMMenu *WMMenuCreate(WMAppContext *app, char *title); + +int WMMenuAddItem(WMMenu *menu, char *text, WMMenuAction action, + void *clientData, WMFreeFunction freedata, char *rtext); + +int WMMenuInsertItem(WMMenu *menu, int index, char *text, + WMMenuAction *action, char *rtext); + +int WMMenuRemoveItem(WMMenu *menu, int index); + +int WMMenuAddSubmenu(WMMenu *menu, char *title, WMMenu *submenu); + +void WMMenuSetEnabled(WMMenu *menu, int index, int enabled); + +void WMMenuDestroy(WMMenu *menu, int submenus); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif diff --git a/wmlib/app.c b/wmlib/app.c new file mode 100644 index 00000000..2389df3e --- /dev/null +++ b/wmlib/app.c @@ -0,0 +1,79 @@ +/* app.c - application context stuff + * + * WMlib - WindowMaker application programming interface + * + * Copyright (C) 1997-2003 Alfredo K. Kojima + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + +#include "WMaker.h" +#include "app.h" + +WMAppContext *WMAppCreateWithMain(Display * display, int screen_number, Window main_window) +{ + wmAppContext *ctx; + + ctx = malloc(sizeof(wmAppContext)); + if (!ctx) + return NULL; + + ctx->dpy = display; + ctx->screen_number = screen_number; + ctx->our_leader_hint = False; + ctx->main_window = main_window; + ctx->windows = malloc(sizeof(Window)); + if (!ctx->windows) { + free(ctx); + return NULL; + } + ctx->win_count = 1; + ctx->windows[0] = main_window; + + ctx->main_menu = NULL; + + ctx->last_menu_tag = 100; + + return ctx; +} + +int WMAppAddWindow(WMAppContext * app, Window window) +{ + Window *win; + + win = malloc(sizeof(Window) * (app->win_count + 1)); + if (!win) + return False; + + memcpy(win, app->windows, sizeof(Window) * app->win_count); + + free(app->windows); + + win[app->win_count] = window; + app->windows = win; + app->win_count++; + + return True; +} + +int WMAppSetMainMenu(WMAppContext * app, WMMenu * menu) +{ + app->main_menu = menu; + return True; +} diff --git a/wmlib/app.h b/wmlib/app.h new file mode 100644 index 00000000..3f38f1f0 --- /dev/null +++ b/wmlib/app.h @@ -0,0 +1,40 @@ +/* app.h - private declarations for application context + * + * WMlib - WindowMaker application programming interface + * + * Copyright (C) 1997-2003 Alfredo K. Kojima + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef _APP_H_ +#define _APP_H_ + +typedef struct _wmAppContext { + Display *dpy; + int screen_number; + + int our_leader_hint; /* if app leader hint was set by us */ + Window main_window; /* main window of the application */ + Window *windows; + int win_count; /* size of windows array */ + + WMMenu *main_menu; + + int last_menu_tag; +} wmAppContext; + +#endif + diff --git a/wmlib/command.c b/wmlib/command.c new file mode 100644 index 00000000..8c643d90 --- /dev/null +++ b/wmlib/command.c @@ -0,0 +1,74 @@ +/* command.c - WindowMaker commands + * + * WMlib - WindowMaker application programming interface + * + * Copyright (C) 1997-2003 Alfredo K. Kojima + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +#include "WMaker.h" +#include "app.h" + +static Atom getwmfunc(Display * dpy) +{ + return XInternAtom(dpy, "_WINDOWMAKER_WM_FUNCTION", False); +} + +void WMHideApplication(WMAppContext * app) +{ + XEvent event; + + event.xclient.type = ClientMessage; + event.xclient.message_type = getwmfunc(app->dpy); + event.xclient.format = 32; + event.xclient.display = app->dpy; + event.xclient.window = app->main_window; + event.xclient.data.l[0] = WMFHideApplication; + event.xclient.data.l[1] = 0; + event.xclient.data.l[2] = 0; + event.xclient.data.l[3] = 0; + XSendEvent(app->dpy, RootWindow(app->dpy, app->screen_number), False, + SubstructureNotifyMask | SubstructureRedirectMask, &event); +} + +void WMHideOthers(WMAppContext * app) +{ + XEvent event; + + event.xclient.type = ClientMessage; + event.xclient.message_type = getwmfunc(app->dpy); + event.xclient.format = 32; + event.xclient.display = app->dpy; + event.xclient.window = app->main_window; + event.xclient.data.l[0] = WMFHideOtherApplications; + event.xclient.data.l[1] = 0; + event.xclient.data.l[2] = 0; + event.xclient.data.l[3] = 0; + XSendEvent(app->dpy, RootWindow(app->dpy, app->screen_number), False, + SubstructureNotifyMask | SubstructureRedirectMask, &event); +} + +void WMSetWindowAttributes(Display * dpy, Window window, GNUstepWMAttributes * attributes) +{ + Atom atom; + + atom = XInternAtom(dpy, "_GNUSTEP_WM_ATTR", False); + XChangeProperty(dpy, window, atom, atom, 32, PropModeReplace, + (unsigned char *)attributes, sizeof(GNUstepWMAttributes) / sizeof(CARD32)); +} diff --git a/wmlib/event.c b/wmlib/event.c new file mode 100644 index 00000000..6caeb754 --- /dev/null +++ b/wmlib/event.c @@ -0,0 +1,86 @@ +/* event.c - WindowMaker event handler + * + * WMlib - WindowMaker application programming interface + * + * Copyright (C) 1997-2003 Alfredo K. Kojima + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include + +#include "WMaker.h" +#include "app.h" +#include "menu.h" + +static Atom _XA_WINDOWMAKER_MENU = 0; + +enum { + wmSelectItem = 1 +}; + +static wmMenuEntry *findEntry(WMMenu * menu, int tag) +{ + wmMenuEntry *entry = menu->first; + + while (entry) { + if (entry->tag == tag) { + return entry; + } + if (entry->cascade) { + wmMenuEntry *tmp; + tmp = findEntry(entry->cascade, tag); + if (tmp) + return tmp; + } + entry = entry->next; + } + return NULL; +} + +static void wmHandleMenuEvents(WMAppContext * app, XEvent * event) +{ + wmMenuEntry *entry; + + switch (event->xclient.data.l[1]) { + case wmSelectItem: + entry = findEntry(app->main_menu, event->xclient.data.l[2]); + if (entry && entry->callback) { + (*entry->callback) (entry->clientData, event->xclient.data.l[2], event->xclient.data.l[0]); + } + break; + } +} + +int WMProcessEvent(WMAppContext * app, XEvent * event) +{ + int proc = False; + if (!_XA_WINDOWMAKER_MENU) { + _XA_WINDOWMAKER_MENU = XInternAtom(app->dpy, "_WINDOWMAKER_MENU", False); + } + switch (event->type) { + case ClientMessage: + if (event->xclient.format == 32 + && event->xclient.message_type == _XA_WINDOWMAKER_MENU + && event->xclient.window == app->main_window) { + wmHandleMenuEvents(app, event); + proc = True; + } + } + return proc; +} diff --git a/wmlib/menu.c b/wmlib/menu.c new file mode 100644 index 00000000..46f6de18 --- /dev/null +++ b/wmlib/menu.c @@ -0,0 +1,238 @@ +/* menu.c - menu interface functions + * + * WMlib - WindowMaker application programming interface + * + * Copyright (C) 1997-2003 Alfredo K. Kojima + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include + +#include "WMaker.h" +#include "app.h" +#include "menu.h" + +WMMenu *WMMenuCreate(WMAppContext * app, char *title) +{ + wmMenu *menu; + + if (strlen(title) > 255) + return NULL; + + menu = malloc(sizeof(wmMenu)); + if (!menu) + return NULL; + + menu->appcontext = app; + menu->parent = NULL; + menu->title = title; + menu->entries = NULL; + menu->first = NULL; + + menu->realized = False; + menu->code = app->last_menu_tag++; + + menu->entryline = malloc(strlen(title) + 32); + menu->entryline2 = malloc(32); + if (!menu->entryline || !menu->entryline2) { + if (menu->entryline) + free(menu->entryline); + free(menu); + return NULL; + } + sprintf(menu->entryline, "%i %i %s", wmBeginMenu, menu->code, title); + sprintf(menu->entryline2, "%i %i", wmEndMenu, menu->code); + return menu; +} + +int +WMMenuAddItem(WMMenu * menu, char *text, WMMenuAction action, + void *clientData, WMFreeFunction freedata, char *rtext) +{ + wmMenuEntry *entry; + + /* max size of right side text */ + if (rtext && strlen(rtext) > 4) + return -1; + + /* max size of menu text */ + if (strlen(text) > 255) + return -1; + + entry = malloc(sizeof(wmMenuEntry)); + if (!entry) + return -1; + + entry->entryline = malloc(strlen(text) + 100); + if (!entry->entryline) { + free(menu); + return -1; + } + + if (menu->entries) + entry->order = menu->entries->order + 1; + else { + entry->order = 0; + menu->first = entry; + } + entry->next = NULL; + entry->prev = menu->entries; + if (menu->entries) + menu->entries->next = entry; + menu->entries = entry; + + entry->menu = menu; + entry->text = text; + entry->shortcut = rtext; + entry->callback = action; + entry->clientData = clientData; + entry->free = freedata; + entry->tag = menu->appcontext->last_menu_tag++; + entry->cascade = NULL; + entry->enabled = True; + + if (!rtext) + sprintf(entry->entryline, "%i %i %i %i %s", wmNormalItem, menu->code, entry->tag, True, text); + else + sprintf(entry->entryline, "%i %i %i %i %s %s", wmDoubleItem, + menu->code, entry->tag, True, rtext, text); + return entry->tag; +} + +int WMMenuAddSubmenu(WMMenu * menu, char *text, WMMenu * submenu) +{ + wmMenuEntry *entry; + + /* max size of menu text */ + if (strlen(text) > 255) + return -1; + + entry = malloc(sizeof(wmMenuEntry)); + if (!entry) + return -1; + + entry->entryline = malloc(strlen(text) + 100); + if (!entry->entryline) { + free(menu); + return -1; + } + + if (menu->entries) + entry->order = menu->entries->order + 1; + else { + entry->order = 0; + menu->first = entry; + } + entry->next = NULL; + entry->prev = menu->entries; + if (menu->entries) + menu->entries->next = entry; + menu->entries = entry; + entry->menu = menu; + entry->text = text; + entry->shortcut = NULL; + entry->callback = NULL; + entry->clientData = NULL; + entry->tag = menu->appcontext->last_menu_tag++; + entry->cascade = submenu; + entry->enabled = True; + + sprintf(entry->entryline, "%i %i %i %i %i %s", wmSubmenuItem, + menu->code, entry->tag, True, submenu->code, text); + return entry->tag; +} + +static int countItems(WMMenu * menu) +{ + wmMenuEntry *entry = menu->first; + int c; + + c = 1; + while (entry) { + c++; + if (entry->cascade) { + c += countItems(entry->cascade); + } + entry = entry->next; + } + c++; + return c; +} + +static void addItems(char **slist, int *index, WMMenu * menu) +{ + wmMenuEntry *entry = menu->first; + + slist[(*index)++] = menu->entryline; + while (entry) { + slist[(*index)++] = entry->entryline; + if (entry->cascade) { + addItems(slist, index, entry->cascade); + } + entry = entry->next; + } + slist[(*index)++] = menu->entryline2; +} + +static Atom getatom(Display * dpy) +{ + static Atom atom = 0; + + if (atom == 0) { + atom = XInternAtom(dpy, WMMENU_PROPNAME, False); + } + return atom; +} + +int WMRealizeMenus(WMAppContext * app) +{ + int i, count; + char **slist; + XTextProperty text_prop; + + if (!app->main_menu) + return False; + + /* first count how many menu items there are */ + count = countItems(app->main_menu); + if (count == 0) + return True; + + count++; + slist = malloc(count * sizeof(char *)); + if (!slist) { + return False; + } + + slist[0] = "WMMenu 0"; + i = 1; + addItems(slist, &i, app->main_menu); + + if (!XStringListToTextProperty(slist, i, &text_prop)) { + free(slist); + return False; + } + free(slist); + XSetTextProperty(app->dpy, app->main_window, &text_prop, getatom(app->dpy)); + + XFree(text_prop.value); + + return True; +} diff --git a/wmlib/menu.h b/wmlib/menu.h new file mode 100644 index 00000000..9163eac4 --- /dev/null +++ b/wmlib/menu.h @@ -0,0 +1,75 @@ +/* menu.h - private menu declarations + * + * WMlib - WindowMaker application programming interface + * + * Copyright (C) 1997-2003 Alfredo K. Kojima + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef _MENU_H_ +#define _MENU_H_ + +#define WMMENU_PROPNAME "_WINDOWMAKER_MENU" + +typedef struct _wmMenuEntry { + struct _wmMenuEntry *next; + struct _wmMenuEntry *prev; + + struct _wmMenu *menu; /* menu for the entry */ + + char *text; /* entry text */ + char *shortcut; + WMMenuAction callback; + void *clientData; /* data to pass to callback */ + WMFreeFunction free; /* function to free clientData */ + int tag; /* unique entry ID */ + + struct _wmMenu *cascade; /* cascade menu */ + short order; + short enabled; /* entry is selectable */ + + char *entryline; +} wmMenuEntry; + + +typedef struct _wmMenu { + wmAppContext *appcontext; + int code; + + struct _wmMenu *parent; + + char *title; /* menu title */ + wmMenuEntry *entries; /* list of entries */ + wmMenuEntry *first; /* first of list of entries */ + int realized; + + char *entryline; + char *entryline2; +} wmMenu; + + + +enum { + wmBeginMenu = 1, + wmEndMenu = 2, + wmNormalItem = 10, + wmDoubleItem = 11, + wmSubmenuItem = 12 +}; + + +#endif +