Ben Pfaff [Sun, 28 Oct 2012 20:01:47 +0000 (13:01 -0700)]
pspp-sheet-view: Make Shift+Tab select only one cell when switching rows.
Before this commit, Shift+Tab at the start of a row in the data sheet would
select both the new cell and the cell below it. After this commit, only
the new cell is selected, as one would expect.
Ben Pfaff [Thu, 25 Oct 2012 06:24:25 +0000 (23:24 -0700)]
gui: Make Tab, Shift+Tab skip row head and new-var columns in data sheet.
Before this commit, Tab and Shift+Tab acted just like Left and Right in
the data sheet, that is, they visit every column except the row head
column and always stay on the same row. After this commit, Tab and
Shift+Tab skip the row head and new-variable columns. Also, Tab at the
end of a row goes to the beginning of the next row, and Shift+Tab at the
beginning of a row goes to the end of the previous row.
Ben Pfaff [Sun, 14 Oct 2012 18:35:06 +0000 (11:35 -0700)]
psppire-data-sheet: Use specific functions instead of g_object_set().
Using particular functions seems less error-prone, since it avoids the
possibility of misspelling a property name or getting their values' types
wrong.
So what was happening was this: When the var-name was double-clicked, the view switched
from VarView to DataView as soon as event 4 (GDK_2BUTTON_PRESS) occured. Then event 5
(GDK_BUTTON_RELEASE) occured.
Now the PsppSheetView object is written such that, it decides to edit a cell, on button
release event. Hence, whichever cell the pointer happended to be in, when the user lifts
his finger after double clicking, starts to be edited.
This change ignores button release events on the object unless a corresponding button press
event was seen.
Ben Pfaff [Mon, 8 Oct 2012 19:06:11 +0000 (12:06 -0700)]
psppire-data-editor: Keep value labels setting across Windows|Split.
Before this commit, Windows|Split always turned off displaying value
labels in data sheet cells. This commit causes this setting to be
preserved across Windows|Split.
Ben Pfaff [Fri, 5 Oct 2012 04:22:42 +0000 (21:22 -0700)]
configure.ac: Increase pango minimum version from 1.20 to 1.22
Commit bd4d6e7453 (cairo: Avoid deprecated
pango_cairo_font_map_create_context().) added a dependency on pango
version 1.22 or later, but configure.ac only checked for version 1.20
or later. This commit fixes the discrepancy.
INSTALL already documented that Pango 1.22 or later was needed.
Ben Pfaff [Sun, 30 Sep 2012 19:29:33 +0000 (12:29 -0700)]
tests: Better isolate search text in test of error reporting.
Some GNU/Linux distributions print additional text on a segfault,
e.g. "Cannot exec debugger: No such file or directory", which this
test was seeing in output and interpreting as a failed test. This
commit fixes the problem by ignoring text up to the ***** line that
marks the start of the expected output.
Ben Pfaff [Wed, 26 Sep 2012 04:18:32 +0000 (21:18 -0700)]
Suppress GCC 4.7 warnings by changes to code that make it less clear.
I'm not entirely happy with these changes, because they make the code
slightly less obvious. However, it's still not really bad code, and
it's convenient to have a warning-free build.
Ben Pfaff [Wed, 26 Sep 2012 00:09:47 +0000 (17:09 -0700)]
gnumeric-reader: Add cast to suppress warning.
This suppresses a GCC warning for a mismatch between
xmlInputCloseCallback, which takes a "void *" parameter, and
gzclose(), which takes a "gzFile" (which is "struct gzFile_s *").
This came up with an upgrade from "squeeze" to "wheezy". I assume
that a gzclose prototype became visible or that gzFile changed away
from "void *".
An alternative would be to write a trampoline to just transform one
pointer type to the other, but the xmlReaderForIO() invocation
already has one function cast so a second cast doesn't make it much
worse.
Pango 1.30 that is in Debian "wheezy" has marked this function as
deprecated. The replacement pango_font_map_create_context() was
introduced in Pango 1.22, which was also in Debian "squeeze" (which
had Pango 1.28), so it seems safe to switch without worrying about
a Pango version check.
Ben Pfaff [Tue, 25 Sep 2012 22:36:50 +0000 (15:36 -0700)]
Remove variables assigned to but never used.
Each of the variables removed here was assigned a value that was
never used, the assignment didn't have any useful side effects, and
I don't see anything that the variable should have been used for.
Ben Pfaff [Tue, 25 Sep 2012 22:14:50 +0000 (15:14 -0700)]
expressions: Fix coercion of numbers to booleans at top level.
The check for the expected type in type_check() used the wrong
constant (a node type instead of an expression type) and so the
"if" test was never true. Also, OP_NUM_TO_BOOLEAN is binary, not
unary, so fixing just the test caused an assertion failure.
John Darrington [Thu, 20 Sep 2012 09:22:12 +0000 (11:22 +0200)]
src/data/data-out.c: Added assertion to catch negative values
If the contents of string does not contain a '.', then integer_digits
will end up negative, thus causing a crash later. This change adds
an assertion to catch this condition and thus make the diagnosis easier
should it ever occur.
John Darrington [Wed, 12 Sep 2012 07:26:21 +0000 (09:26 +0200)]
Perl Module: Avoid forcing scalar value into a pointer.
The code fragment: struct dictionary *dict = (void *) SvIV (dict_sv);
is dangerous. This fix uses the properl Perl XS mechanism to get
the pointer and the scalar associated with the dictionary.
Ben Pfaff [Mon, 3 Sep 2012 05:21:09 +0000 (22:21 -0700)]
psppire-cell-renderer: Fix behavior of repeated clicks on a button.
I'm not sure why I thought this code was necessary. Removing it
fixes the problem, which John Darrington reported as:
1. Create or load a dataset with one or more variables.
2. Switch to the variable sheet.
3. Click on one of the in-cell buttons (for example) Value Labels.
4. After the dialog box appears, cancel it with the cancel button.
5. The dialog closes, and the button which invoked it, now has the
focus. However clicking on that button again refuses to bring the
dialog back. One has to move off the button and onto the cell
background.
Ben Pfaff [Sun, 2 Sep 2012 18:07:59 +0000 (11:07 -0700)]
psppire-var-sheet: Allow adjusting width of string variables.
John Darrington pointed out that the "width" column in the variable
sheet didn't allow the width to be modified with a spin button for
string variables, as it did for numeric variables. This commit
fixes the problem.
The reordering in on_var_column_edited() is necessary because the
print format of a string variable can't be changed to a different
width before changing the variable's width. (The change from
var_set_print_format() to var_set_both_formats() is not
necessary. It is for consistency with changing variable type and
format via the var-type-dialog.)
Ben Pfaff [Mon, 20 Aug 2012 07:00:33 +0000 (00:00 -0700)]
sys-file-reader: Fix setjmp() technicality.
The C standards say that the compiler is allowed to optimize away
changes to local variables within a function between a call to
setjmp() and a later call to longjmp(), unless the local variables
are volatile-qualified.
The 'info' local variable in sfm_open_reader() fits this
description but wasn't volatile-qualified. This commit fixes that,
even though my compiler didn't in fact seem to have a problem with
the previous version.
Ben Pfaff [Mon, 20 Aug 2012 06:59:47 +0000 (23:59 -0700)]
sys-file-reader: Fix memory leak.
The C standards say that the compiler is allowed to optimize away
changes to local variables within a function between a call to
setjmp() and a later call to longjmp(), unless the local variables
are volatile-qualified.
The 'dict' local variable in sfm_open_reader() fits this
description but wasn't volatile-qualified. GCC in fact optimized
out the changes on my system, and this commit fixes that.
Ben Pfaff [Sun, 19 Aug 2012 20:18:56 +0000 (13:18 -0700)]
psppire-cell-renderer-button: Avoid use-after-free with popup dialog.
When gtk_button_clicked() on a PsppireCellRendererButton causes a
modal dialog to pop up, psppire_cell_renderer_button_initial_click()
only returns from gtk_button_clicked() after the button has already
been destroyed, which causes the g_object_steal_data() call to
remove the IDLE_ID_STRING to access freed memory. This commit fixes
the problem by calling g_object_steal_data() before
gtk_button_clicked().
If text_to_value() fails for low_val, then this code would still
destroy high_val, even though high_val hadn't been initialized,
thus accessing indeterminate data.
Ben Pfaff [Sun, 19 Aug 2012 17:30:36 +0000 (10:30 -0700)]
psppire-dialog: Add "acceptable" predicate.
PsppireDialog already has a validity predicate that allows a dialog
to easily disable "OK" and other buttons when the dialog has not
yet been completely filled. It should usually be obvious to the
user why this is the case.
The upcoming GObjectification of the missing value dialog calls for
a different kind of predicate, one where the reason is not obvious
to the user (typically because he has just made a typo or does not
understand a variable's format). In this case, the user needs more
feedback, such as a message explaining the problem.
This commit therefore introduces a second kind of predicate, the
"accept" predicate. This predicate is only checked when the user
clicks on the "OK" button.
Ben Pfaff [Thu, 9 Aug 2012 06:27:32 +0000 (23:27 -0700)]
var-type-dialog: Convert to a GObject.
The one issue I can't figure out is why this changes the look of
the dialog box so that its height is the total height of all of
the widgets in the "middlebox", rather than the maximum height
actually needed.
Ben Pfaff [Wed, 1 Aug 2012 05:55:30 +0000 (22:55 -0700)]
ods-reader: Fix ods_file_casereader_destroy() call in open function.
zreader is a "struct zip_reader *" but ods_file_casereader_destroy()
takes a "struct casereader *". However ods_file_casereader_destroy()
doesn't actually use that argument so we might as well pass NULL.
Ben Pfaff [Mon, 30 Jul 2012 06:56:09 +0000 (23:56 -0700)]
var-type-dialog: Change entries to spin buttons, add validation.
The GtkEntry boxes used for entering and displaying width and
decimal places didn't do any validation that the width and decimal
places were valid for the selected format type, so it was possible
to enter values that couldn't actually be used. This commit changes
the GtkEntry boxes into GtkSpinButton widgets that, as a side
effect, validate correct values through their attached
GtkAdjustments. This is not just safer but easier to use.
Ben Pfaff [Sat, 28 Jul 2012 21:18:40 +0000 (14:18 -0700)]
var-type-dialog: Reduce redundancy.
var_type_dialog_set_state() and on_toggle_2() had considerable
redundant code. This reduces it by adding a new function
on_active_button_change() that generalizes the two functions. I
also personally found the previous way of showing and hiding widgets
to be hard to follow; I think that the bitmap approach used here
is more straightforward.
This also consolidates the two separate signal handlers for each
button into one, and replaces the similar functions
select_treeview_from_format() and select_treeview_from_format_type()
by three functions find_format(), find_format_type(), and
select_treeview_at_index() that total less code.
Ben Pfaff [Fri, 27 Jul 2012 06:21:54 +0000 (23:21 -0700)]
var-type-dialog: Properly adjust formats when switching buttons.
The var-type-dialog based the default new format on the variable's
existing format when a button was clicked, and attempted to adjust
the width and decimals into valid range, but the adjustment wasn't
always correct, so in some cases it could pick an invalid format.
This commit uses fmt_fix_output() instead, which will always choose
a valid output format.