[Pkg-wmaker-commits] [wmcliphist] 11/49: wmcliphist: Remove foodock library; use GTK dockapp code from wmpasman.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 18 01:51:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmcliphist.
commit 72193ea4f9e5c79e1cbe9d2bb8fec945bf293c6e
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sat Nov 22 20:48:43 2014 -0600
wmcliphist: Remove foodock library; use GTK dockapp code from wmpasman.
---
Makefile | 8 +-
foodock/LICENSE | 481 ------------------------------------------------------
foodock/Makefile | 23 ---
foodock/README | 71 --------
foodock/VERSION | 1 -
foodock/example.c | 39 -----
foodock/foodock.c | 85 ----------
foodock/foodock.h | 43 -----
wmcliphist.c | 57 +++++--
wmcliphist.h | 2 -
10 files changed, 48 insertions(+), 762 deletions(-)
diff --git a/Makefile b/Makefile
index f42a1e2..333f2f3 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,8 @@ all: $(TARGET)
lclint:
lclint $(INCLUDES) +posixlib *.c >lclint.log
-wmcliphist: $(OBJECTS) foodock/foodock.o
- $(CC) $(LDFLAGS) $(OBJECTS) foodock/foodock.o $(LIBS) -o $@
+wmcliphist: $(OBJECTS)
+ $(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
wmcliphist.o: wmcliphist.c wmcliphist.h \
icon/ico_60x60_black.xpm icon/ico_60x60_gray.xpm \
@@ -32,8 +32,7 @@ wmcliphist.o: wmcliphist.c wmcliphist.h \
icon/ico_40x40_white.xpm icon/ico_40x40_mask.xbm \
icon/ico_30x30_black.xpm icon/ico_30x30_gray.xpm \
icon/ico_30x30_white.xpm icon/ico_30x30_mask.xbm \
- icon/ico_16x16.xpm icon/ico_16x16_mask.xbm \
- foodock/foodock.h
+ icon/ico_16x16.xpm icon/ico_16x16_mask.xbm
clipboard.o: clipboard.c wmcliphist.h
@@ -50,7 +49,6 @@ utils.o: utils.c wmcliphist.h
clean:
rm -rf $(OBJECTS) $(TARGET)
rm -rf core
- @(cd foodock && make clean)
install:
cp wmcliphist $(PREFIX)/bin
diff --git a/foodock/LICENSE b/foodock/LICENSE
deleted file mode 100644
index e43a3a9..0000000
--- a/foodock/LICENSE
+++ /dev/null
@@ -1,481 +0,0 @@
- GNU LIBRARY GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 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
-
- 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.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/foodock/Makefile b/foodock/Makefile
deleted file mode 100644
index 421112d..0000000
--- a/foodock/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-LIBPATH = /usr/X11R6/lib
-LIBNAME = libfoodock
-LFOO = $(LIBNAME).so
-
-lib: foodock.c foodock.h
- $(CC) -fpic -shared -o $(LFOO) foodock.c `gtk-config --cflags`
- strip $(LFOO)
-
-clean:
- rm -rf $(LFOO) foodock.o example.o example
-
-install:
- cp $(LFOO) $(LIBPATH)
- chmod 644 $(LIBPATH)/$(LFOO)
- ldconfig
-
-uninstall:
- rm -f $(LIBPATH)/$(LFOO)
- ldconfig
-
-example: example.c
- $(CC) -c -o example.o example.c `gtk-config --cflags`
- $(CC) -o example example.o `gtk-config --libs` -lfoodock
diff --git a/foodock/README b/foodock/README
deleted file mode 100644
index 3b51fc1..0000000
--- a/foodock/README
+++ /dev/null
@@ -1,71 +0,0 @@
-DESCRIPTION:
-
-libfoodock is a library for creating Gtk WindowMaker dockable applications.
-
-void gdk_window_set_icon(main_window->window, icon_window->window, NULL, NULL);
-won't do the trick. I suspect it sets up wrong WindowGroupHint.
-
-If you create an application using gdk_window_set_icon it probably will not
-useful under WindowMaker.
-
-INSTALLATION:
-
-make
-sudo make install
-(optional) make example
-(optional) ./example
-(optional) sudo make uninstall
-
-Please notice that make install will copy the library into LIBPATH (see
-Makefile). foodock.h will not be copied but you need this file to develop
-applications using libfoodock.
-
-PROGRAMMING:
-
-libfoodock contains the only function:
-GtkWidget *foo_create_main_icon_window(GtkWidget *mw, unsigned int s,
- int margc, char *margv[])
-
-You *should* do the following:
-
-(1) gtk_init
-(2) w = gtk_window_new
-(3) gtk_widget_realize(w) ! Very important !
-(4) w1 = foo_create_main_icon_window(w, 56, argc, argv);
-(5) gtk_widget_show(w1)
-(6) gtk_main
-
-Comments:
-(2) You should create main application window. Please notice that you will not
-see this window on the screen; it will be hidden. The only purpose of this
-window is to provide window group.
-(3) Because we will do some Xlib lowlevel tricks in
-foo_create_main_icon_window, main window should be realized or
-GDK_WINDOW_XWINDOW(w->window) will fail.
-(4) w1 now is pointer to gtk event box. You may think about w1 as about
-GTK_CONTAINER which represent docked WindowMaker application. You can put
-anything inside it. "56" is a recommended size of w1 (because standard
-WindowMaker dock item is 64x64... but you can try 64 or 60 r 50 or 20...).
-Please notice that w1 will be realised after foo_create_main_icon_window.
-argc and argv arguments define what WindowMaker will set up after docking as a
-command for launching your application.
-(5) After you put anything you want into w1 you should show w1.
-
-Please see example.c for working example.
-
-AUTHOR:
-
-Alexey Vyskubov, <alexey at pepper.spb.ru>
-
-ACKNOWLEDGEMENTS:
-
-I should thank:
-
-1. Owen Taylor <otaylor at redhat.com>, one of Gtk authors. He answered my request
-in Gtk mailing list: "Use the function: void gdk_window_set_icon". It allows
-to understand me that there is no way to do dockable application in Gdk/Gtk
-w/o Xlib (because gdk_window_set_icon doesn't help, and Gtk author didn't
-recommend anything else).
-
-2. David Raufeisen <lamer at fortyoz.org>. He answered my request in Gtk mailing
-list with working code. Thanks! An idea to use event box was great.
diff --git a/foodock/VERSION b/foodock/VERSION
deleted file mode 100644
index d3827e7..0000000
--- a/foodock/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0
diff --git a/foodock/example.c b/foodock/example.c
deleted file mode 100644
index 3efc323..0000000
--- a/foodock/example.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * File: example.c
- *
- * This file is a part of foodock library
- *
- * (c) 2000 Alexey Vyskubov <alexey at pepper.spb.ru>
- */
-
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-
-#include "foodock.h"
-
-int main( int argc, char *argv[] ) {
-
- GtkWidget *gtkiw;
- GtkWidget *box;
- GtkWidget *button;
-
- gtk_init(&argc, &argv);
-
- gtkiw = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_realize(gtkiw);
-
- box = foo_create_main_icon_window(gtkiw, 56, argc, argv);
-
- button = gtk_button_new_with_label ("FOO");
-
- gtk_container_add (GTK_CONTAINER (box), button);
-
- gtk_widget_show(button);
- gtk_widget_show(box);
- gtk_widget_show(gtkiw);
-
- gtk_main ();
-
- return(0);
-}
diff --git a/foodock/foodock.c b/foodock/foodock.c
deleted file mode 100644
index ccb391a..0000000
--- a/foodock/foodock.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * File: foodock.c
- *
- * Created: Fri Jan 14 01:15:24 2000
- *
- * (c) 2000, Alexey Vyskubov <alexey at pepper.spb.ru>
- *
- * LGPL, see file LICENSE
- */
-
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-
-#include "foodock.h"
-
-/*
- * Function foo_create_main_icon_window returns pointer to gtk event
- * box. This event box is created into main window and can be used as
- * a dockable Windowmaker applet. Main window should be realized
- * before calling foo_create_main_icon_window. Returned event box
- * will be realized by foo_create_main_icon_window. You should to show
- * icon window as well as main window before gtk_main().
- *
- * Call foo_set_wmhints() after both windows are shown (gtk_widget_show()).
- *
- * Input:
- * mw Pointer to main window
- * s icon window size (56 is recommended)
- * margc, margv argc and argv of main program for XSetCommand
- */
-
-GtkWidget *foo_create_main_icon_window(GtkWidget *mw,
- unsigned int s,
- int margc,
- char *margv[]) {
-
- GtkWidget *foobox; /* This will become icon box */
-
- foobox = gtk_event_box_new();
- gtk_widget_set_usize(foobox, s, s);
- gtk_container_add (GTK_CONTAINER (mw), foobox);
- gtk_widget_realize(foobox);
-
- return foobox;
-}
-
-/*
- * Set WMHints on the dockapp (icon) window. Needs to be called after
- * the main window is shown, due to changes in GTK+ 2.4.
- *
- * Input:
- * mw Pointer to main window
- * dw Pointer to icon (dockapp) window
- * margc, margv argc and argv of main program for XSetCommand
- */
-void foo_set_wmhints(GtkWidget *mw,
- GtkWidget *dw,
- int margc,
- char *margv[]) {
- Window xmw;
- XWMHints *wm_hints;
-
- xmw = GDK_WINDOW_XWINDOW(mw->window);
-
-
-/* Time for game with Xlib */
- wm_hints = XAllocWMHints();
- wm_hints->window_group = xmw;
- wm_hints->icon_window = GDK_WINDOW_XWINDOW(dw->window);
- wm_hints->icon_x = 0;
- wm_hints->icon_y = 0;
- wm_hints->initial_state = WithdrawnState;
- wm_hints->flags = StateHint |
- IconPositionHint |
- WindowGroupHint |
- IconWindowHint |
- InputHint;
-
- XSetWMHints(GDK_DISPLAY(), xmw, wm_hints);
-
- XSetCommand(GDK_DISPLAY(), xmw, margv, margc);
-
- XFree(wm_hints);
-}
diff --git a/foodock/foodock.h b/foodock/foodock.h
deleted file mode 100644
index ff8215b..0000000
--- a/foodock/foodock.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * File: foodock.h
- *
- * Created: Fri Jan 14 01:14:25 2000
- *
- * (c) 2000, Alexey Vyskubov <alexey at pepper.spb.ru>
- *
- * LGPL, see file LICENSE
-*/
-
-/*
- * Function foo_create_main_icon_window returns pointer to gtk event
- * box. This event box is created into main window and can be used as
- * a dockable Windowmaker applet. Main window should be realized
- * before calling foo_create_main_icon_window. Returned event box
- * will be realized by foo_create_main_icon_window. You should to show
- * icon window as well as main window before gtk_main().
- *
- * Call foo_set_wmhints() after both windows are shown (gtk_widget_show()).
- *
- * Input:
- * mw Pointer to main window
- * s icon window size (56 is recommended)
- * margc, margv argc and argv of main program for XSetCommand
- */
-GtkWidget *foo_create_main_icon_window(GtkWidget *main_window,
- unsigned int size,
- int main_argc,
- char *main_argv[]);
-
-/*
- * Set WMHints on the dockapp (icon) window. Needs to be called after
- * the main window is shown, due to changes in GTK+ 2.4.
- *
- * Input:
- * mw Pointer to main window
- * dw Pointer to icon (dockapp) window
- * margc, margv argc and argv of main program for XSetCommand
- */
-void foo_set_wmhints(GtkWidget *mw,
- GtkWidget *dw,
- int margc,
- char *margv[]);
diff --git a/wmcliphist.c b/wmcliphist.c
index 590ebc1..8452d83 100644
--- a/wmcliphist.c
+++ b/wmcliphist.c
@@ -61,6 +61,50 @@ wmcliphist_exit(gint code)
return_void();
}
+/* gtk3 dockapp code based on wmpasman by Brad Jorsch
+ * <anomie at users.sourceforge.net>
+ * http://sourceforge.net/projects/wmpasman */
+
+GtkWidget *foo_create_main_icon_window(GtkWidget *mw, unsigned int s)
+{
+ Display *d;
+ GdkDisplay *display;
+ GtkWidget *foobox;
+ unsigned int dummy3;
+ Window mainwin, iw, p, dummy1, *dummy2, w;
+ XWMHints *wmHints;
+
+ display = gdk_display_get_default();
+ foobox = gtk_window_new(GTK_WINDOW_POPUP);
+
+ gtk_window_set_wmclass(GTK_WINDOW(mw), g_get_prgname(), "DockApp");
+ gtk_widget_set_size_request(foobox, s, s);
+
+ gtk_widget_realize(mw);
+ gtk_widget_realize(foobox);
+
+ d = GDK_DISPLAY_XDISPLAY(display);
+ mainwin = GDK_WINDOW_XID(gtk_widget_get_window(mw));
+ iw = GDK_WINDOW_XID(gtk_widget_get_window(foobox));
+ XQueryTree(d, mainwin, &dummy1, &p, &dummy2, &dummy3);
+ if (dummy2)
+ XFree(dummy2);
+ w = XCreateSimpleWindow(d, p, 0, 0, 1, 1, 0, 0, 0);
+ XReparentWindow(d, mainwin, w, 0, 0);
+ gtk_widget_show(mw);
+ gtk_widget_show(foobox);
+ wmHints = XGetWMHints(d, mainwin);
+ if (!wmHints)
+ wmHints = XAllocWMHints();
+ wmHints->flags |= IconWindowHint;
+ wmHints->icon_window = iw;
+ XSetWMHints(d, mainwin, wmHints);
+ XFree(wmHints);
+ XReparentWindow(d, mainwin, p, 0, 0);
+ XDestroyWindow(d, w);
+
+ return foobox;
+}
/*
* main func
@@ -157,12 +201,9 @@ main(int argc, char **argv)
/* create main window */
main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_realize(main_window);
-
/* creat dock icon */
- dock_app = foo_create_main_icon_window(main_window,
- icon_size, argc, argv);
+ dock_app = foo_create_main_icon_window(main_window, icon_size);
if (icon_size) {
/* create icon_mask */
@@ -345,14 +386,6 @@ main(int argc, char **argv)
GTK_SIGNAL_FUNC(button_press),
GTK_OBJECT(menu_hist));
-
- /* show icon */
- gtk_widget_show(dock_app);
- gtk_widget_show(main_window);
-
- /* Set WMHints - after gtk_widget_show() due to changes in GTK+ 2.4 */
- foo_set_wmhints(main_window, dock_app, argc, argv);
-
gdk_window_shape_combine_mask(main_window->window, icon_mask, 0, 0);
gdk_window_shape_combine_mask(dock_app->window, icon_mask, 0, 0);
}
diff --git a/wmcliphist.h b/wmcliphist.h
index bcebb3c..29b101b 100644
--- a/wmcliphist.h
+++ b/wmcliphist.h
@@ -20,8 +20,6 @@
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
-#include "foodock/foodock.h"
-
#include "debug.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcliphist.git
More information about the Pkg-wmaker-commits
mailing list