nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Adopt C99 <stdbool.h>'s true/false.

Browse Source 
This commit includes <stdbool.h> from defs.h and deletes my
traditional definitions of TRUE and FALSE, but other than that, it's a
100% mechanical search-and-replace transforming all uses of TRUE and
FALSE into the C99-standardised lowercase spellings.

No actual types are changed in this commit; that will come next. This
is just getting the noise out of the way, so that subsequent commits
can have a higher proportion of signal.
This commit is contained in:
Simon Tatham
2018-10-29 19:50:29 +00:00
parent a647f2ba11
commit a6f1709c2f
127 changed files with 1994 additions and 2012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unix/gtkapp.c
View File

@ -88,7 +88,7 @@ https://wiki.gnome.org/Projects/GTK%2B/OSX/Bundling has some links.
char *x_get_default(const char *key) { return NULL; }
const int buildinfo_gtk_relevant = TRUE;
const int buildinfo_gtk_relevant = true;
#if !GTK_CHECK_VERSION(3,0,0)
/* This front end only works in GTK 3. If that's not what we've got,
@ -275,7 +275,7 @@ void window_setup_error(const char *errmsg)
create_message_box(NULL, "Error creating session window", errmsg,
string_width("Some sort of fiddly error message that "
"might be technical"),
TRUE, &buttons_ok, window_setup_error_callback, NULL);
true, &buttons_ok, window_setup_error_callback, NULL);
}
static void activate(GApplication *app,
@ -319,7 +319,7 @@ int main(int argc, char **argv)
/* Call the function in ux{putty,pterm}.c to do app-type
* specific setup */
extern void setup(int);
setup(FALSE); /* FALSE means we are not a one-session process */
setup(false); /* false means we are not a one-session process */
}
if (argc > 1) {

50
unix/gtkask.c
View File

@ -122,7 +122,7 @@ static gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
} else {
#if GTK_CHECK_VERSION(2,0,0)
if (gtk_im_context_filter_keypress(ctx->imc, event))
return TRUE;
return true;
#endif
if (event->type == GDK_KEY_PRESS) {
@ -158,7 +158,7 @@ static gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
}
}
}
return TRUE;
return true;
}
#if GTK_CHECK_VERSION(2,0,0)
@ -177,7 +177,7 @@ static gint configure_area(GtkWidget *widget, GdkEventConfigure *event,
ctx->width = event->width;
ctx->height = event->height;
gtk_widget_queue_draw(widget);
return TRUE;
return true;
}
#ifdef DRAW_DEFAULT_CAIRO
@ -193,7 +193,7 @@ static void askpass_redraw_gdk(GdkWindow *win, struct drawing_area_ctx *ctx)
{
GdkGC *gc = gdk_gc_new(win);
gdk_gc_set_foreground(gc, &ctx->cols[ctx->state]);
gdk_draw_rectangle(win, gc, TRUE, 0, 0, ctx->width, ctx->height);
gdk_draw_rectangle(win, gc, true, 0, 0, ctx->width, ctx->height);
gdk_gc_unref(gc);
}
#endif
@ -203,7 +203,7 @@ static gint draw_area(GtkWidget *widget, cairo_t *cr, gpointer data)
{
struct drawing_area_ctx *ctx = (struct drawing_area_ctx *)data;
askpass_redraw_cairo(cr, ctx);
return TRUE;
return true;
}
#else
static gint expose_area(GtkWidget *widget, GdkEventExpose *event,
@ -219,7 +219,7 @@ static gint expose_area(GtkWidget *widget, GdkEventExpose *event,
askpass_redraw_gdk(gtk_widget_get_window(ctx->area), ctx);
#endif
return TRUE;
return true;
}
#endif
@ -245,7 +245,7 @@ static gboolean try_grab_keyboard(gpointer vctx)
ctx->seat = seat;
ret = gdk_seat_grab(seat, gdkw, GDK_SEAT_CAPABILITY_KEYBOARD,
TRUE, NULL, NULL, NULL, NULL);
true, NULL, NULL, NULL, NULL);
/*
* For some reason GDK 3.22 hides the GDK window as a side effect
@ -281,7 +281,7 @@ static gboolean try_grab_keyboard(gpointer vctx)
ret = gdk_device_grab(ctx->keyboard,
gtk_widget_get_window(ctx->dialog),
GDK_OWNERSHIP_NONE,
TRUE,
true,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
NULL,
GDK_CURRENT_TIME);
@ -290,7 +290,7 @@ static gboolean try_grab_keyboard(gpointer vctx)
* It's much simpler in GTK 1 and 2!
*/
ret = gdk_keyboard_grab(gtk_widget_get_window(ctx->dialog),
FALSE, GDK_CURRENT_TIME);
false, GDK_CURRENT_TIME);
#endif
if (ret != GDK_GRAB_SUCCESS)
goto fail;
@ -323,7 +323,7 @@ static gboolean try_grab_keyboard(gpointer vctx)
gtk_widget_queue_draw(ctx->drawingareas[i].area);
}
return FALSE;
return false;
fail:
/*
@ -347,7 +347,7 @@ static gboolean try_grab_keyboard(gpointer vctx)
} else {
g_timeout_add(1000/8, try_grab_keyboard, ctx);
}
return FALSE;
return false;
}
void realize(GtkWidget *widget, gpointer vctx)
@ -389,12 +389,12 @@ static const char *gtk_askpass_setup(struct askpass_ctx *ctx,
ctx->promptlabel = gtk_label_new(prompt_text);
align_label_left(GTK_LABEL(ctx->promptlabel));
gtk_widget_show(ctx->promptlabel);
gtk_label_set_line_wrap(GTK_LABEL(ctx->promptlabel), TRUE);
gtk_label_set_line_wrap(GTK_LABEL(ctx->promptlabel), true);
#if GTK_CHECK_VERSION(3,0,0)
gtk_label_set_width_chars(GTK_LABEL(ctx->promptlabel), 48);
#endif
our_dialog_add_to_content_area(GTK_WINDOW(ctx->dialog),
ctx->promptlabel, TRUE, TRUE, 0);
ctx->promptlabel, true, true, 0);
#if GTK_CHECK_VERSION(2,0,0)
ctx->imc = gtk_im_multicontext_new();
#endif
@ -406,7 +406,7 @@ static const char *gtk_askpass_setup(struct askpass_ctx *ctx,
ctx->cols[1].red = ctx->cols[1].green = ctx->cols[1].blue = 0;
ctx->cols[2].red = ctx->cols[2].green = ctx->cols[2].blue = 0x8000;
gdk_colormap_alloc_colors(ctx->colmap, ctx->cols, 2,
FALSE, TRUE, success);
false, true, success);
if (!success[0] || !success[1])
return "unable to allocate colours";
}
@ -426,7 +426,7 @@ static const char *gtk_askpass_setup(struct askpass_ctx *ctx,
* piece of template text. */
gtk_widget_set_size_request(ctx->drawingareas[i].area, 32, 32);
gtk_box_pack_end(action_area, ctx->drawingareas[i].area,
TRUE, TRUE, 5);
true, true, 5);
g_signal_connect(G_OBJECT(ctx->drawingareas[i].area),
"configure_event",
G_CALLBACK(configure_area),
@ -459,10 +459,10 @@ static const char *gtk_askpass_setup(struct askpass_ctx *ctx,
* the prompt label at random, and we'll use gtk_grab_add to
* ensure key events go to it.
*/
gtk_widget_set_sensitive(ctx->dialog, TRUE);
gtk_widget_set_sensitive(ctx->dialog, true);
#if GTK_CHECK_VERSION(2,0,0)
gtk_window_set_keep_above(GTK_WINDOW(ctx->dialog), TRUE);
gtk_window_set_keep_above(GTK_WINDOW(ctx->dialog), true);
#endif
/*
@ -503,14 +503,14 @@ static void gtk_askpass_cleanup(struct askpass_ctx *ctx)
static int setup_gtk(const char *display)
{
static int gtk_initialised = FALSE;
static int gtk_initialised = false;
int argc;
char *real_argv[3];
char **argv = real_argv;
int ret;
if (gtk_initialised)
return TRUE;
return true;
argc = 0;
argv[argc++] = dupstr("dummy");
@ -524,7 +524,7 @@ static int setup_gtk(const char *display)
return ret;
}
const int buildinfo_gtk_relevant = TRUE;
const int buildinfo_gtk_relevant = true;
char *gtk_askpass_main(const char *display, const char *wintitle,
const char *prompt, int *success)
@ -537,22 +537,22 @@ char *gtk_askpass_main(const char *display, const char *wintitle,
/* In case gtk_init hasn't been called yet by the program */
if (!setup_gtk(display)) {
*success = FALSE;
*success = false;
return dupstr("unable to initialise GTK");
}
if ((err = gtk_askpass_setup(ctx, wintitle, prompt)) != NULL) {
*success = FALSE;
*success = false;
return dupprintf("%s", err);
}
gtk_main();
gtk_askpass_cleanup(ctx);
if (ctx->passphrase) {
*success = TRUE;
*success = true;
return ctx->passphrase;
} else {
*success = FALSE;
*success = false;
return ctx->error_message;
}
}
@ -577,7 +577,7 @@ int main(int argc, char **argv)
gtk_init(&argc, &argv);
if (argc != 2) {
success = FALSE;
success = false;
ret = dupprintf("usage: %s <prompt text>", argv[0]);
} else {
srand(time(NULL));

37
unix/gtkcols.c
View File

@ -3,6 +3,7 @@
*/
#include <gtk/gtk.h>
#include "defs.h"
#include "gtkcompat.h"
#include "gtkcols.h"
@ -157,7 +158,7 @@ static void columns_class_init(ColumnsClass *klass)
static void columns_init(Columns *cols)
{
gtk_widget_set_has_window(GTK_WIDGET(cols), FALSE);
gtk_widget_set_has_window(GTK_WIDGET(cols), false);
cols->children = NULL;
cols->spacing = 0;
@ -222,7 +223,7 @@ static void columns_map(GtkWidget *widget)
g_return_if_fail(IS_COLUMNS(widget));
cols = COLUMNS(widget);
gtk_widget_set_mapped(GTK_WIDGET(cols), TRUE);
gtk_widget_set_mapped(GTK_WIDGET(cols), true);
for (children = cols->children;
children && (child = children->data);
@ -243,7 +244,7 @@ static void columns_unmap(GtkWidget *widget)
g_return_if_fail(IS_COLUMNS(widget));
cols = COLUMNS(widget);
gtk_widget_set_mapped(GTK_WIDGET(cols), FALSE);
gtk_widget_set_mapped(GTK_WIDGET(cols), false);
for (children = cols->children;
children && (child = children->data);
@ -285,9 +286,9 @@ static gint columns_expose(GtkWidget *widget, GdkEventExpose *event)
GList *children;
GdkEventExpose child_event;
g_return_val_if_fail(widget != NULL, FALSE);
g_return_val_if_fail(IS_COLUMNS(widget), FALSE);
g_return_val_if_fail(event != NULL, FALSE);
g_return_val_if_fail(widget != NULL, false);
g_return_val_if_fail(IS_COLUMNS(widget), false);
g_return_val_if_fail(event != NULL, false);
if (GTK_WIDGET_DRAWABLE(widget)) {
cols = COLUMNS(widget);
@ -304,7 +305,7 @@ static gint columns_expose(GtkWidget *widget, GdkEventExpose *event)
gtk_widget_event(child->widget, (GdkEvent *)&child_event);
}
}
return FALSE;
return false;
}
#endif
@ -438,7 +439,7 @@ void columns_set_cols(Columns *cols, gint ncols, const gint *percentages)
childdata->widget = NULL;
childdata->ncols = ncols;
childdata->percentages = g_new(gint, ncols);
childdata->force_left = FALSE;
childdata->force_left = false;
for (i = 0; i < ncols; i++)
childdata->percentages[i] = percentages[i];
@ -459,7 +460,7 @@ void columns_add(Columns *cols, GtkWidget *child,
childdata->widget = child;
childdata->colstart = colstart;
childdata->colspan = colspan;
childdata->force_left = FALSE;
childdata->force_left = false;
childdata->same_height_as = NULL;
childdata->percentages = NULL;
@ -506,7 +507,7 @@ void columns_force_left_align(Columns *cols, GtkWidget *widget)
child = columns_find_child(cols, widget);
g_return_if_fail(child != NULL);
child->force_left = TRUE;
child->force_left = true;
if (gtk_widget_get_visible(widget))
gtk_widget_queue_resize(GTK_WIDGET(cols));
}
@ -563,14 +564,14 @@ static gint columns_focus(FOCUS_METHOD_SUPERCLASS *super, GtkDirectionType dir)
GList *pos;
GtkWidget *focuschild;
g_return_val_if_fail(super != NULL, FALSE);
g_return_val_if_fail(IS_COLUMNS(super), FALSE);
g_return_val_if_fail(super != NULL, false);
g_return_val_if_fail(IS_COLUMNS(super), false);
cols = COLUMNS(super);
if (!gtk_widget_is_drawable(GTK_WIDGET(cols)) ||
!gtk_widget_is_sensitive(GTK_WIDGET(cols)))
return FALSE;
return false;
if (!gtk_widget_get_can_focus(GTK_WIDGET(cols)) &&
(dir == GTK_DIR_TAB_FORWARD || dir == GTK_DIR_TAB_BACKWARD)) {
@ -593,16 +594,16 @@ static gint columns_focus(FOCUS_METHOD_SUPERCLASS *super, GtkDirectionType dir)
GTK_IS_CONTAINER(child) &&
!gtk_widget_has_focus(child)) {
if (CHILD_FOCUS(child, dir))
return TRUE;
return true;
}
}
} else if (gtk_widget_is_drawable(child)) {
if (GTK_IS_CONTAINER(child)) {
if (CHILD_FOCUS(child, dir))
return TRUE;
return true;
} else if (gtk_widget_get_can_focus(child)) {
gtk_widget_grab_focus(child);
return TRUE;
return true;
}
}
@ -612,7 +613,7 @@ static gint columns_focus(FOCUS_METHOD_SUPERCLASS *super, GtkDirectionType dir)
pos = pos->prev;
}
return FALSE;
return false;
} else
return columns_inherited_focus(super, dir);
}
@ -668,7 +669,7 @@ static gint columns_compute_width(Columns *cols, widget_dim_fn_t get_width)
printf("label %p '%s' wrap=%s: ", child->widget,
gtk_label_get_text(GTK_LABEL(child->widget)),
(gtk_label_get_line_wrap(GTK_LABEL(child->widget))
? "TRUE" : "FALSE"));
? "true" : "false"));
else
printf("widget %p: ", child->widget);
{

14
unix/gtkcomm.c
View File

@ -88,7 +88,7 @@ gboolean fd_input_func(GIOChannel *source, GIOCondition condition,
if (condition & G_IO_OUT)
select_result(sourcefd, 2);
return TRUE;
return true;
}
#else
void fd_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
@ -173,11 +173,11 @@ static gint timer_trigger(gpointer data)
}
/*
* Returning FALSE means 'don't call this timer again', which
* Returning false means 'don't call this timer again', which
* _should_ be redundant given that we removed it above, but just
* in case, return FALSE anyway.
* in case, return false anyway.
*/
return FALSE;
return false;
}
void timer_change_notify(unsigned long next)
@ -215,10 +215,10 @@ static gint idle_toplevel_callback_func(gpointer data)
*/
if (!toplevel_callback_pending() && idle_fn_scheduled) {
g_source_remove(toplevel_callback_idle_id);
idle_fn_scheduled = FALSE;
idle_fn_scheduled = false;
}
return TRUE;
return true;
}
static void notify_toplevel_callback(void *vctx)
@ -226,7 +226,7 @@ static void notify_toplevel_callback(void *vctx)
if (!idle_fn_scheduled) {
toplevel_callback_idle_id =
g_idle_add(idle_toplevel_callback_func, NULL);
idle_fn_scheduled = TRUE;
idle_fn_scheduled = true;
}
}

