]> sigrok.org Git - sigrok-gtk.git/commitdiff
Rename sub-project dirs to their correct name.
authorUwe Hermann <redacted>
Fri, 30 Dec 2011 10:23:22 +0000 (11:23 +0100)
committerUwe Hermann <redacted>
Fri, 30 Dec 2011 10:23:22 +0000 (11:23 +0100)
17 files changed:
COPYING [new file with mode: 0644]
Makefile.am [new file with mode: 0644]
autogen.sh [new file with mode: 0755]
configure.ac [new file with mode: 0644]
devselect.c [new file with mode: 0644]
gtkcellrenderersignal.c [new file with mode: 0644]
gtkcellrenderersignal.h [new file with mode: 0644]
help.c [new file with mode: 0644]
icons.c [new file with mode: 0644]
icons/sigrok-logo-notext.ico [new file with mode: 0644]
icons/sigrok_logo.png [new file with mode: 0644]
log.c [new file with mode: 0644]
main.c [new file with mode: 0644]
sigrok-gtk.h [new file with mode: 0644]
sigrok-gtk.rc [new file with mode: 0644]
sigview.c [new file with mode: 0644]
toolbar.c [new file with mode: 0644]

diff --git a/COPYING b/COPYING
new file mode 100644 (file)
index 0000000..94a9ed0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, 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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state 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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644 (file)
index 0000000..ad59c2d
--- /dev/null
@@ -0,0 +1,43 @@
+##
+## This file is part of the sigrok project.
+##
+## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program 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 General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+bin_PROGRAMS = sigrok-gtk
+
+sigrok_gtk_SOURCES = main.c log.c toolbar.c gtkcellrenderersignal.c \
+               sigview.c help.c devselect.c icons.c \
+               sigrok-gtk.h gtkcellrenderersignal.h
+
+sigrok_gtk_CPPFLAGS = -DPKG_DATA_DIR=\"$(pkgdatadir)\"
+
+sigrok_gtk_LDADD = $(LIBOBJS)
+
+iconsdir = $(pkgdatadir)/icons
+
+dist_icons_DATA = icons/sigrok_logo.png
+
+EXTRA_DIST = icons/sigrok-logo-notext.ico
+
+if WINDOWS
+sigrok_gtk_SOURCES += sigrok-gtk.rc
+sigrok_gtk_LDFLAGS = -mwindows
+endif
+
+.rc.o:
+       $(WINDRES) -o $@ $^
+
diff --git a/autogen.sh b/autogen.sh
new file mode 100755 (executable)
index 0000000..6cc2dbc
--- /dev/null
@@ -0,0 +1,50 @@
+#!/bin/sh
+##
+## This file is part of the sigrok project.
+##
+## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program 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 General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+OS=`uname`
+
+LIBTOOLIZE=libtoolize
+ACLOCAL_DIR=
+
+if [ "x$OS" = "xDarwin" ]; then
+       LIBTOOLIZE=glibtoolize
+
+       if [ -d /sw/share/aclocal ]; then
+               # fink installs aclocal macros here
+               ACLOCAL_DIR="-I /sw/share/aclocal"
+       elif [ -d /opt/local/share/aclocal ]; then
+               # Macports installs aclocal macros here
+               ACLOCAL_DIR="-I /opt/local/share/aclocal"
+       elif [ -d /usr/share/aclocal ]; then
+               # Xcode installs aclocal macros here
+               ACLOCAL_DIR="-I /usr/share/aclocal"
+       fi
+
+elif [ "x$OS" = "xMINGW32_NT-5.1" ]; then
+       ACLOCAL_DIR="-I /usr/local/share/aclocal"
+fi
+
+echo "Generating build system..."
+${LIBTOOLIZE} --install --copy --quiet || exit 1
+aclocal ${ACLOCAL_DIR} || exit 1
+# autoheader || exit 1
+automake --add-missing --copy --foreign || exit 1
+autoconf || exit 1
+
diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..87e39e3
--- /dev/null
@@ -0,0 +1,53 @@
+##
+## This file is part of the sigrok project.
+##
+## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program 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 General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+AC_INIT([sigrok-gtk], [0.1], [gareth@blacksphere.co.nz])
+AC_CONFIG_SRCDIR([main.c])
+AC_PREREQ(2.57)
+AM_INIT_AUTOMAKE([-Wall -Werror foreign std-options])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+CFLAGS="-g -Wall -Wextra"
+
+AC_PROG_CC
+AM_PROG_AS
+AC_STDC_HEADERS
+AC_PROG_INSTALL
+
+# Initialize libtool.
+LT_INIT
+
+# Initialize pkg-config.
+# We require at least 0.22, as "Requires.private" behaviour changed there.
+PKG_PROG_PKG_CONFIG([0.22])
+
+AC_CHECK_TOOL([WINDRES], windres, [])
+AM_CONDITIONAL([WINDOWS], test x$WINDRES != x)
+
+PKG_CHECK_MODULES([gtk], [gtk+-2.0 gmodule-2.0],
+       [CFLAGS="$CFLAGS $gtk_CFLAGS";
+       LIBS="$LIBS $gtk_LIBS"])
+
+PKG_CHECK_MODULES([libsigrok], [libsigrok],
+       [CFLAGS="$CFLAGS $libsigrok_CFLAGS";
+       LIBS="$LIBS $libsigrok_LIBS"])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+
diff --git a/devselect.c b/devselect.c
new file mode 100644 (file)
index 0000000..8ac0541
--- /dev/null
@@ -0,0 +1,172 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sigrok.h>
+#include <gtk/gtk.h>
+#include "sigrok-gtk.h"
+
+static void dev_selected(GtkComboBox *dev, GObject *parent)
+{
+       GtkTreeModel *devlist = gtk_combo_box_get_model(dev);
+       GtkTreeIter iter;
+       const gchar *name;
+       GtkCheckMenuItem *menuitem;
+       struct sr_device *device;
+
+       if (!gtk_combo_box_get_active_iter(dev, &iter)) {
+               g_object_set_data(parent, "device", NULL);
+               return;
+       }
+       gtk_tree_model_get(devlist, &iter, 0, &name, 1, &device,
+                               2, &menuitem, -1);
+
+       gtk_check_menu_item_set_active(menuitem, TRUE);
+
+       sr_session_device_clear();
+       if (sr_session_device_add(device) != SR_OK) {
+               g_critical("Failed to use device.");
+               sr_session_destroy();
+               device = NULL;
+       }
+       g_object_set_data(parent, "device", device);
+}
+
+static void dev_menuitem_toggled(GtkMenuItem *item, GtkComboBox *combo)
+{
+       GtkTreeModel *model = gtk_combo_box_get_model(combo);
+       GtkTreeIter iter;
+
+       if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)))
+               return;
+       
+       if (gtk_tree_model_get_iter_first(model, &iter)) do {
+               gchar *name;
+               gtk_tree_model_get(model, &iter, 0, &name, -1);
+               if (g_str_equal(name, gtk_menu_item_get_label(item))) {
+                       gtk_combo_box_set_active_iter(combo, &iter);
+                       return;
+               }
+       } while (gtk_tree_model_iter_next(model, &iter));
+}
+
+#define GET_DEVICE_INSTANCE(device) \
+       (device)->plugin->get_device_info((device)->plugin_index, \
+                       SR_DI_INSTANCE);
+
+void dev_select_rescan(GtkAction *action, GtkWindow *parent)
+{
+       GtkComboBox *dev = g_object_get_data(G_OBJECT(parent), "devcombo");
+       g_return_if_fail(dev != NULL);
+       GtkListStore *devlist = GTK_LIST_STORE(gtk_combo_box_get_model(dev));
+       GtkTreeIter iter;
+       struct sr_device *device;
+       struct sr_device_instance *sdi;
+       gchar *sdevname = NULL;
+       GSList *devices, *l;
+       GtkUIManager *ui = g_object_get_data(G_OBJECT(parent), "ui_manager");
+       GtkWidget *menuitem = gtk_ui_manager_get_widget(ui,
+                                       "/menubar/DevMenu/DevSelectMenu");
+       GtkMenuShell *devmenu = GTK_MENU_SHELL(gtk_menu_item_get_submenu(GTK_MENU_ITEM(menuitem)));
+       GSList *radiolist = NULL;
+
+       (void)action;
+
+       /* Make a copy of the selected device's short name for comparison.
+        * We wish to select the same device after the refresh if possible.
+        */
+       if (gtk_combo_box_get_active_iter(dev, &iter)) {
+               gtk_tree_model_get(GTK_TREE_MODEL(devlist), &iter, 1, &device, -1);
+               /* FIXME: Use something other than device->plugin->name */
+               sdevname = g_strdup(device->plugin->name);
+       }
+
+       /* Destroy the old menu items */
+       if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(devlist), &iter)) do {
+               GtkMenuItem *item;
+               gtk_tree_model_get(GTK_TREE_MODEL(devlist), &iter, 2, &item, -1);
+               gtk_object_destroy(GTK_OBJECT(item));
+       } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(devlist), &iter));
+
+       gtk_list_store_clear(devlist);
+
+       /* Scan for new devices and update our list */
+       /* TODO: Fix this in libsigrok first. */
+       /*sr_device_scan();*/
+       devices = sr_device_list();
+       for (l = devices; l; l = l->next) {
+               device = l->data;
+               sdi = GET_DEVICE_INSTANCE(device);
+               gchar *name = sdi->model ? sdi->model : sdi->vendor;
+               if (!name)
+                       name = "(unknown)";
+
+               menuitem = gtk_radio_menu_item_new_with_label(radiolist, name);
+               gtk_widget_show(GTK_WIDGET(menuitem));
+               if (!radiolist)
+                       radiolist = gtk_radio_menu_item_get_group(
+                                       GTK_RADIO_MENU_ITEM(menuitem));
+               g_signal_connect(menuitem, "toggled",
+                               G_CALLBACK(dev_menuitem_toggled), dev);
+               gtk_menu_shell_prepend(devmenu, menuitem);
+
+               gtk_list_store_append(devlist, &iter);
+               gtk_list_store_set(devlist, &iter,
+                               0, name,
+                               1, device,
+                               2, menuitem,
+                               -1);
+
+               if (sdevname && g_str_equal(sdevname, device->plugin->name))
+                       gtk_combo_box_set_active_iter(dev, &iter);
+       }
+       if (sdevname)
+               g_free(sdevname);
+
+       /* Select a default if nothing selected */
+       if (!gtk_combo_box_get_active_iter(dev, &iter)) {
+               if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(devlist), &iter))
+                       return;
+               /* Skip demo if there's another available */
+               GtkTreeIter first = iter;
+               if (gtk_tree_model_iter_next(GTK_TREE_MODEL(devlist), &iter))
+                       gtk_combo_box_set_active_iter(dev, &iter);
+               else
+                       gtk_combo_box_set_active_iter(dev, &first);
+       }
+}
+
+GtkWidget *dev_select_combo_box_new(GtkWindow *parent)
+{
+       GtkWidget *dev = gtk_combo_box_new();
+
+       /* Populate device list */
+       GtkListStore *devlist = gtk_list_store_new(3,
+                       G_TYPE_STRING, G_TYPE_POINTER, GTK_TYPE_CHECK_MENU_ITEM);
+       GtkCellRenderer *cel = gtk_cell_renderer_text_new();
+       gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dev), cel, TRUE);
+       gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(dev), cel, "text", 0);
+       gtk_combo_box_set_model(GTK_COMBO_BOX(dev), GTK_TREE_MODEL(devlist));
+       g_signal_connect(dev, "changed", G_CALLBACK(dev_selected), parent);
+
+       g_object_set_data(G_OBJECT(parent), "devcombo", dev);
+       dev_select_rescan(NULL, parent);
+
+       return dev;
+}
+
diff --git a/gtkcellrenderersignal.c b/gtkcellrenderersignal.c
new file mode 100644 (file)
index 0000000..3c37f26
--- /dev/null
@@ -0,0 +1,309 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtk/gtk.h>
+
+#include "gtkcellrenderersignal.h"
+
+enum
+{
+       PROP_0,
+       PROP_DATA,
+       PROP_PROBE,
+       PROP_FOREGROUND,
+       PROP_SCALE,
+       PROP_OFFSET,
+};
+
+struct _GtkCellRendererSignalPrivate
+{
+       GArray *data;
+       guint32 probe;
+       GdkColor foreground;
+       gdouble scale;
+       gint offset;
+};
+
+static void gtk_cell_renderer_signal_finalize(GObject *object);
+static void gtk_cell_renderer_signal_get_property(GObject *object,
+                               guint param_id, GValue *value,
+                               GParamSpec *pspec);
+static void gtk_cell_renderer_signal_set_property(GObject *object,
+                               guint param_id, const GValue *value,
+                               GParamSpec *pspec);
+static void gtk_cell_renderer_signal_get_size(GtkCellRenderer *cell,
+                               GtkWidget *widget,
+                               GdkRectangle *cell_area,
+                               gint *x_offset,
+                               gint *y_offset,
+                               gint *width,
+                               gint *height);
+static void gtk_cell_renderer_signal_render(GtkCellRenderer *cell,
+                               GdkWindow *window,
+                               GtkWidget *widget,
+                               GdkRectangle *background_area,
+                               GdkRectangle *cell_area,
+                               GdkRectangle *expose_area,
+                               GtkCellRendererState flags);
+
+
+G_DEFINE_TYPE(GtkCellRendererSignal, gtk_cell_renderer_signal, GTK_TYPE_CELL_RENDERER);
+
+static void
+gtk_cell_renderer_signal_class_init (GtkCellRendererSignalClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass);
+
+       object_class->finalize = gtk_cell_renderer_signal_finalize;
+       object_class->get_property = gtk_cell_renderer_signal_get_property;
+       object_class->set_property = gtk_cell_renderer_signal_set_property;
+
+       cell_class->get_size = gtk_cell_renderer_signal_get_size;
+       cell_class->render = gtk_cell_renderer_signal_render;
+
+       g_object_class_install_property(object_class,
+                               PROP_DATA,
+                               g_param_spec_pointer("data",
+                                               "Data",
+                                               "Binary samples data",
+                                               G_PARAM_READWRITE));
+
+       g_object_class_install_property (object_class,
+                               PROP_PROBE,
+                               g_param_spec_int("probe",
+                                               "Probe",
+                                               "Bit in Data to display",
+                                               -1, G_MAXINT, -1,
+                                               G_PARAM_READWRITE));
+
+       g_object_class_install_property (object_class,
+                               PROP_FOREGROUND,
+                               g_param_spec_string("foreground",
+                                               "Foreground",
+                                               "Foreground Colour",
+                                               NULL,
+                                               G_PARAM_WRITABLE));
+
+       g_object_class_install_property (object_class,
+                               PROP_SCALE,
+                               g_param_spec_double("scale",
+                                               "Scale",
+                                               "Pixels per sample",
+                                               0, 100, 1,
+                                               G_PARAM_READWRITE));
+
+       g_object_class_install_property (object_class,
+                               PROP_OFFSET,
+                               g_param_spec_int("offset",
+                                               "Offset",
+                                               "Offset...",
+                                               0, G_MAXINT, 0,
+                                               G_PARAM_READWRITE));
+
+       g_type_class_add_private (object_class,
+                       sizeof (GtkCellRendererSignalPrivate));
+}
+
+static void gtk_cell_renderer_signal_init(GtkCellRendererSignal *cel)
+{
+       GtkCellRendererSignalPrivate *priv;
+
+       cel->priv = G_TYPE_INSTANCE_GET_PRIVATE(cel,
+                               GTK_TYPE_CELL_RENDERER_SIGNAL,
+                               GtkCellRendererSignalPrivate);
+       priv = cel->priv;
+
+       priv->data = NULL;
+       priv->probe = -1;
+       priv->scale = 1;
+       priv->offset = 0;
+}
+
+GtkCellRenderer *gtk_cell_renderer_signal_new(void)
+{
+       return g_object_new(GTK_TYPE_CELL_RENDERER_SIGNAL, NULL);
+}
+
+static void gtk_cell_renderer_signal_finalize(GObject *object)
+{
+       GtkCellRendererSignal *cel = GTK_CELL_RENDERER_SIGNAL(object);
+       GtkCellRendererSignalPrivate *priv = cel->priv;
+       /* Keep this around, because it'll be useful in future */
+       (void)priv;
+       G_OBJECT_CLASS(gtk_cell_renderer_signal_parent_class)->finalize(object);
+}
+
+static void
+gtk_cell_renderer_signal_get_property(GObject *object,
+                               guint param_id,
+                               GValue *value,
+                               GParamSpec *pspec)
+{
+       GtkCellRendererSignal *cel = GTK_CELL_RENDERER_SIGNAL(object);
+       GtkCellRendererSignalPrivate *priv = cel->priv;
+
+       switch (param_id) {
+       case PROP_DATA:
+               g_value_set_pointer(value, priv->data);
+               break;
+       case PROP_PROBE:
+               g_value_set_int(value, priv->probe);
+               break;
+       case PROP_SCALE:
+               g_value_set_double(value, priv->scale);
+               break;
+       case PROP_OFFSET:
+               g_value_set_int(value, priv->offset);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+       }
+}
+
+static void
+gtk_cell_renderer_signal_set_property(GObject *object,
+                               guint param_id,
+                               const GValue *value,
+                               GParamSpec *pspec)
+{
+       GtkCellRendererSignal *cel = GTK_CELL_RENDERER_SIGNAL(object);
+       GtkCellRendererSignalPrivate *priv = cel->priv;
+
+       switch (param_id) {
+       case PROP_DATA:
+               priv->data = g_value_get_pointer(value);
+               break;
+       case PROP_PROBE:
+               priv->probe = g_value_get_int(value);
+               break;
+       case PROP_FOREGROUND:
+               gdk_color_parse(g_value_get_string(value), &priv->foreground);
+               break;
+       case PROP_SCALE:
+               priv->scale = g_value_get_double(value);
+               break;
+       case PROP_OFFSET:
+               priv->offset = g_value_get_int(value);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+       }
+}
+
+static void
+gtk_cell_renderer_signal_get_size(GtkCellRenderer *cell,
+                               GtkWidget *widget,
+                               GdkRectangle *cell_area,
+                               gint *x_offset,
+                               gint *y_offset,
+                               gint *width,
+                               gint *height)
+{
+       (void)cell;
+       (void)widget;
+       (void)cell_area;
+
+       /* FIXME: What about cell_area? */
+       if (width) *width = 0;
+       if (height) *height = 30;
+
+       if (x_offset) *x_offset = 0;
+       if (y_offset) *y_offset = 0;
+}
+
+
+static gboolean sample(GArray *data, gint probe, guint i)
+{
+       int unitsize = g_array_get_element_size(data);
+       g_return_val_if_fail(i < data->len, FALSE);
+       g_return_val_if_fail(probe < unitsize * 8, FALSE);
+
+       return data->data[(i*unitsize) + probe/8] & (1 << (probe & 7));
+}
+
+static void
+gtk_cell_renderer_signal_render(GtkCellRenderer *cell,
+                               GdkWindow *window,
+                               GtkWidget *widget,
+                               GdkRectangle *background_area,
+                               GdkRectangle *cell_area,
+                               GdkRectangle *expose_area,
+                               GtkCellRendererState flags)
+{
+       GtkCellRendererSignal *cel = GTK_CELL_RENDERER_SIGNAL(cell);
+       GtkCellRendererSignalPrivate *priv= cel->priv;
+       guint nsamples = priv->data->len;
+       gint xpad, ypad;
+       int x, y, w, h;
+       guint si;
+       gdouble o;
+
+       (void)widget;
+       (void)expose_area;
+       (void)flags;
+
+       gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+       x = cell_area->x + xpad;
+       y = cell_area->y + ypad;
+       w = cell_area->width - xpad * 2;
+       h = cell_area->height - ypad * 2;
+
+       cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(window));
+
+       /* Set clipping region to background rectangle.
+        * This prevents us drawing over other cells.
+        */
+       cairo_new_path(cr);
+       gdk_cairo_rectangle(cr, background_area);
+       cairo_clip(cr);
+
+       cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
+       gdk_cairo_set_source_color(cr, &priv->foreground);
+       /*cairo_set_line_width(cr, 1);*/
+       cairo_new_path(cr);
+
+       si = priv->offset / priv->scale;
+       if (si >= nsamples)
+               return;
+       o = x - (priv->offset - si * priv->scale);
+
+       guint32 oldsample = sample(priv->data, priv->probe, si++);
+       cairo_move_to(cr, o, y +
+               (oldsample ? 0 : h));
+       o += priv->scale;
+       
+       while ((si < nsamples) && (o - priv->scale < x+w)) {
+               guint32 cursample = sample(priv->data, priv->probe, si);
+               if (cursample != oldsample) {
+                       cairo_line_to(cr, o - priv->scale/8, y +
+                               (oldsample ? 0 : h));
+                       cairo_line_to(cr, o + priv->scale/8, y +
+                               (cursample ? 0 : h));
+                       oldsample = cursample;
+               }
+               o += priv->scale;
+               si++;
+       }
+       cairo_line_to(cr, o - priv->scale/8, y +
+               (oldsample ? 0 : h));
+
+       cairo_stroke(cr);
+       cairo_destroy(cr);
+}
diff --git a/gtkcellrenderersignal.h b/gtkcellrenderersignal.h
new file mode 100644 (file)
index 0000000..48a044a
--- /dev/null
@@ -0,0 +1,62 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_CELL_RENDERER_SIGNAL_H__
+#define __GTK_CELL_RENDERER_SIGNAL_H__
+
+#include <gtk/gtk.h>
+#include <glib-object.h>
+
+#define GTK_TYPE_CELL_RENDERER_SIGNAL \
+       (gtk_cell_renderer_signal_get_type ())
+#define GTK_CELL_RENDERER_SIGNAL(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_SIGNAL, \
+       GtkCellRendererSignal))
+#define GTK_CELL_RENDERER_SIGNAL_CLASS(klass) \
+       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_SIGNAL, \
+       GtkCellRendererSignalClass))
+#define GTK_IS_CELL_RENDERER_SIGNAL(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_SIGNAL))
+#define GTK_IS_CELL_RENDERER_SIGNAL_CLASS(klass) \
+       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_SIGNAL))
+#define GTK_CELL_RENDERER_SIGNAL_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_SIGNAL, \
+       GtkCellRendererSignalClass))
+
+typedef struct _GtkCellRendererSignal GtkCellRendererSignal;
+typedef struct _GtkCellRendererSignalClass GtkCellRendererSignalClass;
+typedef struct _GtkCellRendererSignalPrivate GtkCellRendererSignalPrivate;
+
+struct _GtkCellRendererSignal
+{
+       GtkCellRenderer parent_instance;
+
+       /*< private >*/
+       GtkCellRendererSignalPrivate *priv;
+};
+
+struct _GtkCellRendererSignalClass
+{
+       GtkCellRendererClass parent_class;
+};
+
+GType gtk_cell_renderer_signal_get_type(void);
+GtkCellRenderer* gtk_cell_renderer_signal_new(void);
+
+#endif
diff --git a/help.c b/help.c
new file mode 100644 (file)
index 0000000..54e4ec7
--- /dev/null
+++ b/help.c
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sigrok.h>
+#include <gtk/gtk.h>
+
+void help_wiki(void)
+{
+       gtk_show_uri(NULL, "http://www.sigrok.org/", GDK_CURRENT_TIME, NULL);
+}
+
+void help_about(GtkAction *action, GtkWindow *parent)
+{
+       (void)action;
+
+       gtk_show_about_dialog(parent,
+               "program_name", "Sigrok-GTK",
+               "version", "0.1",
+               "logo-icon-name", "sigrok-logo",
+               "comments", "Portable, cross-platform, "
+                       "Free/Libre/Open-Source logic analyzer software.\n\nGTK+ Front-end",
+               "license",
+                       "This program is free software: you can redistribute it and/or modify\n"
+                       "it under the terms of the GNU General Public License as published by\n"
+                       "the Free Software Foundation, either version 3 of the License, or\n"
+                       "(at your option) any later version.\n\n"
+
+                       "This program is distributed in the hope that it will be useful,\n"
+                       "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+                       "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+                       "GNU General Public License for more details.\n\n"
+
+                       "You should have received a copy of the GNU General Public License\n"
+                       "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n",
+               "website", "http://www.sigrok.org/",
+               NULL);
+}
+
diff --git a/icons.c b/icons.c
new file mode 100644 (file)
index 0000000..b0a0a0e
--- /dev/null
+++ b/icons.c
@@ -0,0 +1,73 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sigrok.h>
+#include <gtk/gtk.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+static struct {
+       gchar *filename;
+       gchar *stock_id;
+} stock_icons[] = {
+       {"sigrok_logo.png", "sigrok-logo"},
+};
+
+static gint n_stock_icons = G_N_ELEMENTS (stock_icons);
+
+void icons_register(void)
+{
+       GtkIconFactory *icon_factory;
+       GtkIconSet *icon_set;
+       GtkIconSource *icon_source;
+       gint i;
+       gchar *tmp;
+
+#ifdef G_OS_WIN32
+       gchar *sysdir;
+       sysdir = g_win32_get_package_installation_directory_of_module(NULL);
+       g_build_filename(sysdir, "share", PACKAGE_TARNAME, "icons", NULL);
+       g_free(sysdir);
+#else
+        tmp = g_build_filename(PKG_DATA_DIR, "icons", NULL);
+#endif
+       icon_factory = gtk_icon_factory_new ();
+       gtk_icon_factory_add_default (icon_factory);
+       icon_source = gtk_icon_source_new ();
+
+       for(i = 0; i < n_stock_icons; i++) {
+               gchar *filename = 
+                       g_build_filename(tmp, stock_icons[i].filename, NULL);
+
+               icon_set = gtk_icon_set_new ();
+               gtk_icon_source_set_filename(icon_source, filename);
+               gtk_icon_source_set_icon_name(icon_source, stock_icons[i].stock_id);
+               gtk_icon_set_add_source (icon_set, icon_source);
+               gtk_icon_factory_add (icon_factory, stock_icons[i].stock_id, icon_set);
+
+               g_free(filename);
+       }
+
+       gtk_icon_source_free (icon_source);
+       g_object_unref (icon_factory);
+        g_free(tmp);
+}
+
diff --git a/icons/sigrok-logo-notext.ico b/icons/sigrok-logo-notext.ico
new file mode 100644 (file)
index 0000000..8f1228c
Binary files /dev/null and b/icons/sigrok-logo-notext.ico differ
diff --git a/icons/sigrok_logo.png b/icons/sigrok_logo.png
new file mode 100644 (file)
index 0000000..e04159c
Binary files /dev/null and b/icons/sigrok_logo.png differ
diff --git a/log.c b/log.c
new file mode 100644 (file)
index 0000000..3cc739e
--- /dev/null
+++ b/log.c
@@ -0,0 +1,61 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtk/gtk.h>
+#include "sigrok-gtk.h"
+
+static void logger(const gchar *log_domain, GLogLevelFlags log_level,
+                  const gchar *message, gpointer user_data)
+{
+       GtkTextView *tv = user_data;
+       g_return_if_fail(GTK_IS_TEXT_VIEW(tv));
+       GtkTextBuffer *tb = gtk_text_view_get_buffer(tv);
+       GtkTextIter iter;
+
+       /* Avoid compiler warnings. */
+       (void)log_domain;
+       (void)log_level;
+
+       gtk_text_buffer_get_end_iter(tb, &iter);
+       gtk_text_buffer_insert(tb, &iter, message, -1);
+       gtk_text_buffer_insert(tb, &iter, "\n", -1);
+       gtk_text_view_scroll_mark_onscreen(tv, gtk_text_buffer_get_insert(tb));
+}
+
+GtkWidget *log_init(void)
+{
+       GtkWidget *sw, *tv;
+
+       sw = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+                               GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+       tv = gtk_text_view_new();
+       gtk_widget_modify_font(tv,
+                        pango_font_description_from_string("Monospace"));
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tv), GTK_WRAP_CHAR);
+       gtk_text_view_set_editable(GTK_TEXT_VIEW(tv), FALSE);
+
+       gtk_container_add(GTK_CONTAINER(sw), tv);
+
+       g_log_set_default_handler(logger, tv);
+       gtk_widget_show_all(tv);
+
+       return sw;
+}
+
diff --git a/main.c b/main.c
new file mode 100644 (file)
index 0000000..f5fb05e
--- /dev/null
+++ b/main.c
@@ -0,0 +1,171 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sigrok.h>
+#include <gtk/gtk.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+
+#include "sigrok-gtk.h"
+
+GtkWidget *sigview;
+
+static const char *colours[8] = {
+       "black", "brown", "red", "orange",
+       "gold", "darkgreen", "blue", "magenta",
+};
+
+static void
+datafeed_in(struct sr_device *device, struct sr_datafeed_packet *packet)
+{
+       static int probelist[65] = { 0 };
+       static int unitsize = 0;
+       struct sr_probe *probe;
+       struct sr_datafeed_header *header;
+       struct sr_datafeed_logic *logic = NULL;
+       int num_enabled_probes, sample_size, i;
+       uint64_t filter_out_len;
+       char *filter_out;
+       GArray *data;
+
+       switch (packet->type) {
+       case SR_DF_HEADER:
+               g_message("cli: Received SR_DF_HEADER");
+               header = packet->payload;
+               num_enabled_probes = 0;
+               gtk_list_store_clear(siglist);
+               for (i = 0; i < header->num_logic_probes; i++) {
+                       probe = g_slist_nth_data(device->probes, i);
+                       if (probe->enabled) {
+                               GtkTreeIter iter;
+                               probelist[num_enabled_probes++] = probe->index;
+                               gtk_list_store_append(siglist, &iter);
+                               gtk_list_store_set(siglist, &iter,
+                                               0, probe->name,
+                                               1, colours[(num_enabled_probes - 1) & 7],
+                                               2, num_enabled_probes - 1,
+                                               -1);
+                       }
+               }
+               /* How many bytes we need to store num_enabled_probes bits */
+               unitsize = (num_enabled_probes + 7) / 8;
+               data = g_array_new(FALSE, FALSE, unitsize);
+               g_object_set_data(G_OBJECT(siglist), "sampledata", data);
+
+               break;
+       case SR_DF_END:
+               sigview_zoom(sigview, 1, 0);
+               g_message("cli: Received SR_DF_END");
+               sr_session_halt();
+               break;
+       case SR_DF_TRIGGER:
+               g_message("cli: received SR_DF_TRIGGER at %"PRIu64" ms",
+                               packet->timeoffset / 1000000);
+               break;
+       case SR_DF_LOGIC:
+               logic = packet->payload;
+               sample_size = logic->unitsize;
+               g_message("cli: received SR_DF_LOGIC at %f ms duration %f ms, %"PRIu64" bytes",
+                               packet->timeoffset / 1000000.0, packet->duration / 1000000.0,
+                               logic->length);
+               break;
+       case SR_DF_ANALOG:
+               break;
+       }
+
+       if (!logic)
+               return;
+
+       if (sr_filter_probes(sample_size, unitsize, probelist,
+                                  logic->data, logic->length,
+                                  &filter_out, &filter_out_len) != SR_OK)
+               return;
+
+       data = g_object_get_data(G_OBJECT(siglist), "sampledata");
+       g_return_if_fail(data != NULL);
+
+       g_array_append_vals(data, filter_out, filter_out_len/unitsize);
+
+       g_free(filter_out);
+}
+
+void load_input_file(GtkWindow *parent, const gchar *file)
+{
+       if (sr_session_load(file) == SR_OK) {
+               /* sigrok session file */
+               sr_session_datafeed_callback_add(datafeed_in);
+               sr_session_start();
+               sr_session_run();
+               sr_session_stop();
+       }
+
+       /* Create a new session and programatically emit changed signal from
+        * the device selection combo box to reselect the device. 
+        */
+       sr_session_new();
+       sr_session_datafeed_callback_add(datafeed_in);
+       g_signal_emit_by_name(g_object_get_data(G_OBJECT(parent), "devcombo"), 
+                       "changed");
+}
+
+int main(int argc, char **argv)
+{
+       GtkWindow *window;
+       GtkWidget *vbox, *vpaned, *log;
+       gtk_init(&argc, &argv);
+       icons_register();
+       sr_init();
+       sr_session_new();
+       sr_session_datafeed_callback_add(datafeed_in);
+
+       window = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
+       gtk_window_set_icon_name(window, "sigrok-logo");
+       gtk_window_set_title(window, "Sigrok-GTK");
+       gtk_window_set_default_size(window, 600, 400);
+
+       g_signal_connect(window, "destroy", gtk_main_quit, NULL);
+
+       vbox = gtk_vbox_new(FALSE, 0);
+       vpaned = gtk_vpaned_new();
+
+       gtk_box_pack_start(GTK_BOX(vbox), toolbar_init(window), FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), vpaned, TRUE, TRUE, 0);
+       log = log_init();
+       gtk_widget_set_no_show_all(log, TRUE);
+       g_object_set_data(G_OBJECT(window), "logview", log);
+       gtk_paned_add2(GTK_PANED(vpaned), log);
+       sigview = sigview_init();
+       g_object_set_data(G_OBJECT(window), "sigview", sigview);
+       gtk_paned_pack1(GTK_PANED(vpaned), sigview, TRUE, FALSE);
+
+       gtk_container_add(GTK_CONTAINER(window), vbox);
+       gtk_widget_show_all(GTK_WIDGET(window));
+
+       sr_set_loglevel(1);
+
+       gtk_main();
+
+       sr_session_destroy();
+       gtk_exit(0);
+
+       return 0;
+}
+
diff --git a/sigrok-gtk.h b/sigrok-gtk.h
new file mode 100644 (file)
index 0000000..97cd2f6
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SIGROK_GTK_H
+#define __SIGROK_GTK_H
+
+#include <gtk/gtk.h>
+
+/* main.c */
+void load_input_file(GtkWindow *parent, const gchar *file);
+
+/* sigview.c */
+extern GtkListStore *siglist;
+
+GtkWidget *sigview_init(void);
+void sigview_zoom(GtkWidget *sigview, gdouble zoom, gint offset);
+
+/* help.c */
+void help_wiki(void);
+void help_about(GtkAction *action, GtkWindow *parent);
+
+/* devselect.c */
+GtkWidget *dev_select_combo_box_new(GtkWindow *parent);
+void dev_select_rescan(GtkAction *action, GtkWindow *parent);
+
+/* log.c */
+GtkWidget *log_init(void);
+GtkWidget *toolbar_init(GtkWindow *parent);
+
+/* icons.c */
+void icons_register(void);
+
+#endif
+
diff --git a/sigrok-gtk.rc b/sigrok-gtk.rc
new file mode 100644 (file)
index 0000000..e149162
--- /dev/null
@@ -0,0 +1,22 @@
+##
+## This file is part of the sigrok project.
+##
+## Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program 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 General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+IDI_ICON1      ICON    DISCARDABLE     "icons/sigrok-logo-notext.ico"
+
diff --git a/sigview.c b/sigview.c
new file mode 100644 (file)
index 0000000..4863e7f
--- /dev/null
+++ b/sigview.c
@@ -0,0 +1,335 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sigrok.h>
+#include <gtk/gtk.h>
+
+#include <string.h>
+#include <math.h>
+
+#include "gtkcellrenderersignal.h"
+#include "sigrok-gtk.h"
+
+/* FIXME: No globals */
+GtkListStore *siglist;
+
+static void format_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
+               GtkTreeModel *siglist, GtkTreeIter *iter, gpointer user_data)
+{
+       int probe;
+       char *colour;
+       GArray *data;
+
+       (void)tree_column;
+       (void)user_data;
+
+       /* TODO: In future we will get data here from tree model.
+        * PD data streams will be kept in the list.  The logic stream
+        * will be used if data is NULL.
+        */
+       gtk_tree_model_get(siglist, iter, 1, &colour, 2, &probe, -1);
+
+       /* Try get summary data from the list */
+       data = g_object_get_data(G_OBJECT(siglist), "summarydata");
+       if (!data)
+               data = g_object_get_data(G_OBJECT(siglist), "sampledata");
+
+       g_object_set(G_OBJECT(cell), "data", data, "probe", probe,
+                               "foreground", colour, NULL);
+}
+
+static gboolean do_scroll_event(GtkTreeView *tv, GdkEventScroll *e)
+{
+       gint x, y, cx;
+       GtkTreeViewColumn *col;
+
+       gtk_tree_view_widget_to_tree_coords(tv, e->x, e->y, &x, &y);
+       if (!gtk_tree_view_get_path_at_pos(tv, x, y, NULL, &col, &cx, NULL))
+               return FALSE;
+       if (col != g_object_get_data(G_OBJECT(tv), "signalcol"))
+               return FALSE;
+
+       switch (e->direction) {
+       case GDK_SCROLL_UP:
+               sigview_zoom(GTK_WIDGET(tv), 1.2, cx);
+               break;
+       case GDK_SCROLL_DOWN:
+               sigview_zoom(GTK_WIDGET(tv), 1/1.2, cx);
+               break;
+       default:
+               /* Surpress warning about unswitch enum values */
+               break;
+       }
+       
+       return TRUE;
+}
+
+static gboolean do_motion_event(GtkWidget *tv, GdkEventMotion *e,
+                               GObject *cel)
+{
+       GObject *siglist;
+       gint x;
+       gint offset;
+       GArray *data;
+       guint nsamples;
+       GtkTreeViewColumn *col;
+       gint width;
+       gdouble scale, *rscale;
+       GtkAdjustment *adj;
+
+       x = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(tv), "motion-x"));
+       g_object_set_data(G_OBJECT(tv), "motion-x", GINT_TO_POINTER((gint)e->x));
+       adj = g_object_get_data(G_OBJECT(tv), "hadj");
+
+       siglist = G_OBJECT(gtk_tree_view_get_model(GTK_TREE_VIEW(tv)));
+       data = g_object_get_data(siglist, "sampledata");
+       rscale = g_object_get_data(siglist, "rscale");
+       nsamples = (data->len / g_array_get_element_size(data)) - 1;
+       col = g_object_get_data(G_OBJECT(tv), "signalcol");
+       width = gtk_tree_view_column_get_width(col);
+
+       g_object_get(cel, "offset", &offset, "scale", &scale, NULL);
+       offset += x - e->x;
+       if (offset < 0)
+               offset = 0;
+       if (offset > nsamples * *rscale - width)
+               offset = nsamples * *rscale - width;
+
+       gtk_adjustment_set_value(adj, offset);
+
+       return TRUE;
+}
+
+static gboolean do_button_event(GtkTreeView *tv, GdkEventButton *e,
+                               GObject *cel)
+{
+       int h;
+       gint x, y;
+       GtkTreeViewColumn *col;
+
+       if (e->button != 3)
+               return FALSE;
+
+       gtk_tree_view_widget_to_tree_coords(tv, e->x, e->y, &x, &y);
+
+       switch (e->type) {
+       case GDK_BUTTON_PRESS:
+               if (!gtk_tree_view_get_path_at_pos(tv, x, y, NULL, &col, NULL, NULL))
+                       return FALSE;
+               if (col != g_object_get_data(G_OBJECT(tv), "signalcol"))
+                       return FALSE;
+               h = g_signal_connect(tv, "motion-notify-event", G_CALLBACK(do_motion_event), cel);
+               g_object_set_data(G_OBJECT(tv), "motion-handler", GINT_TO_POINTER(h));
+               g_object_set_data(G_OBJECT(tv), "motion-x", GINT_TO_POINTER((gint)e->x));
+               break;
+       case GDK_BUTTON_RELEASE:
+               h = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(tv), "motion-handler"));
+               if (!h)
+                       return TRUE;
+               g_signal_handler_disconnect(GTK_WIDGET(tv), h);
+               g_object_set_data(G_OBJECT(tv), "motion-handler", NULL);
+               break;
+       default:
+               /* Surpress warning about unswitch enum values */
+               break;
+       }
+       return TRUE;
+}
+
+static void col_resized(GtkWidget *col)
+{
+       sigview_zoom(col, 1, 0);
+}
+
+static void pan_changed(GtkAdjustment *adj, GtkWidget *sigview)
+{
+       GObject *cel = g_object_get_data(G_OBJECT(sigview), "signalcel");
+       g_object_set(cel, "offset", (gint)gtk_adjustment_get_value(adj), NULL);
+       gtk_widget_queue_draw(sigview);
+}
+
+GtkWidget *sigview_init(void)
+{
+       GtkWidget *sw, *tv;
+       GtkTreeViewColumn *col;
+       GtkCellRenderer *cel;
+
+       sw = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+                               GTK_POLICY_ALWAYS, GTK_POLICY_AUTOMATIC);
+       tv = gtk_tree_view_new();
+       gtk_container_add(GTK_CONTAINER(sw), tv);
+       gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tv), FALSE);
+       g_object_set(G_OBJECT(tv), "reorderable", TRUE, NULL);
+
+       col = gtk_tree_view_column_new_with_attributes(NULL,
+                                       gtk_cell_renderer_text_new(),
+                                       "text", 0, "foreground", 1, NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tv), col);
+
+       cel = gtk_cell_renderer_signal_new();
+       g_object_set(G_OBJECT(cel), "ypad", 1, NULL);
+       g_signal_connect(tv, "scroll-event", G_CALLBACK(do_scroll_event), cel);
+       g_signal_connect(tv, "button-press-event", G_CALLBACK(do_button_event), cel);
+       g_signal_connect(tv, "button-release-event", G_CALLBACK(do_button_event), cel);
+       col = gtk_tree_view_column_new();
+       g_object_set_data(G_OBJECT(tv), "signalcol", col);
+       g_object_set_data(G_OBJECT(tv), "signalcel", cel);
+       gtk_tree_view_column_pack_start(col, cel, TRUE);
+       gtk_tree_view_column_set_cell_data_func(col, cel, format_func,
+                                       NULL, NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tv), col);
+       g_signal_connect_swapped(col, "notify::width",
+                                       G_CALLBACK(col_resized), tv);
+
+       siglist = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_STRING,
+                                       G_TYPE_INT);
+       gtk_tree_view_set_model(GTK_TREE_VIEW(tv), GTK_TREE_MODEL(siglist));
+
+       GtkObject *pan = gtk_adjustment_new(0, 0, 0, 1, 1, 1);
+       g_object_set_data(G_OBJECT(tv), "hadj", pan);
+       gtk_range_set_adjustment(GTK_RANGE(GTK_SCROLLED_WINDOW(sw)->hscrollbar),
+                               GTK_ADJUSTMENT(pan));
+       g_signal_connect(pan, "value-changed", G_CALLBACK(pan_changed), tv);
+       
+       return sw;
+}
+
+static GArray *summarize(GArray *in, gdouble *scale)
+{
+       GArray *ret;
+       int skip = 1 / (*scale * 4);
+       guint64 i, j, k, l;
+       unsigned unitsize = g_array_get_element_size(in);
+       uint8_t s[unitsize];
+       uint8_t smask[unitsize];
+
+       g_return_val_if_fail(skip > 1, NULL);
+
+       ret = g_array_sized_new(FALSE, FALSE, unitsize, in->len / skip);
+       ret->len = in->len / skip;
+       *scale *= skip;
+
+       memset(s, 0, unitsize);
+       for (i = 0, k = 0; i < (in->len/unitsize); i += skip, k++) {
+               memset(smask, 0xFF, unitsize);
+               for (j = i; j < i+skip; j++) {
+                       for (l = 0; l < unitsize; l++) {
+                               uint8_t ns = (in->data[(j*unitsize)+l] ^ s[l]) & smask[l];
+                               /* ns is now bits we need to toggle */
+                               s[l] ^= ns;
+                               smask[l] &= ~ns;
+                       }
+               }
+               memcpy(&ret->data[k*unitsize], s, unitsize);
+       }
+       return ret;
+}
+
+void sigview_zoom(GtkWidget *sigview, gdouble zoom, gint offset)
+{
+       GObject *siglist;
+       GtkTreeViewColumn *col;
+       GtkCellRendererSignal *cel;
+       GtkAdjustment *adj;
+       /* data and scale refer to summary */
+       GArray *data;
+       gdouble scale;
+       /* rdata and rscale refer to complete data */
+       GArray *rdata;
+       gdouble *rscale;
+       gint ofs;
+       gint width;
+       guint nsamples;
+
+       /* This is so that sigview_zoom() may be called with pointer
+        * to the GtkTreeView or containing GtkScrolledWindow, as is the
+        * case when called from outside this module.
+        */
+       if (GTK_IS_SCROLLED_WINDOW(sigview))
+               sigview = gtk_bin_get_child(GTK_BIN(sigview));
+
+       g_return_if_fail(GTK_IS_TREE_VIEW(sigview));
+
+       col = g_object_get_data(G_OBJECT(sigview), "signalcol");
+       adj = g_object_get_data(G_OBJECT(sigview), "hadj");
+       width = gtk_tree_view_column_get_width(col);
+
+       siglist = G_OBJECT(gtk_tree_view_get_model(GTK_TREE_VIEW(sigview)));
+       rdata = g_object_get_data(siglist, "sampledata");
+       rscale = g_object_get_data(siglist, "rscale");
+       if (!rscale) {
+               rscale = g_malloc(sizeof(rscale));
+               *rscale = 1;
+               g_object_set_data(siglist, "rscale", rscale);
+       }
+       data = g_object_get_data(siglist, "summarydata");
+       if (!rdata)
+               return;
+       if (!data)
+               data = rdata;
+       nsamples = (rdata->len / g_array_get_element_size(rdata)) - 1;
+       if ((fabs(*rscale - (double)width/nsamples) < 1e-12) && (zoom < 1))
+               return;
+
+       cel = g_object_get_data(G_OBJECT(sigview), "signalcel");
+       g_object_get(cel, "scale", &scale, "offset", &ofs, NULL);
+
+       ofs += offset;
+               
+       scale *= zoom;
+       *rscale *= zoom;
+       ofs *= zoom;
+
+       ofs -= offset;
+
+       if (ofs < 0)
+               ofs = 0;
+
+       if (*rscale < (double)width/nsamples) {
+               *rscale = (double)width/nsamples;
+               scale = *rscale;
+               if (data && (data != rdata))
+                       g_array_free(data, TRUE);
+               data = rdata;
+       }
+
+       if (ofs > nsamples * *rscale - width)
+               ofs = nsamples * *rscale - width;
+
+       gtk_adjustment_configure(adj, ofs, 0, nsamples * *rscale, 
+                       width/16, width/2, width);
+
+       if (scale < 0.125) {
+               g_object_set_data(siglist,
+                       "summarydata", summarize(data, &scale));
+               if (data && (data != rdata))
+                       g_array_free(data, TRUE);
+       } else if ((scale > 1) && (*rscale < 1)) {
+               scale = *rscale;
+               g_object_set_data(siglist,
+                       "summarydata", summarize(rdata, &scale));
+               if (data && (data != rdata))
+                       g_array_free(data, TRUE);
+       }
+
+       g_object_set(cel, "scale", scale, "offset", ofs, NULL);
+       gtk_widget_queue_draw(GTK_WIDGET(sigview));
+}
+
diff --git a/toolbar.c b/toolbar.c
new file mode 100644 (file)
index 0000000..5a2d0a8
--- /dev/null
+++ b/toolbar.c
@@ -0,0 +1,618 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+
+#include <sigrok.h>
+
+#include <gtk/gtk.h>
+
+#include <stdlib.h>
+
+#include "sigrok-gtk.h"
+
+enum {
+       DEV_PROP_CAPABILITY,
+       DEV_PROP_TYPE,
+       DEV_PROP_SHORTNAME,
+       DEV_PROP_DESCRIPTION,
+       DEV_PROP_IS_TEXT,
+       DEV_PROP_TEXTVALUE,
+       DEV_PROP_BOOLVALUE,
+       MAX_DEV_PROP
+};
+
+static void prop_edited(GtkCellRendererText *cel, gchar *path, gchar *text,
+                       GtkListStore *props)
+{
+       (void)cel;
+
+       struct sr_device *device = g_object_get_data(G_OBJECT(props), "device");
+       GtkTreeIter iter;
+       int type, cap;
+       guint64 tmp_u64;
+       int ret = SR_ERR;
+
+       gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(props), &iter, path);
+       gtk_tree_model_get(GTK_TREE_MODEL(props), &iter,
+                                       DEV_PROP_CAPABILITY, &cap, 
+                                       DEV_PROP_TYPE, &type, -1);
+
+       switch (type) {
+       case SR_T_UINT64:
+               if (sr_parse_sizestring(text, &tmp_u64) != SR_OK)
+                       return;
+
+               ret = device->plugin->set_configuration(device->plugin_index,
+                               cap, &tmp_u64);
+               break;
+       case SR_T_CHAR:
+               ret = device->plugin-> set_configuration(device->plugin_index,
+                               cap, text);
+               break;
+       /* SR_T_BOOL will be handled by prop_toggled */
+       }
+
+       if (!ret)
+               gtk_list_store_set(props, &iter, DEV_PROP_TEXTVALUE, text, -1);
+}
+
+static void prop_toggled(GtkCellRendererToggle *cel, gchar *path,
+                       GtkListStore *props)
+{
+       struct sr_device *device = g_object_get_data(G_OBJECT(props), "device");
+       GtkTreeIter iter;
+       int type, cap;
+       int ret;
+       gboolean val;
+       gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(props), &iter, path);
+       gtk_tree_model_get(GTK_TREE_MODEL(props), &iter,
+                                       DEV_PROP_CAPABILITY, &cap, 
+                                       DEV_PROP_TYPE, &type, -1);
+
+       val = !gtk_cell_renderer_toggle_get_active(cel);
+       ret = device->plugin-> set_configuration(device->plugin_index, cap, 
+                                       GINT_TO_POINTER(val));
+
+       if (!ret)
+               gtk_list_store_set(props, &iter, DEV_PROP_BOOLVALUE, val, -1);
+}
+
+void dev_prop_bool_data_func(GtkCellLayout *cell_layout,
+                               GtkCellRenderer *cell,
+                               GtkTreeModel *tree_model,
+                               GtkTreeIter *iter,
+                               gpointer data)
+{
+       (void)cell_layout;
+       (void)data;
+
+       gboolean istext, val;
+       gtk_tree_model_get(tree_model, iter, 
+                               DEV_PROP_IS_TEXT, &istext, 
+                               DEV_PROP_BOOLVALUE, &val, -1);
+       g_object_set(G_OBJECT(cell), "visible", !istext, "active", val, NULL);
+}
+
+static void dev_set_options(GtkAction *action, GtkWindow *parent)
+{
+       (void)action;
+
+       struct sr_device *device = g_object_get_data(G_OBJECT(parent), "device");
+       if (!device)
+               return;
+
+       GtkWidget *dialog = gtk_dialog_new_with_buttons("Device Properties",
+                                       parent, GTK_DIALOG_MODAL,
+                                       GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                                       NULL);
+       GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+                               GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_widget_set_size_request(sw, 300, 200);
+       GtkWidget *tv = gtk_tree_view_new();
+       gtk_container_add(GTK_CONTAINER(sw), tv);
+       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), sw,
+                               TRUE, TRUE, 0);
+
+       /* Populate list store with config options */
+       GtkListStore *props = gtk_list_store_new(MAX_DEV_PROP, 
+                                       G_TYPE_INT, G_TYPE_INT,
+                                       G_TYPE_STRING, G_TYPE_STRING,
+                                       G_TYPE_BOOLEAN, G_TYPE_STRING,
+                                       G_TYPE_BOOLEAN);
+       gtk_tree_view_set_model(GTK_TREE_VIEW(tv), GTK_TREE_MODEL(props));
+       int *capabilities = device->plugin->get_capabilities();
+       int cap;
+       GtkTreeIter iter;
+       for (cap = 0; capabilities[cap]; cap++) {
+               struct sr_hwcap_option *hwo;
+               if (!(hwo = sr_find_hwcap_option(capabilities[cap])))
+                       continue;
+               gtk_list_store_append(props, &iter);
+               gtk_list_store_set(props, &iter, 
+                                       DEV_PROP_CAPABILITY, capabilities[cap],
+                                       DEV_PROP_TYPE, hwo->type,
+                                       DEV_PROP_SHORTNAME, hwo->shortname,
+                                       DEV_PROP_DESCRIPTION, hwo->description,
+                                       DEV_PROP_IS_TEXT, hwo->type != SR_T_BOOL,
+                                       -1);
+       }
+
+       /* Popup tooltop containing description if mouse hovers */
+       gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(tv), 
+                                       DEV_PROP_DESCRIPTION);
+
+       /* Save device with list so that property can be set by edited
+        * handler. */
+       g_object_set_data(G_OBJECT(props), "device", device);
+
+       /* Add columns to the tree view */
+       GtkTreeViewColumn *col;
+       col = gtk_tree_view_column_new_with_attributes("Property",
+                               gtk_cell_renderer_text_new(),
+                               "text", DEV_PROP_SHORTNAME, NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tv), col);
+       /* We pack both a text and toggle renderer.  Only one will be visible.
+        * depending on type.
+        */
+       GtkCellRenderer *cel = gtk_cell_renderer_text_new();
+       g_object_set(cel, "editable", TRUE, NULL);
+       g_signal_connect(cel, "edited", G_CALLBACK(prop_edited), props);
+       col = gtk_tree_view_column_new_with_attributes("Value",
+                               cel, "text", DEV_PROP_TEXTVALUE, 
+                               "visible", DEV_PROP_IS_TEXT, NULL);
+       cel = gtk_cell_renderer_toggle_new();
+       g_signal_connect(cel, "toggled", G_CALLBACK(prop_toggled), props);
+       gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(col), cel, TRUE);
+       gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(col), cel, 
+                               dev_prop_bool_data_func, NULL, NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tv), col);
+
+
+       gtk_widget_show_all(dialog);
+       gtk_dialog_run(GTK_DIALOG(dialog));
+
+       gtk_widget_destroy(dialog);
+}
+
+enum {
+       PROBE_NUMBER,
+       PROBE_ENABLED,
+       PROBE_NAME,
+       PROBE_TRIGGER,
+       MAX_PROBE
+};
+
+static void probe_toggled(GtkCellRenderer *cel, gchar *path,
+                       GtkTreeModel *probes)
+{
+       struct sr_device *device = g_object_get_data(G_OBJECT(probes), "device");
+       GtkTreeIter iter;
+       struct sr_probe *probe;
+       gint i;
+       gboolean en;
+
+       (void)cel;
+
+       gtk_tree_model_get_iter_from_string(probes, &iter, path);
+       gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, 
+                                       PROBE_ENABLED, &en, -1);
+       probe = sr_device_probe_find(device, i);
+       probe->enabled = !en;
+       gtk_list_store_set(GTK_LIST_STORE(probes), &iter, 
+                                       PROBE_ENABLED, probe->enabled, -1);
+}
+
+static void probe_named(GtkCellRendererText *cel, gchar *path, gchar *text,
+                       GtkTreeModel *probes)
+{
+       struct sr_device *device = g_object_get_data(G_OBJECT(probes), "device");
+       GtkTreeIter iter;
+       gint i;
+
+       (void)cel;
+
+       gtk_tree_model_get_iter_from_string(probes, &iter, path);
+       gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, -1);
+       sr_device_probe_name(device, i, text);
+       gtk_list_store_set(GTK_LIST_STORE(probes), &iter, PROBE_NAME, text, -1);
+}
+
+static void probe_trigger_set(GtkCellRendererText *cel, gchar *path, 
+                       gchar *text, GtkTreeModel *probes)
+{
+       struct sr_device *device = g_object_get_data(G_OBJECT(probes), "device");
+       GtkTreeIter iter;
+       gint i;
+
+       (void)cel;
+
+       gtk_tree_model_get_iter_from_string(probes, &iter, path);
+       gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, -1);
+       sr_device_trigger_set(device, i, text);
+       gtk_list_store_set(GTK_LIST_STORE(probes), &iter, 
+                                       PROBE_TRIGGER, text, -1);
+}
+
+static void dev_set_probes(GtkAction *action, GtkWindow *parent)
+{
+       (void)action;
+
+       struct sr_device *device = g_object_get_data(G_OBJECT(parent), "device");
+       if (!device)
+               return;
+
+       GtkWidget *dialog = gtk_dialog_new_with_buttons("Configure Probes",
+                                       parent, GTK_DIALOG_MODAL,
+                                       GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                                       NULL);
+       GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+                               GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_widget_set_size_request(sw, 300, 200);
+       GtkWidget *tv = gtk_tree_view_new();
+       gtk_container_add(GTK_CONTAINER(sw), tv);
+       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), sw,
+                               TRUE, TRUE, 0);
+
+       /* Populate list store with probe options */
+       GtkListStore *probes = gtk_list_store_new(MAX_PROBE, 
+                                       G_TYPE_INT, G_TYPE_BOOLEAN,
+                                       G_TYPE_STRING, GTK_TYPE_STRING);
+       gtk_tree_view_set_model(GTK_TREE_VIEW(tv), GTK_TREE_MODEL(probes));
+       GtkTreeIter iter;
+       GSList *p;
+       int i;
+       for (p = device->probes, i = 1; p; p = g_slist_next(p), i++) {
+               struct sr_probe *probe = p->data;
+               gtk_list_store_append(probes, &iter);
+               gtk_list_store_set(probes, &iter, PROBE_NUMBER, i,
+                                       PROBE_ENABLED, probe->enabled, 
+                                       PROBE_NAME, probe->name, 
+                                       PROBE_TRIGGER, probe->trigger, 
+                                       -1);
+       }
+
+       /* Save device with list so that property can be set by edited
+        * handler. */
+       g_object_set_data(G_OBJECT(probes), "device", device);
+
+       /* Add columns to the tree view */
+       GtkTreeViewColumn *col;
+       col = gtk_tree_view_column_new_with_attributes("Probe",
+                               gtk_cell_renderer_text_new(),
+                               "text", PROBE_NUMBER, NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tv), col);
+       GtkCellRenderer *cel = gtk_cell_renderer_toggle_new();
+       g_object_set(cel, "activatable", TRUE, NULL);
+       g_signal_connect(cel, "toggled", G_CALLBACK(probe_toggled), probes);
+       col = gtk_tree_view_column_new_with_attributes("En",
+                               cel, "active", PROBE_ENABLED, NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tv), col);
+       cel = gtk_cell_renderer_text_new();
+       g_object_set(cel, "editable", TRUE, NULL);
+       g_signal_connect(cel, "edited", G_CALLBACK(probe_named), probes);
+       col = gtk_tree_view_column_new_with_attributes("Signal Name", cel, 
+                                       "text", PROBE_NAME, 
+                                       "sensitive", PROBE_ENABLED, NULL);
+       gtk_tree_view_column_set_resizable(col, TRUE);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tv), col);
+       cel = gtk_cell_renderer_text_new();
+       g_object_set(cel, "editable", TRUE, NULL);
+       g_signal_connect(cel, "edited", G_CALLBACK(probe_trigger_set), probes);
+       col = gtk_tree_view_column_new_with_attributes("Trigger", cel, 
+                                       "text", PROBE_TRIGGER, 
+                                       "sensitive", PROBE_ENABLED, NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tv), col);
+
+       gtk_widget_show_all(dialog);
+       gtk_dialog_run(GTK_DIALOG(dialog));
+
+       gtk_widget_destroy(dialog);
+}
+
+static void capture_run(GtkAction *action, GObject *parent)
+{
+       (void)action;
+
+       struct sr_device *device = g_object_get_data(G_OBJECT(parent), "device");
+       GtkEntry *timesamples = g_object_get_data(parent, "timesamples");
+       GtkComboBox *timeunit = g_object_get_data(parent, "timeunit");
+       gint i = gtk_combo_box_get_active(timeunit);
+       guint64 time_msec = 0;
+       guint64 limit_samples = 0;
+       
+       switch (i) {
+       case 0: /* Samples */
+               sr_parse_sizestring(gtk_entry_get_text(timesamples), 
+                               &limit_samples);
+               break;
+       case 1: /* Milliseconds */
+               time_msec = strtoull(gtk_entry_get_text(timesamples), NULL, 10);
+               break;
+       case 2: /* Seconds */
+               time_msec = strtoull(gtk_entry_get_text(timesamples), NULL, 10)
+                               * 1000;
+               break;
+       }
+
+       if (time_msec) {
+               int *capabilities = device->plugin->get_capabilities();
+               if (sr_find_hwcap(capabilities, SR_HWCAP_LIMIT_MSEC)) {
+                       if (device->plugin->set_configuration(device->plugin_index,
+                                                       SR_HWCAP_LIMIT_MSEC,
+                                                       &time_msec) != SR_OK) {
+                               g_critical("Failed to configure time limit.");
+                               sr_session_destroy();
+                               return;
+                       }
+               } else {
+                       /* time limit set, but device doesn't support this...
+                        * convert to samples based on the samplerate.
+                        */
+                       limit_samples = 0;
+                       if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
+                               guint64 tmp_u64;
+                               tmp_u64 = *((uint64_t *) device->plugin->get_device_info(
+                                                       device->plugin_index,
+                                                       SR_DI_CUR_SAMPLERATE));
+                               limit_samples = tmp_u64 * time_msec / (uint64_t) 1000;
+                       }
+                       if (limit_samples == 0) {
+                               g_critical("Not enough time at this samplerate.");
+                               return;
+                       }
+
+                       if (device->plugin->set_configuration(device->plugin_index,
+                                               SR_HWCAP_LIMIT_SAMPLES,
+                                               &limit_samples) != SR_OK) {
+                               g_critical("Failed to configure time-based sample limit.");
+                               return;
+                       }
+               }
+       }
+       if (limit_samples) {
+               if (device->plugin->set_configuration(device->plugin_index,
+                                               SR_HWCAP_LIMIT_SAMPLES,
+                                               &limit_samples) != SR_OK) {
+                       g_critical("Failed to configure sample limit.");
+                       return;
+               }
+       }
+
+       if (device->plugin->set_configuration(device->plugin_index,
+                 SR_HWCAP_PROBECONFIG, (char *)device->probes) != SR_OK) {
+               printf("Failed to configure probes.\n");
+               sr_session_destroy();
+               return;
+       }
+
+       if (sr_session_start() != SR_OK) {
+               g_critical("Failed to start session.");
+               return;
+       }
+
+       sr_session_run();
+}
+
+static void dev_file_open(GtkAction *action, GtkWindow *parent)
+{
+       (void)action;
+       static GtkWidget *dialog;
+       const gchar *filename;
+
+       if(!dialog)
+               dialog = gtk_file_chooser_dialog_new("Open", parent,
+                               GTK_FILE_CHOOSER_ACTION_OPEN,
+                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                               GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
+       g_signal_connect(dialog, "delete-event",
+                                       G_CALLBACK(gtk_widget_hide_on_delete),
+                                       NULL);
+
+       if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) {
+               /* Dialog was cancelled or closed */
+               gtk_widget_hide(dialog);
+               return;
+       }
+
+       gtk_widget_hide(dialog);
+
+       filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+       load_input_file(parent, filename);
+}
+
+void toggle_log(GtkToggleAction *action, GObject *parent)
+{
+       GtkWidget *log = g_object_get_data(parent, "logview");
+       gtk_widget_set_visible(log, gtk_toggle_action_get_active(action));
+}
+
+void zoom_in(GtkAction *action, GObject *parent)
+{
+       (void)action;
+
+       GtkWidget *sigview = g_object_get_data(parent, "sigview");
+       sigview_zoom(sigview, 1.5, 0);
+}
+
+void zoom_out(GtkAction *action, GObject *parent)
+{
+       (void)action;
+
+       GtkWidget *sigview = g_object_get_data(parent, "sigview");
+       sigview_zoom(sigview, 1/1.5, 0);
+}
+
+void zoom_fit(GtkAction *action, GObject *parent)
+{
+       (void)action;
+
+       GtkWidget *sigview = g_object_get_data(parent, "sigview");
+       sigview_zoom(sigview, 0, 0);
+}
+
+static const GtkActionEntry action_items[] = {
+       /* name, stock-id, label, accel, tooltip, callback */
+       {"DevMenu", NULL, "_Device", NULL, NULL, NULL},
+       {"DevOpen", GTK_STOCK_OPEN, "_Open", "<control>O",
+               "Open Session File", G_CALLBACK(dev_file_open)},
+       {"DevSelectMenu", NULL, "Select Device", NULL, NULL, NULL},
+       {"DevRescan", GTK_STOCK_REFRESH, "_Rescan", "<control>R",
+               "Rescan for LA devices", G_CALLBACK(dev_select_rescan)},
+       {"DevProperties", GTK_STOCK_PROPERTIES, "_Properties", "<control>P",
+               "Configure LA", G_CALLBACK(dev_set_options)},
+       {"DevProbes", GTK_STOCK_COLOR_PICKER, "_Probes", "<control>O",
+               "Configure Probes", G_CALLBACK(dev_set_probes)},
+       {"DevAcquire", GTK_STOCK_EXECUTE, "_Acquire", "<control>A",
+               "Acquire Samples", G_CALLBACK(capture_run)},
+       {"Exit", GTK_STOCK_QUIT, "E_xit", "<control>Q",
+               "Exit the program", G_CALLBACK(gtk_main_quit) },
+
+       {"ViewMenu", NULL, "_View", NULL, NULL, NULL},
+       {"ViewZoomIn", GTK_STOCK_ZOOM_IN, "Zoom _In", "<control>z", NULL,
+               G_CALLBACK(zoom_in)},
+       {"ViewZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "<control><shift>Z",
+               NULL, G_CALLBACK(zoom_out)},
+       {"ViewZoomFit", GTK_STOCK_ZOOM_FIT, NULL, NULL,
+               NULL, G_CALLBACK(zoom_fit)},
+
+       {"HelpMenu", NULL, "_Help", NULL, NULL, NULL},
+       {"HelpWiki", GTK_STOCK_ABOUT, "Sigrok _Wiki", NULL, NULL,
+               G_CALLBACK(help_wiki)},
+       {"HelpAbout", GTK_STOCK_ABOUT, "_About", NULL, NULL,
+               G_CALLBACK(help_about)},
+};
+
+static const GtkToggleActionEntry toggle_items[] = {
+       /* name, stock-id, label, accel, tooltip, callback, isactive */
+       {"ViewLog", GTK_STOCK_JUSTIFY_LEFT, "_Log", NULL, NULL,
+               G_CALLBACK(toggle_log), FALSE},
+};
+
+static const char ui_xml[] =
+"<ui>"
+"  <menubar>"
+"    <menu action='DevMenu'>"
+"      <menuitem action='DevOpen'/>"
+"      <separator/>"
+"      <menu action='DevSelectMenu'>"
+"        <separator/>"
+"        <menuitem action='DevRescan'/>"
+"      </menu>"
+"      <menuitem action='DevProperties'/>"
+"      <menuitem action='DevProbes'/>"
+"      <separator/>"
+"      <menuitem action='DevAcquire'/>"
+"      <separator/>"
+"      <menuitem action='Exit'/>"
+"    </menu>"
+"    <menu action='ViewMenu'>"
+"      <menuitem action='ViewZoomIn'/>"
+"      <menuitem action='ViewZoomOut'/>"
+"      <menuitem action='ViewZoomFit'/>"
+"      <separator/>"
+"      <menuitem action='ViewLog'/>"
+"    </menu>"
+"    <menu action='HelpMenu'>"
+"      <menuitem action='HelpWiki'/>"
+"      <menuitem action='HelpAbout'/>"
+"    </menu>"
+"  </menubar>"
+"  <toolbar>"
+"    <placeholder name='DevSelect'/>"
+"    <toolitem action='DevRescan'/>"
+"    <toolitem action='DevProperties'/>"
+"    <toolitem action='DevProbes'/>"
+"    <separator/>"
+"    <placeholder name='DevSampleCount' />"
+"    <toolitem action='DevAcquire'/>"
+"    <separator/>"
+"    <toolitem action='ViewZoomIn'/>"
+"    <toolitem action='ViewZoomOut'/>"
+"    <toolitem action='ViewZoomFit'/>"
+"    <separator/>"
+"  </toolbar>"
+"</ui>";
+
+GtkWidget *toolbar_init(GtkWindow *parent)
+{
+       GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
+       GtkToolbar *toolbar;
+       GtkActionGroup *ag = gtk_action_group_new("Actions");
+       gtk_action_group_add_actions(ag, action_items,
+                                       G_N_ELEMENTS(action_items), parent);
+       gtk_action_group_add_toggle_actions(ag, toggle_items,
+                                       G_N_ELEMENTS(toggle_items), parent);
+
+       GtkUIManager *ui = gtk_ui_manager_new();
+       g_object_set_data(G_OBJECT(parent), "ui_manager", ui);
+       gtk_ui_manager_insert_action_group(ui, ag, 0);
+       GtkAccelGroup *accel = gtk_ui_manager_get_accel_group(ui);
+       gtk_window_add_accel_group(parent, accel);
+
+       GError *error = NULL;
+        if (!gtk_ui_manager_add_ui_from_string (ui, ui_xml, -1, &error)) {
+                g_message ("building menus failed: %s", error->message);
+                g_error_free (error);
+                exit (-1);
+        }
+
+       GtkWidget *menubar = gtk_ui_manager_get_widget(ui, "/menubar");
+       gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(menubar), FALSE, TRUE, 0);
+       toolbar = GTK_TOOLBAR(gtk_ui_manager_get_widget(ui, "/toolbar"));
+       gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(toolbar), FALSE, TRUE, 0);
+
+       /* Device selection GtkComboBox */
+       GtkToolItem *toolitem = gtk_tool_item_new();
+       GtkWidget *align = gtk_alignment_new(0.5, 0.5, 2, 0);
+       GtkWidget *dev = dev_select_combo_box_new(parent);
+
+       gtk_container_add(GTK_CONTAINER(align), dev);
+       gtk_container_add(GTK_CONTAINER(toolitem), align);
+       gtk_toolbar_insert(toolbar, toolitem, 0);
+
+       /* Time/Samples entry */
+       toolitem = gtk_tool_item_new();
+       GtkWidget *timesamples = gtk_entry_new();
+       gtk_entry_set_text(GTK_ENTRY(timesamples), "100");
+       gtk_entry_set_alignment(GTK_ENTRY(timesamples), 1.0);
+       gtk_widget_set_size_request(timesamples, 100, -1);
+       gtk_container_add(GTK_CONTAINER(toolitem), timesamples);
+       gtk_toolbar_insert(toolbar, toolitem, 7);
+
+       /* Time unit combo box */
+       toolitem = gtk_tool_item_new();
+       align = gtk_alignment_new(0.5, 0.5, 2, 0);
+       GtkWidget *timeunit = gtk_combo_box_new_text();
+       gtk_combo_box_append_text(GTK_COMBO_BOX(timeunit), "samples");
+       gtk_combo_box_append_text(GTK_COMBO_BOX(timeunit), "ms");
+       gtk_combo_box_append_text(GTK_COMBO_BOX(timeunit), "s");
+       gtk_combo_box_set_active(GTK_COMBO_BOX(timeunit), 0);
+       gtk_container_add(GTK_CONTAINER(align), timeunit);
+       gtk_container_add(GTK_CONTAINER(toolitem), align);
+       gtk_toolbar_insert(toolbar, toolitem, 8);
+
+       g_object_set_data(G_OBJECT(parent), "timesamples", timesamples);
+       g_object_set_data(G_OBJECT(parent), "timeunit", timeunit);
+
+       return GTK_WIDGET(vbox);
+}
+