2
unix/gtkcompat.h
View File

@ -200,7 +200,7 @@
#if GTK_CHECK_VERSION(3,0,0)
#define gtk_hseparator_new() gtk_separator_new(GTK_ORIENTATION_HORIZONTAL)
/* Fortunately, my hboxes and vboxes never actually set homogeneous to
* TRUE, so I can just wrap these deprecated constructors with a macro
* true, so I can just wrap these deprecated constructors with a macro
* without also having to arrange a call to gtk_box_set_homogeneous. */
#define gtk_hbox_new(homogeneous, spacing) \
gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing)

166
unix/gtkdlg.c
View File

@ -197,7 +197,7 @@ static void dlg_init(struct dlgparam *dp)
{
dp->byctrl = newtree234(uctrl_cmp_byctrl);
dp->bywidget = newtree234(uctrl_cmp_bywidget);
dp->coloursel_result.ok = FALSE;
dp->coloursel_result.ok = false;
dp->window = dp->cancelbutton = NULL;
#if !GTK_CHECK_VERSION(2,0,0)
dp->treeitems = NULL;
@ -265,7 +265,7 @@ void dlg_radiobutton_set(union control *ctrl, dlgparam *dp, int which)
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(uc->ctrl->generic.type == CTRL_RADIO);
assert(uc->buttons != NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(uc->buttons[which]), TRUE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(uc->buttons[which]), true);
}
int dlg_radiobutton_get(union control *ctrl, dlgparam *dp)
@ -790,17 +790,17 @@ void dlg_listbox_select(union control *ctrl, dlgparam *dp, int index)
items = gtk_container_children(GTK_CONTAINER(uc->list));
nitems = g_list_length(items);
if (nitems > 0) {
int modified = FALSE;
int modified = false;
g_list_free(items);
newtop = uc->adj->lower +
(uc->adj->upper - uc->adj->lower) * index / nitems;
newbot = uc->adj->lower +
(uc->adj->upper - uc->adj->lower) * (index+1) / nitems;
if (uc->adj->value > newtop) {
modified = TRUE;
modified = true;
uc->adj->value = newtop;
} else if (uc->adj->value < newbot - uc->adj->page_size) {
modified = TRUE;
modified = true;
uc->adj->value = newbot - uc->adj->page_size;
}
if (modified)
@ -824,7 +824,7 @@ void dlg_listbox_select(union control *ctrl, dlgparam *dp, int index)
path = gtk_tree_path_new_from_indices(index, -1);
gtk_tree_selection_select_path(treesel, path);
gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(uc->treeview),
path, NULL, FALSE, 0.0, 0.0);
path, NULL, false, 0.0, 0.0);
gtk_tree_path_free(path);
return;
}
@ -1063,7 +1063,7 @@ void dlg_error_msg(dlgparam *dp, const char *msg)
create_message_box(
dp->window, "Error", msg,
string_width("Some sort of text about a config-box error message"),
FALSE, &buttons_ok, trivial_post_dialog_fn, NULL);
false, &buttons_ok, trivial_post_dialog_fn, NULL);
}
/*
@ -1104,7 +1104,7 @@ void dlg_coloursel_start(union control *ctrl, dlgparam *dp, int r, int g, int b)
GtkWidget *coloursel =
gtk_color_chooser_dialog_new("Select a colour",
GTK_WINDOW(dp->window));
gtk_color_chooser_set_use_alpha(GTK_COLOR_CHOOSER(coloursel), FALSE);
gtk_color_chooser_set_use_alpha(GTK_COLOR_CHOOSER(coloursel), false);
#else
GtkWidget *okbutton, *cancelbutton;
GtkWidget *coloursel =
@ -1112,12 +1112,12 @@ void dlg_coloursel_start(union control *ctrl, dlgparam *dp, int r, int g, int b)
GtkColorSelectionDialog *ccs = GTK_COLOR_SELECTION_DIALOG(coloursel);
GtkColorSelection *cs = GTK_COLOR_SELECTION
(gtk_color_selection_dialog_get_color_selection(ccs));
gtk_color_selection_set_has_opacity_control(cs, FALSE);
gtk_color_selection_set_has_opacity_control(cs, false);
#endif
dp->coloursel_result.ok = FALSE;
dp->coloursel_result.ok = false;
gtk_window_set_modal(GTK_WINDOW(coloursel), TRUE);
gtk_window_set_modal(GTK_WINDOW(coloursel), true);
#if GTK_CHECK_VERSION(3,0,0)
{
@ -1214,7 +1214,7 @@ static gboolean widget_focus(GtkWidget *widget, GdkEventFocus *event,
dp->currfocus = focus;
}
return FALSE;
return false;
}
static void button_clicked(GtkButton *button, gpointer data)
@ -1251,7 +1251,7 @@ static gboolean editbox_key(GtkWidget *widget, GdkEventKey *event,
event, &return_val);
return return_val;
}
return FALSE;
return false;
}
static void editbox_changed(GtkEditable *ed, gpointer data)
@ -1269,7 +1269,7 @@ static gboolean editbox_lostfocus(GtkWidget *ed, GdkEventFocus *event,
struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(ed));
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_REFRESH);
return FALSE;
return false;
}
#if !GTK_CHECK_VERSION(2,0,0)
@ -1366,22 +1366,22 @@ static gboolean listitem_key(GtkWidget *item, GdkEventKey *event,
g_list_free(chead);
}
return TRUE;
return true;
}
return FALSE;
return false;
}
static gboolean listitem_single_key(GtkWidget *item, GdkEventKey *event,
gpointer data)
{
return listitem_key(item, event, data, FALSE);
return listitem_key(item, event, data, false);
}
static gboolean listitem_multi_key(GtkWidget *item, GdkEventKey *event,
gpointer data)
{
return listitem_key(item, event, data, TRUE);
return listitem_key(item, event, data, true);
}
static gboolean listitem_button_press(GtkWidget *item, GdkEventButton *event,
@ -1395,7 +1395,7 @@ static gboolean listitem_button_press(GtkWidget *item, GdkEventButton *event,
case GDK_2BUTTON_PRESS: uc->nclicks = 2; break;
case GDK_3BUTTON_PRESS: uc->nclicks = 3; break;
}
return FALSE;
return false;
}
static gboolean listitem_button_release(GtkWidget *item, GdkEventButton *event,
@ -1405,9 +1405,9 @@ static gboolean listitem_button_release(GtkWidget *item, GdkEventButton *event,
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
if (uc->nclicks>1) {
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_ACTION);
return TRUE;
return true;
}
return FALSE;
return false;
}
static void list_selchange(GtkList *list, gpointer data)
@ -1497,7 +1497,7 @@ static gboolean draglist_valchange(gpointer data)
sfree(ctx);
return FALSE;
return false;
}
static void listbox_reorder(GtkTreeModel *treemodel, GtkTreePath *path,
@ -1626,9 +1626,9 @@ static void colourchoose_response(GtkDialog *dialog,
dp->coloursel_result.r = (int) (255 * rgba.red);
dp->coloursel_result.g = (int) (255 * rgba.green);
dp->coloursel_result.b = (int) (255 * rgba.blue);
dp->coloursel_result.ok = TRUE;
dp->coloursel_result.ok = true;
} else {
dp->coloursel_result.ok = FALSE;
dp->coloursel_result.ok = false;
}
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_CALLBACK);
@ -1667,7 +1667,7 @@ static void coloursel_ok(GtkButton *button, gpointer data)
dp->coloursel_result.b = (int) (255 * cvals[2]);
}
#endif
dp->coloursel_result.ok = TRUE;
dp->coloursel_result.ok = true;
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_CALLBACK);
}
@ -1676,7 +1676,7 @@ static void coloursel_cancel(GtkButton *button, gpointer data)
struct dlgparam *dp = (struct dlgparam *)data;
gpointer coloursel = g_object_get_data(G_OBJECT(button), "user-data");
struct uctrl *uc = g_object_get_data(G_OBJECT(coloursel), "user-data");
dp->coloursel_result.ok = FALSE;
dp->coloursel_result.ok = false;
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_CALLBACK);
}
@ -1697,7 +1697,7 @@ static void filefont_clicked(GtkButton *button, gpointer data)
STANDARD_CANCEL_LABEL, GTK_RESPONSE_CANCEL,
STANDARD_OPEN_LABEL, GTK_RESPONSE_ACCEPT,
(const gchar *)NULL);
gtk_window_set_modal(GTK_WINDOW(filechoose), TRUE);
gtk_window_set_modal(GTK_WINDOW(filechoose), true);
g_object_set_data(G_OBJECT(filechoose), "user-data", (gpointer)uc);
g_signal_connect(G_OBJECT(filechoose), "response",
G_CALLBACK(filechoose_response), (gpointer)dp);
@ -1705,7 +1705,7 @@ static void filefont_clicked(GtkButton *button, gpointer data)
#else
GtkWidget *filesel =
gtk_file_selection_new(uc->ctrl->fileselect.title);
gtk_window_set_modal(GTK_WINDOW(filesel), TRUE);
gtk_window_set_modal(GTK_WINDOW(filesel), true);
g_object_set_data
(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "user-data",
(gpointer)filesel);
@ -1735,7 +1735,7 @@ static void filefont_clicked(GtkButton *button, gpointer data)
gchar *spacings[] = { "c", "m", NULL };
GtkWidget *fontsel =
gtk_font_selection_dialog_new("Select a font");
gtk_window_set_modal(GTK_WINDOW(fontsel), TRUE);
gtk_window_set_modal(GTK_WINDOW(fontsel), true);
gtk_font_selection_dialog_set_filter
(GTK_FONT_SELECTION_DIALOG(fontsel),
GTK_FONT_FILTER_BASE, GTK_FONT_ALL,
@ -1792,7 +1792,7 @@ static void filefont_clicked(GtkButton *button, gpointer data)
unifontsel *fontsel = unifontsel_new("Select a font");
gtk_window_set_modal(fontsel->window, TRUE);
gtk_window_set_modal(fontsel->window, true);
unifontsel_set_name(fontsel, fontname);
g_object_set_data(G_OBJECT(fontsel->ok_button),
@ -1877,7 +1877,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
for (i = 0; i < s->ncontrols; i++) {
union control *ctrl = s->ctrls[i];
struct uctrl *uc;
int left = FALSE;
int left = false;
GtkWidget *w = NULL;
switch (ctrl->generic.type) {
@ -1919,7 +1919,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
case CTRL_BUTTON:
w = gtk_button_new_with_label(ctrl->generic.label);
if (win) {
gtk_widget_set_can_default(w, TRUE);
gtk_widget_set_can_default(w, true);
if (ctrl->button.isdefault)
gtk_window_set_default(win, w);
if (ctrl->button.iscancel)
@ -1940,7 +1940,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
G_CALLBACK(widget_focus), dp);
shortcut_add(scs, gtk_bin_get_child(GTK_BIN(w)),
ctrl->checkbox.shortcut, SHORTCUT_UCTRL, uc);
left = TRUE;
left = true;
break;
case CTRL_RADIO:
/*
@ -2011,7 +2011,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
* GTK 1 combo box.
*/
w = gtk_combo_new();
gtk_combo_set_value_in_list(GTK_COMBO(w), FALSE, TRUE);
gtk_combo_set_value_in_list(GTK_COMBO(w), false, true);
uc->entry = GTK_COMBO(w)->entry;
uc->list = GTK_COMBO(w)->list;
signalobject = uc->entry;
@ -2033,7 +2033,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
} else {
w = gtk_entry_new();
if (ctrl->editbox.password)
gtk_entry_set_visibility(GTK_ENTRY(w), FALSE);
gtk_entry_set_visibility(GTK_ENTRY(w), false);
uc->entry = w;
signalobject = w;
}
@ -2226,7 +2226,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
* column to look at in the list model).
*/
cr = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(w), cr, TRUE);
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(w), cr, true);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(w), cr,
"text", 1, NULL);
@ -2337,7 +2337,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
(GTK_TREE_MODEL(uc->listmodel));
g_object_set_data(G_OBJECT(uc->listmodel), "user-data",
(gpointer)w);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), FALSE);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), false);
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(w));
gtk_tree_selection_set_mode
(sel, ctrl->listbox.multisel ? GTK_SELECTION_MULTIPLE :
@ -2351,7 +2351,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
G_CALLBACK(listbox_selchange), dp);
if (ctrl->listbox.draglist) {
gtk_tree_view_set_reorderable(GTK_TREE_VIEW(w), TRUE);
gtk_tree_view_set_reorderable(GTK_TREE_VIEW(w), true);
g_signal_connect(G_OBJECT(uc->listmodel), "row-inserted",
G_CALLBACK(listbox_reorder), dp);
}
@ -2375,7 +2375,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
if (!ctrl->listbox.hscroll) {
g_object_set(G_OBJECT(cellrend),
"ellipsize", PANGO_ELLIPSIZE_END,
"ellipsize-set", TRUE,
"ellipsize-set", true,
(const char *)NULL);
}
column = gtk_tree_view_column_new_with_attributes
@ -2482,7 +2482,7 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
uc->text = w = gtk_label_new(uc->ctrl->generic.label);
#endif
align_label_left(GTK_LABEL(w));
gtk_label_set_line_wrap(GTK_LABEL(w), TRUE);
gtk_label_set_line_wrap(GTK_LABEL(w), true);
break;
}
@ -2570,10 +2570,10 @@ static int tree_grab_focus(struct dlgparam *dp)
}
if (f >= 0)
return FALSE;
return false;
else {
gtk_widget_grab_focus(dp->currtreeitem);
return TRUE;
return true;
}
}
@ -2584,7 +2584,7 @@ gint tree_focus(GtkContainer *container, GtkDirectionType direction,
g_signal_stop_emission_by_name(G_OBJECT(container), "focus");
/*
* If there's a focused treeitem, we return FALSE to cause the
* If there's a focused treeitem, we return false to cause the
* focus to move on to some totally other control. If not, we
* focus the selected one.
*/
@ -2598,7 +2598,7 @@ int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
if (event->keyval == GDK_KEY_Escape && dp->cancelbutton) {
g_signal_emit_by_name(G_OBJECT(dp->cancelbutton), "clicked");
return TRUE;
return true;
}
if ((event->state & GDK_MOD1_MASK) &&
@ -2713,7 +2713,7 @@ int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
}
}
return FALSE;
return false;
}
#if !GTK_CHECK_VERSION(2,0,0)
@ -2742,10 +2742,10 @@ int tree_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
*/
{
GtkWidget *w = dp->treeitems[i];
int vis = TRUE;
int vis = true;
while (w && (GTK_IS_TREE_ITEM(w) || GTK_IS_TREE(w))) {
if (!GTK_WIDGET_VISIBLE(w)) {
vis = FALSE;
vis = false;
break;
}
w = w->parent;
@ -2762,7 +2762,7 @@ int tree_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
g_signal_emit_by_name(G_OBJECT(dp->treeitems[j]), "toggle");
gtk_widget_grab_focus(dp->treeitems[j]);
}
return TRUE;
return true;
}
/*
@ -2772,15 +2772,15 @@ int tree_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
if (event->keyval == GDK_Left || event->keyval == GDK_KP_Left) {
g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
gtk_tree_item_collapse(GTK_TREE_ITEM(widget));
return TRUE;
return true;
}
if (event->keyval == GDK_Right || event->keyval == GDK_KP_Right) {
g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
gtk_tree_item_expand(GTK_TREE_ITEM(widget));
return TRUE;
return true;
}
return FALSE;
return false;
}
#endif
@ -2935,15 +2935,15 @@ GtkWidget *create_config_box(const char *title, Conf *conf,
gtk_setup_config_box(dp->ctrlbox, midsession, window);
gtk_window_set_title(GTK_WINDOW(window), title);
hbox = gtk_hbox_new(FALSE, 4);
our_dialog_add_to_content_area(GTK_WINDOW(window), hbox, TRUE, TRUE, 0);
hbox = gtk_hbox_new(false, 4);
our_dialog_add_to_content_area(GTK_WINDOW(window), hbox, true, true, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
gtk_widget_show(hbox);
vbox = gtk_vbox_new(FALSE, 4);
gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
vbox = gtk_vbox_new(false, 4);
gtk_box_pack_start(GTK_BOX(hbox), vbox, false, false, 0);
gtk_widget_show(vbox);
cols = columns_new(4);
gtk_box_pack_start(GTK_BOX(vbox), cols, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), cols, false, false, 0);
gtk_widget_show(cols);
label = gtk_label_new("Category:");
columns_add(COLUMNS(cols), label, 0, 1);
@ -2954,7 +2954,7 @@ GtkWidget *create_config_box(const char *title, Conf *conf,
treestore = gtk_tree_store_new
(TREESTORE_NUM, G_TYPE_STRING, G_TYPE_INT);
tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(treestore));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), false);
treerenderer = gtk_cell_renderer_text_new();
treecolumn = gtk_tree_view_column_new_with_attributes
("Label", treerenderer, "text", 0, NULL);
@ -2972,11 +2972,11 @@ GtkWidget *create_config_box(const char *title, Conf *conf,
G_CALLBACK(widget_focus), dp);
shortcut_add(&scs, label, 'g', SHORTCUT_TREE, tree);
gtk_widget_show(treescroll);
gtk_box_pack_start(GTK_BOX(vbox), treescroll, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), treescroll, true, true, 0);
panels = gtk_notebook_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(panels), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(panels), FALSE);
gtk_box_pack_start(GTK_BOX(hbox), panels, TRUE, TRUE, 0);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(panels), false);
gtk_notebook_set_show_border(GTK_NOTEBOOK(panels), false);
gtk_box_pack_start(GTK_BOX(hbox), panels, true, true, 0);
gtk_widget_show(panels);
panelvbox = NULL;
@ -3023,7 +3023,7 @@ GtkWidget *create_config_box(const char *title, Conf *conf,
first = (panelvbox == NULL);
panelvbox = gtk_vbox_new(FALSE, 4);
panelvbox = gtk_vbox_new(false, 4);
gtk_widget_show(panelvbox);
gtk_notebook_append_page(GTK_NOTEBOOK(panels), panelvbox,
NULL);
@ -3076,7 +3076,7 @@ GtkWidget *create_config_box(const char *title, Conf *conf,
*/
gtk_tree_view_expand_row(GTK_TREE_VIEW(tree),
selparams[nselparams].treepath,
FALSE);
false);
} else {
selparams[nselparams].treepath = NULL;
}
@ -3117,7 +3117,7 @@ GtkWidget *create_config_box(const char *title, Conf *conf,
}
w = layout_ctrls(dp, &selparams[nselparams-1].shortcuts, s, NULL);
gtk_box_pack_start(GTK_BOX(panelvbox), w, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(panelvbox), w, false, false, 0);
gtk_widget_show(w);
}
}
@ -3330,7 +3330,7 @@ GtkWidget *create_message_box(
I(button->value));
c->generic.column = index++;
if (button->type > 0)
c->button.isdefault = TRUE;
c->button.isdefault = true;
/* We always arrange that _some_ button is labelled as
* 'iscancel', so that pressing Escape will always cause
@ -3342,7 +3342,7 @@ GtkWidget *create_message_box(
* that really is just showing a _message_ and not even asking
* a question) then that will be picked. */
if (button->type == min_type)
c->button.iscancel = TRUE;
c->button.iscancel = true;
}
s1 = ctrl_getset(dp->ctrlbox, "x", "", "");
@ -3356,7 +3356,7 @@ GtkWidget *create_message_box(
w1 = layout_ctrls(dp, &scs, s1, GTK_WINDOW(window));
gtk_container_set_border_width(GTK_CONTAINER(w1), 10);
gtk_widget_set_size_request(w1, minwid+20, -1);
our_dialog_add_to_content_area(GTK_WINDOW(window), w1, TRUE, TRUE, 0);
our_dialog_add_to_content_area(GTK_WINDOW(window), w1, true, true, 0);
gtk_widget_show(w1);
dp->shortcuts = &scs;
@ -3367,7 +3367,7 @@ GtkWidget *create_message_box(
if (selectable) {
#if GTK_CHECK_VERSION(2,0,0)
struct uctrl *uc = dlg_find_byctrl(dp, textctrl);
gtk_label_set_selectable(GTK_LABEL(uc->text), TRUE);
gtk_label_set_selectable(GTK_LABEL(uc->text), true);
/*
* GTK selectable labels have a habit of selecting their
@ -3523,7 +3523,7 @@ int gtk_seat_verify_ssh_host_key(
mainwin = GTK_WIDGET(gtk_seat_get_window(seat));
msgbox = create_message_box(
mainwin, "PuTTY Security Alert", text, string_width(fingerprint), TRUE,
mainwin, "PuTTY Security Alert", text, string_width(fingerprint), true,
&buttons_hostkey, verify_ssh_host_key_result_callback, result_ctx);
register_dialog(seat, DIALOG_SLOT_NETWORK_PROMPT, msgbox);
@ -3584,7 +3584,7 @@ int gtk_seat_confirm_weak_crypto_primitive(
msgbox = create_message_box(
mainwin, "PuTTY Security Alert", text,
string_width("Reasonably long line of text as a width template"),
FALSE, &buttons_yn, simple_prompt_result_callback, result_ctx);
false, &buttons_yn, simple_prompt_result_callback, result_ctx);
register_dialog(seat, result_ctx->dialog_slot, msgbox);
sfree(text);
@ -3621,7 +3621,7 @@ int gtk_seat_confirm_weak_cached_hostkey(
mainwin, "PuTTY Security Alert", text,
string_width("is ecdsa-nistp521, which is below the configured"
" warning threshold."),
FALSE, &buttons_yn, simple_prompt_result_callback, result_ctx);
false, &buttons_yn, simple_prompt_result_callback, result_ctx);
register_dialog(seat, result_ctx->dialog_slot, msgbox);
sfree(text);
@ -3642,7 +3642,7 @@ void nonfatal_message_box(void *window, const char *msg)
create_message_box(
window, title, msg,
string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
FALSE, &buttons_ok, trivial_post_dialog_fn, NULL);
false, &buttons_ok, trivial_post_dialog_fn, NULL);
sfree(title);
}
@ -3683,7 +3683,7 @@ static void licence_clicked(GtkButton *button, gpointer data)
create_message_box(aboutbox, title, LICENCE_TEXT("\n\n"),
string_width("LONGISH LINE OF TEXT SO THE LICENCE"
" BOX ISN'T EXCESSIVELY TALL AND THIN"),
TRUE, &buttons_ok, trivial_post_dialog_fn, NULL);
true, &buttons_ok, trivial_post_dialog_fn, NULL);
sfree(title);
}
@ -3705,17 +3705,17 @@ void about_box(void *window)
sfree(title);
w = gtk_button_new_with_label("Close");
gtk_widget_set_can_default(w, TRUE);
gtk_widget_set_can_default(w, true);
gtk_window_set_default(GTK_WINDOW(aboutbox), w);
action_area = our_dialog_make_action_hbox(GTK_WINDOW(aboutbox));
gtk_box_pack_end(action_area, w, FALSE, FALSE, 0);
gtk_box_pack_end(action_area, w, false, false, 0);
g_signal_connect(G_OBJECT(w), "clicked",
G_CALLBACK(about_close_clicked), NULL);
gtk_widget_show(w);
w = gtk_button_new_with_label("View Licence");
gtk_widget_set_can_default(w, TRUE);
gtk_box_pack_end(action_area, w, FALSE, FALSE, 0);
gtk_widget_set_can_default(w, true);
gtk_box_pack_end(action_area, w, false, false, 0);
g_signal_connect(G_OBJECT(w), "clicked",
G_CALLBACK(licence_clicked), NULL);
gtk_widget_show(w);
@ -3729,11 +3729,11 @@ void about_box(void *window)
w = gtk_label_new(label_text);
gtk_label_set_justify(GTK_LABEL(w), GTK_JUSTIFY_CENTER);
#if GTK_CHECK_VERSION(2,0,0)
gtk_label_set_selectable(GTK_LABEL(w), TRUE);
gtk_label_set_selectable(GTK_LABEL(w), true);
#endif
sfree(label_text);
}
our_dialog_add_to_content_area(GTK_WINDOW(aboutbox), w, FALSE, FALSE, 0);
our_dialog_add_to_content_area(GTK_WINDOW(aboutbox), w, false, false, 0);
#if GTK_CHECK_VERSION(2,0,0)
/*
* Same precautions against initial select-all as in
@ -3901,7 +3901,7 @@ gint eventlog_selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
sfree(es->seldata);
es->sellen = 0;
es->seldata = NULL;
return TRUE;
return true;
}
void showeventlog(eventlog_stuff *es, void *parentwin)
@ -3931,7 +3931,7 @@ void showeventlog(eventlog_stuff *es, void *parentwin)
c = ctrl_pushbutton(s0, "Close", 'c', HELPCTX(no_help),
eventlog_ok_handler, P(NULL));
c->button.column = 1;
c->button.isdefault = TRUE;
c->button.isdefault = true;
s1 = ctrl_getset(es->eventbox, "x", "", "");
es->listctrl = c = ctrl_listbox(s1, NULL, NO_SHORTCUT, HELPCTX(no_help),
@ -3957,7 +3957,7 @@ void showeventlog(eventlog_stuff *es, void *parentwin)
("LINE OF TEXT GIVING WIDTH OF EVENT LOG IS "
"QUITE LONG 'COS SSH LOG ENTRIES ARE WIDE"),
-1);
our_dialog_add_to_content_area(GTK_WINDOW(window), w1, TRUE, TRUE, 0);
our_dialog_add_to_content_area(GTK_WINDOW(window), w1, true, true, 0);
gtk_widget_show(w1);
es->dp.data = es;
@ -4086,7 +4086,7 @@ int gtkdlg_askappend(Seat *seat, Filename *filename,
msgbox = create_message_box(
mainwin, mbtitle, message,
string_width("LINE OF TEXT SUITABLE FOR THE ASKAPPEND WIDTH"),
FALSE, &buttons_append, simple_prompt_result_callback, result_ctx);
false, &buttons_append, simple_prompt_result_callback, result_ctx);
register_dialog(seat, result_ctx->dialog_slot, msgbox);
sfree(message);

152
unix/gtkfont.c
View File

@ -448,8 +448,8 @@ static unifont *x11font_create(GtkWidget *widget, const char *name,
charset_encoding = XInternAtom(disp, "CHARSET_ENCODING", False);
pubcs = realcs = CS_NONE;
sixteen_bit = FALSE;
variable = TRUE;
sixteen_bit = false;
variable = true;
if (XGetFontProperty(xfs, charset_registry, &registry_ret) &&
XGetFontProperty(xfs, charset_encoding, &encoding_ret)) {
@ -467,7 +467,7 @@ static unifont *x11font_create(GtkWidget *widget, const char *name,
* into 16-bit Unicode.
*/
if (!strcasecmp(encoding, "iso10646-1")) {
sixteen_bit = TRUE;
sixteen_bit = true;
pubcs = realcs = CS_UTF8;
}
@ -496,7 +496,7 @@ static unifont *x11font_create(GtkWidget *widget, const char *name,
spc = XGetAtomName(disp, (Atom)spacing_ret);
if (spc && strchr("CcMm", spc[0]))
variable = FALSE;
variable = false;
}
xfont = snew(struct x11font);
@ -506,7 +506,7 @@ static unifont *x11font_create(GtkWidget *widget, const char *name,
xfont->u.descent = xfs->descent;
xfont->u.height = xfont->u.ascent + xfont->u.descent;
xfont->u.public_charset = pubcs;
xfont->u.want_fallback = TRUE;
xfont->u.want_fallback = true;
#ifdef DRAW_TEXT_GDK
xfont->u.preferred_drawtype = DRAWTYPE_GDK;
#elif defined DRAW_TEXT_CAIRO
@ -525,7 +525,7 @@ static unifont *x11font_create(GtkWidget *widget, const char *name,
for (i = 0; i < lenof(xfont->fonts); i++) {
xfont->fonts[i].xfs = NULL;
xfont->fonts[i].allocated = FALSE;
xfont->fonts[i].allocated = false;
#ifdef DRAW_TEXT_CAIRO
xfont->fonts[i].glyphcache = NULL;
xfont->fonts[i].nglyphs = 0;
@ -534,7 +534,7 @@ static unifont *x11font_create(GtkWidget *widget, const char *name,
#endif
}
xfont->fonts[0].xfs = xfs;
xfont->fonts[0].allocated = TRUE;
xfont->fonts[0].allocated = true;
return &xfont->u;
}
@ -572,7 +572,7 @@ static void x11_alloc_subfont(struct x11font *xfont, int sfid)
char *derived_name = x11_guess_derived_font_name
(disp, xfont->fonts[0].xfs, sfid & 1, !!(sfid & 2));
xfont->fonts[sfid].xfs = XLoadQueryFont(disp, derived_name);
xfont->fonts[sfid].allocated = TRUE;
xfont->fonts[sfid].allocated = true;
sfree(derived_name);
/* Note that xfont->fonts[sfid].xfs may still be NULL, if XLQF failed. */
}
@ -597,7 +597,7 @@ static int x11font_has_glyph(unifont *font, wchar_t glyph)
int sblen = wc_to_mb(xfont->real_charset, 0, &glyph, 1,
sbstring, 2, "", NULL);
if (sblen == 0 || !sbstring[0])
return FALSE; /* not even in the charset */
return false; /* not even in the charset */
return x11_font_has_glyph(xfont->fonts[0].xfs, 0,
(unsigned char)sbstring[0]);
@ -862,14 +862,14 @@ static void x11font_really_draw_text(
*/
step = 1;
nsteps = nchars;
centre = TRUE;
centre = true;
} else {
/*
* In a fixed-pitch font, we can draw the whole lot in one go.
*/
step = nchars;
nsteps = 1;
centre = FALSE;
centre = false;
}
dfns->setup(ctx, xfi, disp);
@ -1391,17 +1391,17 @@ static int pangofont_check_desc_makes_sense(PangoContext *ctx,
#ifndef PANGO_PRE_1POINT6
map = pango_context_get_font_map(ctx);
if (!map)
return FALSE;
return false;
pango_font_map_list_families(map, &families, &nfamilies);
#else
pango_context_list_families(ctx, &families, &nfamilies);
#endif
matched = FALSE;
matched = false;
for (i = 0; i < nfamilies; i++) {
if (!g_ascii_strcasecmp(pango_font_family_get_name(families[i]),
pango_font_description_get_family(desc))) {
matched = TRUE;
matched = true;
break;
}
}
@ -1454,7 +1454,7 @@ static unifont *pangofont_create_internal(GtkWidget *widget,
pfont->u.ascent = PANGO_PIXELS(pango_font_metrics_get_ascent(metrics));
pfont->u.descent = PANGO_PIXELS(pango_font_metrics_get_descent(metrics));
pfont->u.height = pfont->u.ascent + pfont->u.descent;
pfont->u.want_fallback = FALSE;
pfont->u.want_fallback = false;
#ifdef DRAW_TEXT_CAIRO
pfont->u.preferred_drawtype = DRAWTYPE_CAIRO;
#elif defined DRAW_TEXT_GDK
@ -1562,7 +1562,7 @@ static int pangofont_char_width(PangoLayout *layout, struct pangofont *pfont,
static int pangofont_has_glyph(unifont *font, wchar_t glyph)
{
/* Pango implements font fallback, so assume it has everything */
return TRUE;
return true;
}
#ifdef DRAW_TEXT_GDK
@ -1592,7 +1592,7 @@ static void pangofont_draw_internal(unifont_drawctx *ctx, unifont *font,
PangoRectangle rect;
char *utfstring, *utfptr;
int utflen;
int shadowbold = FALSE;
int shadowbold = false;
void (*draw_layout)(unifont_drawctx *ctx,
gint x, gint y, PangoLayout *layout) = NULL;
@ -1616,7 +1616,7 @@ static void pangofont_draw_internal(unifont_drawctx *ctx, unifont *font,
pango_layout_set_font_description(layout, pfont->desc);
if (bold > pfont->bold) {
if (pfont->shadowalways)
shadowbold = TRUE;
shadowbold = true;
else {
PangoFontDescription *desc2 =
pango_font_description_copy_static(pfont->desc);
@ -1743,7 +1743,7 @@ static void pangofont_draw_text(unifont_drawctx *ctx, unifont *font,
int wide, int bold, int cellwidth)
{
pangofont_draw_internal(ctx, font, x, y, string, len, wide, bold,
cellwidth, FALSE);
cellwidth, false);
}
static void pangofont_draw_combining(unifont_drawctx *ctx, unifont *font,
@ -1765,7 +1765,7 @@ static void pangofont_draw_combining(unifont_drawctx *ctx, unifont *font,
len++;
}
pangofont_draw_internal(ctx, font, x, y, string, len, wide, bold,
cellwidth, TRUE);
cellwidth, true);
sfree(tmpstring);
}
@ -2234,7 +2234,7 @@ unifont *multifont_create(GtkWidget *widget, const char *name,
mfont->u.descent = font->descent;
mfont->u.height = font->height;
mfont->u.public_charset = font->public_charset;
mfont->u.want_fallback = FALSE; /* shouldn't be needed, but just in case */
mfont->u.want_fallback = false; /* shouldn't be needed, but just in case */
mfont->u.preferred_drawtype = font->preferred_drawtype;
mfont->main = font;
mfont->fallback = fallback;
@ -2456,8 +2456,8 @@ static void unifontsel_deselect(unifontsel_internal *fs)
fs->selected = NULL;
gtk_list_store_clear(fs->style_model);
gtk_list_store_clear(fs->size_model);
gtk_widget_set_sensitive(fs->u.ok_button, FALSE);
gtk_widget_set_sensitive(fs->size_entry, FALSE);
gtk_widget_set_sensitive(fs->u.ok_button, false);
gtk_widget_set_sensitive(fs->size_entry, false);
unifontsel_draw_preview_text(fs);
}
@ -2469,7 +2469,7 @@ static void unifontsel_setup_familylist(unifontsel_internal *fs)
int currflags = -1;
fontinfo *info;
fs->inhibit_response = TRUE;
fs->inhibit_response = true;
gtk_list_store_clear(fs->family_model);
listindex = 0;
@ -2522,20 +2522,20 @@ static void unifontsel_setup_familylist(unifontsel_internal *fs)
if (fs->selected && fs->selected->familyindex < 0)
unifontsel_deselect(fs);
fs->inhibit_response = FALSE;
fs->inhibit_response = false;
}
static void unifontsel_setup_stylelist(unifontsel_internal *fs,
int start, int end)
{
GtkTreeIter iter;
int i, listindex, minpos = -1, maxpos = -1, started = FALSE;
int i, listindex, minpos = -1, maxpos = -1, started = false;
char *currcs = NULL, *currstyle = NULL;
fontinfo *info;
gtk_list_store_clear(fs->style_model);
listindex = 0;
started = FALSE;
started = false;
/*
* Search through the font tree for anything matching our
@ -2563,12 +2563,12 @@ static void unifontsel_setup_stylelist(unifontsel_internal *fs,
* We've either finished a style/charset, or started a
* new one, or both.
*/
started = TRUE;
started = true;
if (currstyle) {
gtk_list_store_append(fs->style_model, &iter);
gtk_list_store_set(fs->style_model, &iter,
0, currstyle, 1, minpos, 2, maxpos+1,
3, TRUE, 4, PANGO_WEIGHT_NORMAL, -1);
3, true, 4, PANGO_WEIGHT_NORMAL, -1);
listindex++;
}
if (info) {
@ -2577,7 +2577,7 @@ static void unifontsel_setup_stylelist(unifontsel_internal *fs,
gtk_list_store_append(fs->style_model, &iter);
gtk_list_store_set(fs->style_model, &iter,
0, info->charset, 1, -1, 2, -1,
3, FALSE, 4, PANGO_WEIGHT_BOLD, -1);
3, false, 4, PANGO_WEIGHT_BOLD, -1);
listindex++;
}
currcs = info->charset;
@ -2664,7 +2664,7 @@ static void unifontsel_draw_preview_text_inner(unifont_drawctx *dctx,
(GTK_WIDGET(fs->u.window), info->realname, fs->selsize);
font = info->fontclass->create(GTK_WIDGET(fs->u.window),
sizename ? sizename : info->realname,
FALSE, FALSE, 0, 0);
false, false, 0, 0);
} else
font = NULL;
@ -2715,11 +2715,11 @@ static void unifontsel_draw_preview_text_inner(unifont_drawctx *dctx,
info->fontclass->draw_text(dctx, font,
0, font->ascent,
L"bankrupt jilted showmen quiz convex fogey",
41, FALSE, FALSE, font->width);
41, false, false, font->width);
info->fontclass->draw_text(dctx, font,
0, font->ascent + font->height,
L"BANKRUPT JILTED SHOWMEN QUIZ CONVEX FOGEY",
41, FALSE, FALSE, font->width);
41, false, false, font->width);
/*
* The ordering of punctuation here is also selected
* with some specific aims in mind. I put ` and '
@ -2735,7 +2735,7 @@ static void unifontsel_draw_preview_text_inner(unifont_drawctx *dctx,
info->fontclass->draw_text(dctx, font,
0, font->ascent + font->height * 2,
L"0123456789!?,.:;<>()[]{}\\/`'\"+*-=~#_@|%&^$",
42, FALSE, FALSE, font->width);
42, false, false, font->width);
info->fontclass->destroy(font);
}
@ -2803,7 +2803,7 @@ static void unifontsel_draw_preview_text(unifontsel_internal *fs)
#endif
gdk_window_invalidate_rect(gtk_widget_get_window(fs->preview_area),
NULL, FALSE);
NULL, false);
}
static void unifontsel_select_font(unifontsel_internal *fs,
@ -2816,14 +2816,14 @@ static void unifontsel_select_font(unifontsel_internal *fs,
GtkTreePath *treepath;
GtkTreeIter iter;
fs->inhibit_response = TRUE;
fs->inhibit_response = true;
fs->selected = info;
fs->selsize = size;
if (size_is_explicit)
fs->intendedsize = size;
gtk_widget_set_sensitive(fs->u.ok_button, TRUE);
gtk_widget_set_sensitive(fs->u.ok_button, true);
/*
* Find the index of this fontinfo in the selorder list.
@ -2852,7 +2852,7 @@ static void unifontsel_select_font(unifontsel_internal *fs,
(gtk_tree_view_get_selection(GTK_TREE_VIEW(fs->family_list)),
treepath);
gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(fs->family_list),
treepath, NULL, FALSE, 0.0, 0.0);
treepath, NULL, false, 0.0, 0.0);
success = gtk_tree_model_get_iter(GTK_TREE_MODEL(fs->family_model),
&iter, treepath);
assert(success);
@ -2876,7 +2876,7 @@ static void unifontsel_select_font(unifontsel_internal *fs,
(gtk_tree_view_get_selection(GTK_TREE_VIEW(fs->style_list)),
treepath);
gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(fs->style_list),
treepath, NULL, FALSE, 0.0, 0.0);
treepath, NULL, false, 0.0, 0.0);
gtk_tree_model_get_iter(GTK_TREE_MODEL(fs->style_model),
&iter, treepath);
gtk_tree_path_free(treepath);
@ -2899,7 +2899,7 @@ static void unifontsel_select_font(unifontsel_internal *fs,
(gtk_tree_view_get_selection(GTK_TREE_VIEW(fs->size_list)),
treepath);
gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(fs->size_list),
treepath, NULL, FALSE, 0.0, 0.0);
treepath, NULL, false, 0.0, 0.0);
gtk_tree_path_free(treepath);
size = info->size;
} else {
@ -2908,9 +2908,9 @@ static void unifontsel_select_font(unifontsel_internal *fs,
if (unifontsel_default_sizes[j] == size) {
treepath = gtk_tree_path_new_from_indices(j, -1);
gtk_tree_view_set_cursor(GTK_TREE_VIEW(fs->size_list),
treepath, NULL, FALSE);
treepath, NULL, false);
gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(fs->size_list),
treepath, NULL, FALSE, 0.0,
treepath, NULL, false, 0.0,
0.0);
gtk_tree_path_free(treepath);
}
@ -2940,7 +2940,7 @@ static void unifontsel_select_font(unifontsel_internal *fs,
unifontsel_draw_preview_text(fs);
fs->inhibit_response = FALSE;
fs->inhibit_response = false;
}
static void unifontsel_button_toggled(GtkToggleButton *tb, gpointer data)
@ -3125,7 +3125,7 @@ static void family_changed(GtkTreeSelection *treeselection, gpointer data)
if (!info->size)
fs->selsize = fs->intendedsize; /* font is scalable */
unifontsel_select_font(fs, info, info->size ? info->size : fs->selsize,
1, FALSE);
1, false);
}
static void style_changed(GtkTreeSelection *treeselection, gpointer data)
@ -3152,7 +3152,7 @@ static void style_changed(GtkTreeSelection *treeselection, gpointer data)
if (!info->size)
fs->selsize = fs->intendedsize; /* font is scalable */
unifontsel_select_font(fs, info, info->size ? info->size : fs->selsize,
2, FALSE);
2, false);
}
static void size_changed(GtkTreeSelection *treeselection, gpointer data)
@ -3171,7 +3171,7 @@ static void size_changed(GtkTreeSelection *treeselection, gpointer data)
gtk_tree_model_get(treemodel, &treeiter, 1, &minval, 2, &size, -1);
info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
unifontsel_select_font(fs, info, info->size ? info->size : size, 3, TRUE);
unifontsel_select_font(fs, info, info->size ? info->size : size, 3, true);
}
static void size_entry_changed(GtkEditable *ed, gpointer data)
@ -3188,7 +3188,7 @@ static void size_entry_changed(GtkEditable *ed, gpointer data)
if (size > 0) {
assert(fs->selected->size == 0);
unifontsel_select_font(fs, fs->selected, size, 3, TRUE);
unifontsel_select_font(fs, fs->selected, size, 3, true);
}
}
@ -3212,7 +3212,7 @@ static void alias_resolve(GtkTreeView *treeview, GtkTreePath *path,
struct fontinfo_realname_find f;
newname = info->fontclass->canonify_fontname
(GTK_WIDGET(fs->u.window), info->realname, &newsize, &flags, TRUE);
(GTK_WIDGET(fs->u.window), info->realname, &newsize, &flags, true);
f.realname = newname;
f.flags = flags;
@ -3225,7 +3225,7 @@ static void alias_resolve(GtkTreeView *treeview, GtkTreePath *path,
return; /* didn't change under canonification => not an alias */
unifontsel_select_font(fs, newinfo,
newinfo->size ? newinfo->size : newsize,
1, TRUE);
1, true);
}
}
@ -3240,7 +3240,7 @@ static gint unifontsel_draw_area(GtkWidget *widget, cairo_t *cr, gpointer data)
dctx.u.cairo.cr = cr;
unifontsel_draw_preview_text_inner(&dctx, fs);
return TRUE;
return true;
}
#else
static gint unifontsel_expose_area(GtkWidget *widget, GdkEventExpose *event,
@ -3262,7 +3262,7 @@ static gint unifontsel_expose_area(GtkWidget *widget, GdkEventExpose *event,
unifontsel_draw_preview_text(fs);
#endif
return TRUE;
return true;
}
#endif
@ -3295,9 +3295,9 @@ static gint unifontsel_configure_area(GtkWidget *widget,
}
#endif
gdk_window_invalidate_rect(gtk_widget_get_window(widget), NULL, FALSE);
gdk_window_invalidate_rect(gtk_widget_get_window(widget), NULL, false);
return TRUE;
return true;
}
unifontsel *unifontsel_new(const char *wintitle)
@ -3309,7 +3309,7 @@ unifontsel *unifontsel_new(const char *wintitle)
int lists_height, preview_height, font_width, style_width, size_width;
int i;
fs->inhibit_response = FALSE;
fs->inhibit_response = false;
fs->selected = NULL;
{
@ -3352,7 +3352,7 @@ unifontsel *unifontsel_new(const char *wintitle)
table = gtk_grid_new();
gtk_grid_set_column_spacing(GTK_GRID(table), 8);
#else
table = gtk_table_new(8, 3, FALSE);
table = gtk_table_new(8, 3, false);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
#endif
gtk_widget_show(table);
@ -3375,14 +3375,14 @@ unifontsel *unifontsel_new(const char *wintitle)
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area
(GTK_DIALOG(fs->u.window))),
w, TRUE, TRUE, 0);
w, true, true, 0);
label = gtk_label_new_with_mnemonic("_Font:");
gtk_widget_show(label);
align_label_left(GTK_LABEL(label));
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1);
g_object_set(G_OBJECT(label), "hexpand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(label), "hexpand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
#endif
@ -3394,7 +3394,7 @@ unifontsel *unifontsel_new(const char *wintitle)
*/
model = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
w = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), FALSE);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), false);
gtk_label_set_mnemonic_widget(GTK_LABEL(label), w);
gtk_widget_show(w);
column = gtk_tree_view_column_new_with_attributes
@ -3417,7 +3417,7 @@ unifontsel *unifontsel_new(const char *wintitle)
gtk_widget_set_size_request(scroll, font_width, lists_height);
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), scroll, 0, 1, 1, 2);
g_object_set(G_OBJECT(scroll), "expand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(scroll), "expand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), scroll, 0, 1, 1, 3, GTK_FILL,
GTK_EXPAND | GTK_FILL, 0, 0);
@ -3430,7 +3430,7 @@ unifontsel *unifontsel_new(const char *wintitle)
align_label_left(GTK_LABEL(label));
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), label, 1, 0, 1, 1);
g_object_set(G_OBJECT(label), "hexpand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(label), "hexpand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), label, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
#endif
@ -3445,7 +3445,7 @@ unifontsel *unifontsel_new(const char *wintitle)
model = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT,
G_TYPE_BOOLEAN, G_TYPE_INT);
w = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), FALSE);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), false);
gtk_label_set_mnemonic_widget(GTK_LABEL(label), w);
gtk_widget_show(w);
column = gtk_tree_view_column_new_with_attributes
@ -3466,7 +3466,7 @@ unifontsel *unifontsel_new(const char *wintitle)
gtk_widget_set_size_request(scroll, style_width, lists_height);
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), scroll, 1, 1, 1, 2);
g_object_set(G_OBJECT(scroll), "expand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(scroll), "expand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), scroll, 1, 2, 1, 3, GTK_FILL,
GTK_EXPAND | GTK_FILL, 0, 0);
@ -3479,7 +3479,7 @@ unifontsel *unifontsel_new(const char *wintitle)
align_label_left(GTK_LABEL(label));
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), label, 2, 0, 1, 1);
g_object_set(G_OBJECT(label), "hexpand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(label), "hexpand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
#endif
@ -3495,7 +3495,7 @@ unifontsel *unifontsel_new(const char *wintitle)
gtk_widget_show(w);
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), w, 2, 1, 1, 1);
g_object_set(G_OBJECT(w), "hexpand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(w), "hexpand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), w, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
#endif
@ -3504,7 +3504,7 @@ unifontsel *unifontsel_new(const char *wintitle)
model = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
w = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), FALSE);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(w), false);
gtk_widget_show(w);
column = gtk_tree_view_column_new_with_attributes
("Size", gtk_cell_renderer_text_new(),
@ -3523,7 +3523,7 @@ unifontsel *unifontsel_new(const char *wintitle)
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), scroll, 2, 2, 1, 1);
g_object_set(G_OBJECT(scroll), "expand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(scroll), "expand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), scroll, 2, 3, 2, 3, GTK_FILL,
GTK_EXPAND | GTK_FILL, 0, 0);
@ -3545,9 +3545,9 @@ unifontsel *unifontsel_new(const char *wintitle)
fs->preview_bg.red = fs->preview_bg.green = fs->preview_bg.blue = 0xFFFF;
#if !GTK_CHECK_VERSION(3,0,0)
gdk_colormap_alloc_color(gdk_colormap_get_system(), &fs->preview_fg,
FALSE, FALSE);
false, false);
gdk_colormap_alloc_color(gdk_colormap_get_system(), &fs->preview_bg,
FALSE, FALSE);
false, false);
#endif
#if GTK_CHECK_VERSION(3,0,0)
g_signal_connect(G_OBJECT(fs->preview_area), "draw",
@ -3584,7 +3584,7 @@ unifontsel *unifontsel_new(const char *wintitle)
gtk_widget_show(w);
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), w, 0, 3, 3, 1);
g_object_set(G_OBJECT(w), "expand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(w), "expand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), w, 0, 3, 3, 4,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 8);
@ -3607,7 +3607,7 @@ unifontsel *unifontsel_new(const char *wintitle)
fs->filter_buttons[fs->n_filter_buttons++] = w;
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), w, 0, 4, 3, 1);
g_object_set(G_OBJECT(w), "hexpand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(w), "hexpand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), w, 0, 3, 4, 5, GTK_FILL, 0, 0, 0);
#endif
@ -3620,7 +3620,7 @@ unifontsel *unifontsel_new(const char *wintitle)
fs->filter_buttons[fs->n_filter_buttons++] = w;
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), w, 0, 5, 3, 1);
g_object_set(G_OBJECT(w), "hexpand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(w), "hexpand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), w, 0, 3, 5, 6, GTK_FILL, 0, 0, 0);
#endif
@ -3633,7 +3633,7 @@ unifontsel *unifontsel_new(const char *wintitle)
fs->filter_buttons[fs->n_filter_buttons++] = w;
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), w, 0, 6, 3, 1);
g_object_set(G_OBJECT(w), "hexpand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(w), "hexpand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), w, 0, 3, 6, 7, GTK_FILL, 0, 0, 0);
#endif
@ -3647,7 +3647,7 @@ unifontsel *unifontsel_new(const char *wintitle)
fs->filter_buttons[fs->n_filter_buttons++] = w;
#if GTK_CHECK_VERSION(3,0,0)
gtk_grid_attach(GTK_GRID(table), w, 0, 7, 3, 1);
g_object_set(G_OBJECT(w), "hexpand", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(w), "hexpand", true, (const char *)NULL);
#else
gtk_table_attach(GTK_TABLE(table), w, 0, 3, 7, 8, GTK_FILL, 0, 0, 0);
#endif
@ -3673,7 +3673,7 @@ unifontsel *unifontsel_new(const char *wintitle)
unifontsel_setup_familylist(fs);
fs->selsize = fs->intendedsize = 13; /* random default */
gtk_widget_set_sensitive(fs->u.ok_button, FALSE);
gtk_widget_set_sensitive(fs->u.ok_button, false);
return &fs->u;
}
@ -3716,7 +3716,7 @@ void unifontsel_set_name(unifontsel *fontsel, const char *fontname)
fontname = unifont_do_prefix(fontname, &start, &end);
for (i = start; i < end; i++) {
fontname2 = unifont_types[i]->canonify_fontname
(GTK_WIDGET(fs->u.window), fontname, &size, &flags, FALSE);
(GTK_WIDGET(fs->u.window), fontname, &size, &flags, false);
if (fontname2)
break;
}
@ -3754,7 +3754,7 @@ void unifontsel_set_name(unifontsel *fontsel, const char *fontname)
* know everything we need to fill in all the fields in the
* dialog.
*/
unifontsel_select_font(fs, info, size, 0, TRUE);
unifontsel_select_font(fs, info, size, 0, true);
}
char *unifontsel_get_name(unifontsel *fontsel)

8
unix/gtkmain.c
View File

@ -554,7 +554,7 @@ GtkWidget *make_gtk_toplevel_window(GtkFrontend *frontend)
return gtk_window_new(GTK_WINDOW_TOPLEVEL);
}
const int buildinfo_gtk_relevant = TRUE;
const int buildinfo_gtk_relevant = true;
struct post_initial_config_box_ctx {
Conf *conf;
@ -594,7 +594,7 @@ int main(int argc, char **argv)
/* Call the function in ux{putty,pterm}.c to do app-type
* specific setup */
extern void setup(int);
setup(TRUE); /* TRUE means we are a one-session process */
setup(true); /* true means we are a one-session process */
}
progname = argv[0];
@ -633,7 +633,7 @@ int main(int argc, char **argv)
smemclr(argv[1], strlen(argv[1]));
assert(!dup_check_launchable || conf_launchable(conf));
need_config_box = FALSE;
need_config_box = false;
} else {
if (do_cmdline(argc, argv, 0, conf))
exit(1); /* pre-defaults pass to get -class */
@ -646,7 +646,7 @@ int main(int argc, char **argv)
if (cmdline_tooltype & TOOLTYPE_HOST_ARG)
need_config_box = !cmdline_host_ok(conf);
else
need_config_box = FALSE;
need_config_box = false;
}
if (need_config_box) {

12
unix/gtkmisc.c
View File

@ -130,7 +130,7 @@ void our_dialog_set_action_area(GtkWindow *dlg, GtkWidget *w)
#if !GTK_CHECK_VERSION(2,0,0)
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area),
w, TRUE, TRUE, 0);
w, true, true, 0);
#elif !GTK_CHECK_VERSION(3,0,0)
@ -149,14 +149,14 @@ void our_dialog_set_action_area(GtkWindow *dlg, GtkWidget *w)
#endif
gtk_widget_show(align);
gtk_box_pack_end(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))),
align, FALSE, TRUE, 0);
align, false, true, 0);
w = gtk_hseparator_new();
gtk_box_pack_end(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))),
w, FALSE, TRUE, 0);
w, false, true, 0);
gtk_widget_show(w);
gtk_widget_hide(gtk_dialog_get_action_area(GTK_DIALOG(dlg)));
g_object_set(G_OBJECT(dlg), "has-separator", TRUE, (const char *)NULL);
g_object_set(G_OBJECT(dlg), "has-separator", true, (const char *)NULL);
#else /* GTK 3 */
@ -166,10 +166,10 @@ void our_dialog_set_action_area(GtkWindow *dlg, GtkWidget *w)
GtkWidget *sep;
g_object_set(G_OBJECT(w), "margin", 8, (const char *)NULL);
gtk_box_pack_end(vbox, w, FALSE, TRUE, 0);
gtk_box_pack_end(vbox, w, false, true, 0);
sep = gtk_hseparator_new();
gtk_box_pack_end(vbox, sep, FALSE, TRUE, 0);
gtk_box_pack_end(vbox, sep, false, true, 0);
gtk_widget_show(sep);
#endif

288
unix/gtkwin.c
View File

File diff suppressed because it is too large Load Diff

4
unix/unix.h
View File

@ -133,7 +133,7 @@ unsigned long getticks(void);
* is _not_ implicit but requires a specific UI action. This is at
* odds with all other PuTTY front ends' defaults, but on OS X there
* is no multi-decade precedent for PuTTY working the other way. */
#define CLIPUI_DEFAULT_AUTOCOPY FALSE
#define CLIPUI_DEFAULT_AUTOCOPY false
#define CLIPUI_DEFAULT_MOUSE CLIPUI_IMPLICIT
#define CLIPUI_DEFAULT_INS CLIPUI_EXPLICIT
#define MENU_CLIPBOARD CLIP_CLIPBOARD
@ -146,7 +146,7 @@ unsigned long getticks(void);
#define CLIPNAME_EXPLICIT_OBJECT "CLIPBOARD"
/* These defaults are the ones Unix PuTTY has historically had since
* it was first thought of in 2002 */
#define CLIPUI_DEFAULT_AUTOCOPY FALSE
#define CLIPUI_DEFAULT_AUTOCOPY false
#define CLIPUI_DEFAULT_MOUSE CLIPUI_IMPLICIT
#define CLIPUI_DEFAULT_INS CLIPUI_IMPLICIT
#define MENU_CLIPBOARD CLIP_CLIPBOARD

8
unix/ux_x11.c
View File

@ -22,13 +22,13 @@ void platform_get_x11_auth(struct X11Display *disp, Conf *conf)
/*
* Find the .Xauthority file.
*/
needs_free = FALSE;
needs_free = false;
xauthfile = getenv("XAUTHORITY");
if (!xauthfile) {
xauthfile = getenv("HOME");
if (xauthfile) {
xauthfile = dupcat(xauthfile, "/.Xauthority", NULL);
needs_free = TRUE;
needs_free = true;
}
}
@ -39,7 +39,7 @@ void platform_get_x11_auth(struct X11Display *disp, Conf *conf)
}
}
const int platform_uses_x11_unix_by_default = TRUE;
const int platform_uses_x11_unix_by_default = true;
int platform_make_x11_server(Plug *plug, const char *progname, int mindisp,
const char *screen_number_suffix,
@ -71,7 +71,7 @@ int platform_make_x11_server(Plug *plug, const char *progname, int mindisp,
int addrtype = ADDRTYPE_IPV4;
sockets[nsockets] = new_listener(
NULL, tcp_port, plug, FALSE, conf, addrtype);
NULL, tcp_port, plug, false, conf, addrtype);
err = sk_socket_error(sockets[nsockets]);
if (!err) {

4
unix/uxagentc.c
View File

@ -19,8 +19,8 @@ int agent_exists(void)
{
const char *p = getenv("SSH_AUTH_SOCK");
if (p && *p)
return TRUE;
return FALSE;
return true;
return false;
}
static tree234 *agent_pending_queries;

4
unix/uxcons.c
View File

@ -21,7 +21,7 @@
#include "storage.h"
#include "ssh.h"
int console_batch_mode = FALSE;
int console_batch_mode = false;
static struct termios orig_termios_stderr;
static int stderr_is_a_tty;
@ -30,7 +30,7 @@ void stderr_tty_init()
{
/* Ensure that if stderr is a tty, we can get it back to a sane state. */
if ((flags & FLAG_STDERR_TTY) && isatty(STDERR_FILENO)) {
stderr_is_a_tty = TRUE;
stderr_is_a_tty = true;
tcgetattr(STDERR_FILENO, &orig_termios_stderr);
}
}

6
unix/uxmisc.c
View File

@ -343,7 +343,7 @@ int open_for_write_would_lose_data(const Filename *fn)
* open the file for writing and report _that_ error, which is
* likely to be more to the point.
*/
return FALSE;
return false;
}
/*
@ -360,8 +360,8 @@ int open_for_write_would_lose_data(const Filename *fn)
* information.)
*/
if (S_ISREG(st.st_mode) && st.st_size > 0) {
return TRUE;
return true;
}
return FALSE;
return false;
}

50
unix/uxnet.c
View File

@ -297,15 +297,15 @@ static int sk_nextaddr(SockAddr *addr, SockAddrStep *step)
#ifndef NO_IPV6
if (step->ai && step->ai->ai_next) {
step->ai = step->ai->ai_next;
return TRUE;
return true;
} else
return FALSE;
return false;
#else
if (step->curraddr+1 < addr->naddresses) {
step->curraddr++;
return TRUE;
return true;
} else {
return FALSE;
return false;
}
#endif
}
@ -365,9 +365,9 @@ static SockAddr sk_extractaddr_tmp(
int sk_addr_needs_port(SockAddr *addr)
{
if (addr->superfamily == UNRESOLVED || addr->superfamily == UNIX) {
return FALSE;
return false;
} else {
return TRUE;
return true;
}
}
@ -392,9 +392,9 @@ static int sockaddr_is_loopback(struct sockaddr *sa)
return IN6_IS_ADDR_LOOPBACK(&u->sin6.sin6_addr);
#endif
case AF_UNIX:
return TRUE;
return true;
default:
return FALSE;
return false;
}
}
@ -452,7 +452,7 @@ void sk_addrcopy(SockAddr *addr, char *buf)
memcpy(buf, &((struct sockaddr_in6 *)step.ai->ai_addr)->sin6_addr,
sizeof(struct in6_addr));
else
assert(FALSE);
assert(false);
#else
struct in_addr a;
@ -536,9 +536,9 @@ static Socket *sk_net_accept(accept_ctx_t ctx, Plug *plug)
ret->frozen = 1;
ret->localhost_only = 0; /* unused, but best init anyway */
ret->pending_error = 0;
ret->oobpending = FALSE;
ret->oobpending = false;
ret->outgoingeof = EOF_NO;
ret->incomingeof = FALSE;
ret->incomingeof = false;
ret->listener = 0;
ret->parent = ret->child = NULL;
ret->addr = NULL;
@ -601,7 +601,7 @@ static int try_connect(NetSocket *sock)
cloexec(s);
if (sock->oobinline) {
int b = TRUE;
int b = true;
if (setsockopt(s, SOL_SOCKET, SO_OOBINLINE,
(void *) &b, sizeof(b)) < 0) {
err = errno;
@ -611,7 +611,7 @@ static int try_connect(NetSocket *sock)
}
if (sock->nodelay) {
int b = TRUE;
int b = true;
if (setsockopt(s, IPPROTO_TCP, TCP_NODELAY,
(void *) &b, sizeof(b)) < 0) {
err = errno;
@ -621,7 +621,7 @@ static int try_connect(NetSocket *sock)
}
if (sock->keepalive) {
int b = TRUE;
int b = true;
if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,
(void *) &b, sizeof(b)) < 0) {
err = errno;
@ -779,9 +779,9 @@ Socket *sk_new(SockAddr *addr, int port, int privport, int oobinline,
ret->localhost_only = 0; /* unused, but best init anyway */
ret->pending_error = 0;
ret->parent = ret->child = NULL;
ret->oobpending = FALSE;
ret->oobpending = false;
ret->outgoingeof = EOF_NO;
ret->incomingeof = FALSE;
ret->incomingeof = false;
ret->listener = 0;
ret->addr = addr;
START_STEP(ret->addr, ret->step);
@ -833,9 +833,9 @@ Socket *sk_newlistener(const char *srcaddr, int port, Plug *plug,
ret->localhost_only = local_host_only;
ret->pending_error = 0;
ret->parent = ret->child = NULL;
ret->oobpending = FALSE;
ret->oobpending = false;
ret->outgoingeof = EOF_NO;
ret->incomingeof = FALSE;
ret->incomingeof = false;
ret->listener = 1;
ret->addr = NULL;
ret->s = -1;
@ -1127,7 +1127,7 @@ void try_send(NetSocket *s)
/*
* Perfectly normal: we've sent all we can for the moment.
*/
s->writable = FALSE;
s->writable = false;
return;
} else {
/*
@ -1312,7 +1312,7 @@ static void net_select_result(int fd, int event)
* when we get called for the readability event (which
* should also occur).
*/
s->oobpending = TRUE;
s->oobpending = true;
break;
case 1: /* readable; also acceptance */
if (s->listener) {
@ -1361,7 +1361,7 @@ static void net_select_result(int fd, int event)
if (s->oobinline && s->oobpending) {
atmark = 1;
if (ioctl(s->s, SIOCATMARK, &atmark) == 0 && atmark)
s->oobpending = FALSE; /* clear this indicator */
s->oobpending = false; /* clear this indicator */
} else
atmark = 1;
@ -1375,7 +1375,7 @@ static void net_select_result(int fd, int event)
if (ret < 0) {
plug_closing(s->plug, strerror(errno), errno, 0);
} else if (0 == ret) {
s->incomingeof = TRUE; /* stop trying to read now */
s->incomingeof = true; /* stop trying to read now */
uxsel_tell(s);
plug_closing(s->plug, NULL, 0, 0);
} else {
@ -1668,12 +1668,12 @@ Socket *new_unix_listener(SockAddr *listenaddr, Plug *plug)
ret->writable = 0; /* to start with */
ret->sending_oob = 0;
ret->frozen = 0;
ret->localhost_only = TRUE;
ret->localhost_only = true;
ret->pending_error = 0;
ret->parent = ret->child = NULL;
ret->oobpending = FALSE;
ret->oobpending = false;
ret->outgoingeof = EOF_NO;
ret->incomingeof = FALSE;
ret->incomingeof = false;
ret->listener = 1;
ret->addr = listenaddr;
ret->s = -1;

4
unix/uxpeer.c
View File

@ -25,8 +25,8 @@ int so_peercred(int fd, int *pid, int *uid, int *gid)
*pid = cr.pid;
*uid = cr.uid;
*gid = cr.gid;
return TRUE;
return true;
}
#endif
return FALSE;
return false;
}

110
unix/uxpgnt.c
View File

@ -113,7 +113,7 @@ void keylist_update(void)
const char *const appname = "Pageant";
static int time_to_die = FALSE;
static int time_to_die = false;
/* Stub functions to permit linking against x11fwd.c. These never get
* used, because in LIFE_X11 mode we connect to the X server using a
@ -121,29 +121,29 @@ static int time_to_die = FALSE;
* forwarding too. */
void chan_remotely_opened_confirmation(Channel *chan) { }
void chan_remotely_opened_failure(Channel *chan, const char *err) { }
int chan_default_want_close(Channel *chan, int s, int r) { return FALSE; }
int chan_no_exit_status(Channel *ch, int s) { return FALSE; }
int chan_default_want_close(Channel *chan, int s, int r) { return false; }
int chan_no_exit_status(Channel *ch, int s) { return false; }
int chan_no_exit_signal(Channel *ch, ptrlen s, int c, ptrlen m)
{ return FALSE; }
{ return false; }
int chan_no_exit_signal_numeric(Channel *ch, int s, int c, ptrlen m)
{ return FALSE; }
int chan_no_run_shell(Channel *chan) { return FALSE; }
int chan_no_run_command(Channel *chan, ptrlen command) { return FALSE; }
int chan_no_run_subsystem(Channel *chan, ptrlen subsys) { return FALSE; }
{ return false; }
int chan_no_run_shell(Channel *chan) { return false; }
int chan_no_run_command(Channel *chan, ptrlen command) { return false; }
int chan_no_run_subsystem(Channel *chan, ptrlen subsys) { return false; }
int chan_no_enable_x11_forwarding(
Channel *chan, int oneshot, ptrlen authproto, ptrlen authdata,
unsigned screen_number) { return FALSE; }
int chan_no_enable_agent_forwarding(Channel *chan) { return FALSE; }
unsigned screen_number) { return false; }
int chan_no_enable_agent_forwarding(Channel *chan) { return false; }
int chan_no_allocate_pty(
Channel *chan, ptrlen termtype, unsigned width, unsigned height,
unsigned pixwidth, unsigned pixheight, struct ssh_ttymodes modes)
{ return FALSE; }
int chan_no_set_env(Channel *chan, ptrlen var, ptrlen value) { return FALSE; }
int chan_no_send_break(Channel *chan, unsigned length) { return FALSE; }
int chan_no_send_signal(Channel *chan, ptrlen signame) { return FALSE; }
{ return false; }
int chan_no_set_env(Channel *chan, ptrlen var, ptrlen value) { return false; }
int chan_no_send_break(Channel *chan, unsigned length) { return false; }
int chan_no_send_signal(Channel *chan, ptrlen signame) { return false; }
int chan_no_change_window_size(
Channel *chan, unsigned width, unsigned height,
unsigned pixwidth, unsigned pixheight) { return FALSE; }
unsigned pixwidth, unsigned pixheight) { return false; }
void chan_no_request_response(Channel *chan, int success) {}
/*
@ -159,7 +159,7 @@ static void x11_sent(Plug *plug, int bufsize) {}
static void x11_closing(Plug *plug, const char *error_msg, int error_code,
int calling_back)
{
time_to_die = TRUE;
time_to_die = true;
}
struct X11Connection {
Plug plug;
@ -306,10 +306,10 @@ int have_controlling_tty(void)
perror("/dev/tty: open");
exit(1);
}
return FALSE;
return false;
} else {
close(fd);
return TRUE;
return true;
}
}
@ -326,9 +326,9 @@ static char *askpass_tty(const char *prompt)
{
int ret;
prompts_t *p = new_prompts();
p->to_server = FALSE;
p->to_server = false;
p->name = dupstr("Pageant passphrase prompt");
add_prompt(p, dupcat(prompt, ": ", (const char *)NULL), FALSE);
add_prompt(p, dupcat(prompt, ": ", (const char *)NULL), false);
ret = console_get_userpass_input(p);
assert(ret >= 0);
@ -400,7 +400,7 @@ static int unix_add_keyfile(const char *filename_str)
int status, ret;
char *err;
ret = TRUE;
ret = true;
/*
* Try without a passphrase.
@ -410,7 +410,7 @@ static int unix_add_keyfile(const char *filename_str)
goto cleanup;
} else if (status == PAGEANT_ACTION_FAILURE) {
fprintf(stderr, "pageant: %s: %s\n", filename_str, err);
ret = FALSE;
ret = false;
goto cleanup;
}
@ -437,7 +437,7 @@ static int unix_add_keyfile(const char *filename_str)
goto cleanup;
} else if (status == PAGEANT_ACTION_FAILURE) {
fprintf(stderr, "pageant: %s: %s\n", filename_str, err);
ret = FALSE;
ret = false;
goto cleanup;
}
}
@ -476,9 +476,9 @@ int match_fingerprint_string(const char *string, const char *fingerprint)
while (*string == ':') string++;
while (*hash == ':') hash++;
if (!*string)
return TRUE;
return true;
if (tolower((unsigned char)*string) != tolower((unsigned char)*hash))
return FALSE;
return false;
string++;
hash++;
}
@ -502,8 +502,8 @@ struct pageant_pubkey *find_key(const char *string, char **retstr)
{
struct key_find_ctx actx, *ctx = &actx;
struct pageant_pubkey key_in, *key_ret;
int try_file = TRUE, try_fp = TRUE, try_comment = TRUE;
int file_errors = FALSE;
int try_file = true, try_fp = true, try_comment = true;
int file_errors = false;
/*
* Trim off disambiguating prefixes telling us how to interpret
@ -511,17 +511,17 @@ struct pageant_pubkey *find_key(const char *string, char **retstr)
*/
if (!strncmp(string, "file:", 5)) {
string += 5;
try_fp = try_comment = FALSE;
file_errors = TRUE; /* also report failure to load the file */
try_fp = try_comment = false;
file_errors = true; /* also report failure to load the file */
} else if (!strncmp(string, "comment:", 8)) {
string += 8;
try_file = try_fp = FALSE;
try_file = try_fp = false;
} else if (!strncmp(string, "fp:", 3)) {
string += 3;
try_file = try_comment = FALSE;
try_file = try_comment = false;
} else if (!strncmp(string, "fingerprint:", 12)) {
string += 12;
try_file = try_comment = FALSE;
try_file = try_comment = false;
}
/*
@ -632,7 +632,7 @@ void run_client(void)
{
const struct cmdline_key_action *act;
struct pageant_pubkey *key;
int errors = FALSE;
int errors = false;
char *retstr;
if (!agent_exists()) {
@ -644,14 +644,14 @@ void run_client(void)
switch (act->action) {
case KEYACT_CLIENT_ADD:
if (!unix_add_keyfile(act->filename))
errors = TRUE;
errors = true;
break;
case KEYACT_CLIENT_LIST:
if (pageant_enum_keys(key_list_callback, NULL, &retstr) ==
PAGEANT_ACTION_FAILURE) {
fprintf(stderr, "pageant: listing keys: %s\n", retstr);
sfree(retstr);
errors = TRUE;
errors = true;
}
break;
case KEYACT_CLIENT_DEL:
@ -661,7 +661,7 @@ void run_client(void)
fprintf(stderr, "pageant: deleting key '%s': %s\n",
act->filename, retstr);
sfree(retstr);
errors = TRUE;
errors = true;
}
if (key)
pageant_pubkey_free(key);
@ -673,7 +673,7 @@ void run_client(void)
fprintf(stderr, "pageant: finding key '%s': %s\n",
act->filename, retstr);
sfree(retstr);
errors = TRUE;
errors = true;
} else {
FILE *fp = stdout; /* FIXME: add a -o option? */
@ -702,7 +702,7 @@ void run_client(void)
if (pageant_delete_all_keys(&retstr) == PAGEANT_ACTION_FAILURE) {
fprintf(stderr, "pageant: deleting all keys: %s\n", retstr);
sfree(retstr);
errors = TRUE;
errors = true;
}
break;
default:
@ -734,7 +734,7 @@ void run_agent(void)
int fd;
int i, fdcount, fdsize, fdstate;
int termination_pid = -1;
int errors = FALSE;
int errors = false;
Conf *conf;
const struct cmdline_key_action *act;
@ -749,7 +749,7 @@ void run_agent(void)
for (act = keyact_head; act; act = act->next) {
assert(act->action == KEYACT_AGENT_LOAD);
if (!unix_add_keyfile(act->filename))
errors = TRUE;
errors = true;
}
if (errors)
exit(1);
@ -811,13 +811,13 @@ void run_agent(void)
smemclr(greeting, greetinglen);
sfree(greeting);
pageant_fork_and_print_env(FALSE);
pageant_fork_and_print_env(false);
} else if (life == LIFE_TTY) {
schedule_timer(TTY_LIFE_POLL_INTERVAL,
tty_life_timer, &dummy_timer_ctx);
pageant_fork_and_print_env(TRUE);
pageant_fork_and_print_env(true);
} else if (life == LIFE_PERM) {
pageant_fork_and_print_env(FALSE);
pageant_fork_and_print_env(false);
} else if (life == LIFE_DEBUG) {
pageant_print_env(getpid());
pageant_logfp = stdout;
@ -840,8 +840,8 @@ void run_agent(void)
perror("fork");
exit(1);
} else if (pid == 0) {
setenv("SSH_AUTH_SOCK", socketname, TRUE);
setenv("SSH_AGENT_PID", dupprintf("%d", (int)agentpid), TRUE);
setenv("SSH_AUTH_SOCK", socketname, true);
setenv("SSH_AGENT_PID", dupprintf("%d", (int)agentpid), true);
execvp(exec_args[0], exec_args);
perror("exec");
_exit(127);
@ -945,7 +945,7 @@ void run_agent(void)
* clean up and leave.
*/
if (!have_controlling_tty()) {
time_to_die = TRUE;
time_to_die = true;
break;
}
}
@ -977,7 +977,7 @@ void run_agent(void)
if (pid <= 0)
break;
if (pid == termination_pid)
time_to_die = TRUE;
time_to_die = true;
}
}
@ -998,7 +998,7 @@ void run_agent(void)
int main(int argc, char **argv)
{
int doing_opts = TRUE;
int doing_opts = true;
keyact curr_keyact = KEYACT_AGENT_LOAD;
const char *standalone_askpass_prompt = NULL;
@ -1063,7 +1063,7 @@ int main(int argc, char **argv)
exit(1);
}
} else if (!strcmp(p, "--")) {
doing_opts = FALSE;
doing_opts = false;
}
} else {
/*
@ -1120,19 +1120,19 @@ int main(int argc, char **argv)
* actions of KEYACT_AGENT_* type.
*/
{
int has_agent_actions = FALSE;
int has_client_actions = FALSE;
int has_lifetime = FALSE;
int has_agent_actions = false;
int has_client_actions = false;
int has_lifetime = false;
const struct cmdline_key_action *act;
for (act = keyact_head; act; act = act->next) {
if (is_agent_action(act->action))
has_agent_actions = TRUE;
has_agent_actions = true;
else
has_client_actions = TRUE;
has_client_actions = true;
}
if (life != LIFE_UNSPEC)
has_lifetime = TRUE;
has_lifetime = true;
if (has_lifetime && has_client_actions) {
fprintf(stderr, "pageant: client key actions (-a, -d, -D, -l, -L)"

38
unix/uxplink.c
View File

@ -38,7 +38,7 @@ void cmdline_error(const char *fmt, ...)
exit(1);
}
static int local_tty = FALSE; /* do we have a local tty? */
static int local_tty = false; /* do we have a local tty? */
static Backend *backend;
static Conf *conf;
@ -79,7 +79,7 @@ char *x_get_default(const char *key)
}
int term_ldisc(Terminal *term, int mode)
{
return FALSE;
return false;
}
static void plink_echoedit_update(Seat *seat, int echo, int edit)
{
@ -353,11 +353,11 @@ static int plink_output(Seat *seat, int is_stderr, const void *data, int len)
{
if (is_stderr) {
bufchain_add(&stderr_data, data, len);
return try_output(TRUE);
return try_output(true);
} else {
assert(outgoingeof == EOF_NO);
bufchain_add(&stdout_data, data, len);
return try_output(FALSE);
return try_output(false);
}
}
@ -365,8 +365,8 @@ static int plink_eof(Seat *seat)
{
assert(outgoingeof == EOF_NO);
outgoingeof = EOF_PENDING;
try_output(FALSE);
return FALSE; /* do not respond to incoming EOF with outgoing */
try_output(false);
return false; /* do not respond to incoming EOF with outgoing */
}
static int plink_get_userpass_input(Seat *seat, prompts_t *p, bufchain *input)
@ -546,10 +546,10 @@ static void version(void)
void frontend_net_error_pending(void) {}
const int share_can_be_downstream = TRUE;
const int share_can_be_upstream = TRUE;
const int share_can_be_downstream = true;
const int share_can_be_upstream = true;
const int buildinfo_gtk_relevant = FALSE;
const int buildinfo_gtk_relevant = false;
int main(int argc, char **argv)
{
@ -560,7 +560,7 @@ int main(int argc, char **argv)
int exitcode;
int errors;
int use_subsystem = 0;
int just_test_share_exists = FALSE;
int just_test_share_exists = false;
unsigned long now;
struct winsize size;
const struct BackendVtable *backvt;
@ -591,7 +591,7 @@ int main(int argc, char **argv)
*/
conf = conf_new();
do_defaults(NULL, conf);
loaded_session = FALSE;
loaded_session = false;
default_protocol = conf_get_int(conf, CONF_protocol);
default_port = conf_get_int(conf, CONF_port);
errors = 0;
@ -645,7 +645,7 @@ int main(int argc, char **argv)
provide_xrm_string(*++argv);
}
} else if (!strcmp(p, "-shareexists")) {
just_test_share_exists = TRUE;
just_test_share_exists = true;
} else if (!strcmp(p, "-fuzznet")) {
conf_set_int(conf, CONF_proxy_type, PROXY_FUZZ);
conf_set_str(conf, CONF_proxy_telnet_command, "%host");
@ -674,7 +674,7 @@ int main(int argc, char **argv)
/* change trailing blank to NUL */
conf_set_str(conf, CONF_remote_cmd, command);
conf_set_str(conf, CONF_remote_cmd2, "");
conf_set_int(conf, CONF_nopty, TRUE); /* command => no tty */
conf_set_int(conf, CONF_nopty, true); /* command => no tty */
break; /* done with cmdline */
} else {
@ -713,7 +713,7 @@ int main(int argc, char **argv)
* Apply subsystem status.
*/
if (use_subsystem)
conf_set_int(conf, CONF_ssh_subsys, TRUE);
conf_set_int(conf, CONF_ssh_subsys, true);
if (!*conf_get_str(conf, CONF_remote_cmd) &&
!*conf_get_str(conf, CONF_remote_cmd2) &&
@ -772,7 +772,7 @@ int main(int argc, char **argv)
!conf_get_int(conf, CONF_x11_forward) &&
!conf_get_int(conf, CONF_agentfwd) &&
!conf_get_str_nthstrkey(conf, CONF_portfwd, 0))
conf_set_int(conf, CONF_ssh_simple, TRUE);
conf_set_int(conf, CONF_ssh_simple, true);
if (just_test_share_exists) {
if (!backvt->test_for_upstream) {
@ -823,7 +823,7 @@ int main(int argc, char **argv)
local_tty = (tcgetattr(STDIN_FILENO, &orig_termios) == 0);
atexit(cleanup_termios);
seat_echoedit_update(plink_seat, 1, 1);
sending = FALSE;
sending = false;
now = GETTICKCOUNT();
while (1) {
@ -958,7 +958,7 @@ int main(int argc, char **argv)
exit(1);
} else if (ret == 0) {
backend_special(backend, SS_EOF, 0);
sending = FALSE; /* send nothing further after this */
sending = false; /* send nothing further after this */
} else {
if (local_tty)
from_tty(buf, ret);
@ -969,11 +969,11 @@ int main(int argc, char **argv)
}
if (FD_ISSET(STDOUT_FILENO, &wset)) {
backend_unthrottle(backend, try_output(FALSE));
backend_unthrottle(backend, try_output(false));
}
if (FD_ISSET(STDERR_FILENO, &wset)) {
backend_unthrottle(backend, try_output(TRUE));
backend_unthrottle(backend, try_output(true));
}
run_toplevel_callbacks();

2
unix/uxpterm.c
View File

@ -11,7 +11,7 @@ const char *const appname = "pterm";
const int use_event_log = 0; /* pterm doesn't need it */
const int new_session = 0, saved_sessions = 0; /* or these */
const int dup_check_launchable = 0; /* no need to check host name in conf */
const int use_pty_argv = TRUE;
const int use_pty_argv = true;
const struct BackendVtable *select_backend(Conf *conf)
{

30
unix/uxpty.c
View File

@ -285,10 +285,10 @@ static void sigchld_handler(int signum)
static void pty_setup_sigchld_handler(void)
{
static int setup = FALSE;
static int setup = false;
if (!setup) {
putty_signal(SIGCHLD, sigchld_handler);
setup = TRUE;
setup = true;
}
}
@ -455,7 +455,7 @@ void pty_pre_init(void)
pty_setup_sigchld_handler();
pty->master_fd = pty->slave_fd = -1;
#ifndef OMIT_UTMP
pty_stamped_utmp = FALSE;
pty_stamped_utmp = false;
#endif
if (geteuid() != getuid() || getegid() != getgid()) {
@ -597,7 +597,7 @@ static void pty_real_select_result(Pty *pty, int fd, int event, int status)
{
char buf[4096];
int ret;
int finished = FALSE;
int finished = false;
if (event < 0) {
/*
@ -608,7 +608,7 @@ static void pty_real_select_result(Pty *pty, int fd, int event, int status)
/*
* The primary child process died.
*/
pty->child_dead = TRUE;
pty->child_dead = true;
del234(ptys_by_pid, pty);
pty->exit_code = status;
@ -625,7 +625,7 @@ static void pty_real_select_result(Pty *pty, int fd, int event, int status)
* or make configurable if necessary.
*/
if (pty->master_fd >= 0)
finished = TRUE;
finished = true;
}
} else {
if (event == 1) {
@ -667,7 +667,7 @@ static void pty_real_select_result(Pty *pty, int fd, int event, int status)
* usage model would precisely _not_ be for the
* pterm window to hang around!
*/
finished = TRUE;
finished = true;
pty_try_wait(); /* one last effort to collect exit code */
if (!pty->child_dead)
pty->exit_code = 0;
@ -696,7 +696,7 @@ static void pty_real_select_result(Pty *pty, int fd, int event, int status)
pty_close(pty);
pty->finished = TRUE;
pty->finished = true;
/*
* This is a slight layering-violation sort of hack: only
@ -862,7 +862,7 @@ Backend *pty_backend_create(
pty = new_pty_struct();
pty->master_fd = pty->slave_fd = -1;
#ifndef OMIT_UTMP
pty_stamped_utmp = FALSE;
pty_stamped_utmp = false;
#endif
}
for (i = 0; i < 6; i++)
@ -1193,8 +1193,8 @@ Backend *pty_backend_create(
_exit(127);
} else {
pty->child_pid = pid;
pty->child_dead = FALSE;
pty->finished = FALSE;
pty->child_dead = false;
pty->finished = false;
if (pty->slave_fd > 0)
close(pty->slave_fd);
if (!ptys_by_pid)
@ -1248,7 +1248,7 @@ static const char *pty_init(Seat *seat, Backend **backend_handle,
cmd = pty_argv[0];
*backend_handle= pty_backend_create(
seat, logctx, conf, pty_argv, cmd, modes, FALSE);
seat, logctx, conf, pty_argv, cmd, modes, false);
*realhost = dupstr("");
return NULL;
}
@ -1327,7 +1327,7 @@ static void pty_try_write(Pty *pty)
uxsel_del(pty->master_i);
close(pty->master_i);
pty->master_i = -1;
pty->pending_eof = FALSE;
pty->pending_eof = false;
}
pty_uxsel_setup(pty);
@ -1427,7 +1427,7 @@ static void pty_special(Backend *be, SessionSpecialCode code, int arg)
if (code == SS_EOF) {
if (pty->master_i >= 0 && pty->master_i != pty->master_fd) {
pty->pending_eof = TRUE;
pty->pending_eof = true;
pty_try_write(pty);
}
return;
@ -1473,7 +1473,7 @@ static const SessionSpecial *pty_get_specials(Backend *be)
static int pty_connected(Backend *be)
{
/* Pty *pty = container_of(be, Pty, backend); */
return TRUE;
return true;
}
static int pty_sendok(Backend *be)

8
unix/uxputty.c
View File

@ -20,7 +20,7 @@
/*
* Stubs to avoid uxpty.c needing to be linked in.
*/
const int use_pty_argv = FALSE;
const int use_pty_argv = false;
char **pty_argv; /* never used */
char *pty_osx_envrestore_prefix;
@ -48,7 +48,7 @@ const struct BackendVtable *select_backend(Conf *conf)
void initial_config_box(Conf *conf, post_dialog_fn_t after, void *afterctx)
{
char *title = dupcat(appname, " Configuration", NULL);
create_config_box(title, conf, FALSE, 0, after, afterctx);
create_config_box(title, conf, false, 0, after, afterctx);
sfree(title);
}
@ -73,8 +73,8 @@ char *platform_get_x_display(void) {
return dupstr(display);
}
const int share_can_be_downstream = TRUE;
const int share_can_be_upstream = TRUE;
const int share_can_be_downstream = true;
const int share_can_be_upstream = true;
void setup(int single)
{

8
unix/uxser.c
View File

@ -294,7 +294,7 @@ static const char *serial_init(Seat *seat, Backend **backend_handle,
serial->seat = seat;
serial->logctx = logctx;
serial->finished = FALSE;
serial->finished = false;
serial->inbufsize = 0;
bufchain_init(&serial->output_data);
@ -361,7 +361,7 @@ static void serial_select_result(int fd, int event)
Serial *serial;
char buf[4096];
int ret;
int finished = FALSE;
int finished = false;
serial = find234(serial_by_fd, &fd, serial_find_by_fd);
@ -377,7 +377,7 @@ static void serial_select_result(int fd, int event)
* to the idea that there might be two-way devices we
* can treat _like_ serial ports which can return EOF.
*/
finished = TRUE;
finished = true;
} else if (ret < 0) {
#ifdef EAGAIN
if (errno == EAGAIN)
@ -403,7 +403,7 @@ static void serial_select_result(int fd, int event)
if (finished) {
serial_close(serial);
serial->finished = TRUE;
serial->finished = true;
seat_notify_remote_exit(serial->seat);
}

28
unix/uxserver.c
View File

@ -173,7 +173,7 @@ unsigned auth_methods(AuthPolicy *ap)
}
int auth_none(AuthPolicy *ap, ptrlen username)
{
return FALSE;
return false;
}
int auth_password(AuthPolicy *ap, ptrlen username, ptrlen password,
ptrlen *new_password_opt)
@ -211,9 +211,9 @@ int auth_publickey(AuthPolicy *ap, ptrlen username, ptrlen public_blob)
struct AuthPolicy_ssh2_pubkey *iter;
for (iter = ap->ssh2keys; iter; iter = iter->next) {
if (ptrlen_eq_ptrlen(public_blob, iter->public_blob))
return TRUE;
return true;
}
return FALSE;
return false;
}
struct RSAKey *auth_publickey_ssh1(
AuthPolicy *ap, ptrlen username, Bignum rsa_modulus)
@ -237,9 +237,9 @@ AuthKbdInt *auth_kbdint_prompts(AuthPolicy *ap, ptrlen username)
aki->nprompts = 2;
aki->prompts = snewn(aki->nprompts, AuthKbdIntPrompt);
aki->prompts[0].prompt = dupstr("Echoey prompt: ");
aki->prompts[0].echo = TRUE;
aki->prompts[0].echo = true;
aki->prompts[1].prompt = dupstr("Silent prompt: ");
aki->prompts[1].echo = FALSE;
aki->prompts[1].echo = false;
return aki;
case 1:
aki->title = dupstr("Zero-prompt step");
@ -286,7 +286,7 @@ int auth_ssh1int_response(AuthPolicy *ap, ptrlen response)
}
int auth_successful(AuthPolicy *ap, ptrlen username, unsigned method)
{
return TRUE;
return true;
}
static void safety_warning(FILE *fp)
@ -319,13 +319,13 @@ static void show_version_and_exit(void)
exit(0);
}
const int buildinfo_gtk_relevant = FALSE;
const int buildinfo_gtk_relevant = false;
static int finished = FALSE;
static int finished = false;
void server_instance_terminated(void)
{
/* FIXME: change policy here if we're running in a listening loop */
finished = TRUE;
finished = true;
}
static int longoptarg(const char *arg, const char *expected,
@ -333,21 +333,21 @@ static int longoptarg(const char *arg, const char *expected,
{
int len = strlen(expected);
if (memcmp(arg, expected, len))
return FALSE;
return false;
if (arg[len] == '=') {
*val = arg + len + 1;
return TRUE;
return true;
} else if (arg[len] == '\0') {
if (--*argcp > 0) {
*val = *++*argvp;
return TRUE;
return true;
} else {
fprintf(stderr, "%s: option %s expects an argument\n",
appname, expected);
exit(1);
}
}
return FALSE;
return false;
}
extern const SftpServerVtable unix_live_sftpserver_vt;
@ -393,7 +393,7 @@ int main(int argc, char **argv)
} else if (!strcmp(arg, "--version")) {
show_version_and_exit();
} else if (!strcmp(arg, "--verbose") || !strcmp(arg, "-v")) {
verbose = TRUE;
verbose = true;
} else if (longoptarg(arg, "--hostkey", &val, &argc, &argv)) {
Filename *keyfile;
int keytype;

16
unix/uxsftp.c
View File

@ -37,7 +37,7 @@ void platform_get_x11_auth(struct X11Display *display, Conf *conf)
{
/* Do nothing, therefore no auth. */
}
const int platform_uses_x11_unix_by_default = TRUE;
const int platform_uses_x11_unix_by_default = true;
/*
* Default settings that are specific to PSFTP.
@ -415,12 +415,12 @@ char *stripslashes(const char *str, int local)
int vet_filename(const char *name)
{
if (strchr(name, '/'))
return FALSE;
return false;
if (name[0] == '.' && (!name[1] || (name[1] == '.' && !name[2])))
return FALSE;
return false;
return TRUE;
return true;
}
int create_directory(const char *name)
@ -444,7 +444,7 @@ static int ssh_sftp_do_select(int include_stdin, int no_fds_ok)
int fd, fdstate, rwx, ret, maxfd;
unsigned long now = GETTICKCOUNT();
unsigned long next;
int done_something = FALSE;
int done_something = false;
fdlist = NULL;
fdcount = fdsize = 0;
@ -555,7 +555,7 @@ static int ssh_sftp_do_select(int include_stdin, int no_fds_ok)
*/
int ssh_sftp_loop_iteration(void)
{
return ssh_sftp_do_select(FALSE, FALSE);
return ssh_sftp_do_select(false, false);
}
/*
@ -573,7 +573,7 @@ char *ssh_sftp_get_cmdline(const char *prompt, int no_fds_ok)
buflen = bufsize = 0;
while (1) {
ret = ssh_sftp_do_select(TRUE, no_fds_ok);
ret = ssh_sftp_do_select(true, no_fds_ok);
if (ret < 0) {
printf("connection died\n");
sfree(buf);
@ -608,7 +608,7 @@ void frontend_net_error_pending(void) {}
void platform_psftp_pre_conn_setup(void) {}
const int buildinfo_gtk_relevant = FALSE;
const int buildinfo_gtk_relevant = false;
/*
* Main program: do platform-specific initialisation and then call

22
unix/uxsftpserver.c
View File

@ -107,12 +107,12 @@ static int uss_decode_handle(
unsigned char handlebuf[8];
if (handle.len != 8)
return FALSE;
return false;
memcpy(handlebuf, handle.ptr, 8);
des_decrypt_xdmauth(uss->handlekey, handlebuf, 8);
*index = toint(GET_32BIT(handlebuf));
*seq = GET_32BIT(handlebuf + 4);
return TRUE;
return true;
}
static void uss_return_new_handle(
@ -126,12 +126,12 @@ static void uss_return_new_handle(
uss->fdsopen = sresize(uss->fdsopen, uss->fdsize, int);
while (old_size < uss->fdsize) {
uss->fdseqs[old_size] = 0;
uss->fdsopen[old_size] = FALSE;
uss->fdsopen[old_size] = false;
old_size++;
}
}
assert(!uss->fdsopen[fd]);
uss->fdsopen[fd] = TRUE;
uss->fdsopen[fd] = true;
if (++uss->fdseqs[fd] == USS_DIRHANDLE_SEQ)
uss->fdseqs[fd] = 0;
uss_return_handle_raw(uss, reply, fd, uss->fdseqs[fd]);
@ -286,7 +286,7 @@ static void uss_close(SftpServer *srv, SftpReplyBuilder *reply,
} else if ((fd = uss_lookup_fd(uss, reply, handle)) >= 0) {
close(fd);
assert(0 <= fd && fd <= uss->fdsize);
uss->fdsopen[fd] = FALSE;
uss->fdsopen[fd] = false;
fxp_reply_ok(reply);
}
/* if both failed, uss_lookup_fd will have filled in an error response */
@ -424,20 +424,20 @@ static void uss_fstat(SftpServer *srv, SftpReplyBuilder *reply,
{ \
if (attrs.flags & SSH_FILEXFER_ATTR_SIZE) \
if (api_prefix(truncate)(api_arg, attrs.size) < 0) \
success = FALSE; \
success = false; \
if (attrs.flags & SSH_FILEXFER_ATTR_UIDGID) \
if (api_prefix(chown)(api_arg, attrs.uid, attrs.gid) < 0) \
success = FALSE; \
success = false; \
if (attrs.flags & SSH_FILEXFER_ATTR_PERMISSIONS) \
if (api_prefix(chmod)(api_arg, attrs.permissions) < 0) \
success = FALSE; \
success = false; \
if (attrs.flags & SSH_FILEXFER_ATTR_ACMODTIME) { \
struct timeval tv[2]; \
tv[0].tv_sec = attrs.atime; \
tv[1].tv_sec = attrs.mtime; \
tv[0].tv_usec = tv[1].tv_usec = 0; \
if (api_prefix(utimes)(api_arg, tv) < 0) \
success = FALSE; \
success = false; \
} \
} while (0)
@ -450,7 +450,7 @@ static void uss_setstat(SftpServer *srv, SftpReplyBuilder *reply,
UnixSftpServer *uss = container_of(srv, UnixSftpServer, srv);
char *pathstr = mkstr(path);
int success = TRUE;
int success = true;
SETSTAT_GUTS(PATH_PREFIX, pathstr, attrs, success);
free(pathstr);
@ -470,7 +470,7 @@ static void uss_fsetstat(SftpServer *srv, SftpReplyBuilder *reply,
if ((fd = uss_lookup_fd(uss, reply, handle)) < 0)
return;
int success = TRUE;
int success = true;
SETSTAT_GUTS(FD_PREFIX, fd, attrs, success);
if (!success) {

2
unix/uxucs.c
View File

@ -96,7 +96,7 @@ int wc_to_mb(int codepage, int flags, const wchar_t *wcstr, int wclen,
}
/*
* Return value is TRUE if pterm is to run in direct-to-font mode.
* Return value is true if pterm is to run in direct-to-font mode.
*/
int init_ucs(struct unicode_data *ucsdata, char *linecharset,
int utf8_override, int font_charset, int vtmode)