dany/l3afpad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* l3afpad-0.8.18.1.4

Browse Source
This commit is contained in:
Wen-Yen Chuang
2011-12-12 21:37:14 +08:00
parent c9b1ad4888
commit a7614a0fc8
54 changed files with 1203 additions and 953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dnd.c
View File

@@ -83,9 +83,7 @@ static void dnd_open_first_file(gchar *filename)
// undo_init(sd->mainwin->textview, sd->mainwin->textbuffer, sd->mainwin->menubar);
}
}
#endif
#if 0
static void dnd_drag_data_recieved_handler(GtkWidget *widget,
GdkDragContext *context, gint x, gint y,
GtkSelectionData *selection_data, guint info, guint time)
@@ -102,10 +100,8 @@ static void dnd_drag_data_recieved_handler(GtkWidget *widget,
#endif
DV(g_print("DND start!\n"));
#if 0
if (g_ascii_strcasecmp(gdk_atom_name(context->targets->data),
"GTK_TEXT_BUFFER_CONTENTS") != 0) {
#endif
if (flag_called_once) {
flag_called_once = FALSE;
g_signal_stop_emission_by_name(widget, "drag_data_received");
@@ -223,4 +219,3 @@ DV(g_print("%s\n", name));
return flag;
}
#endif

12
src/font.c
View File

@@ -24,18 +24,10 @@ void set_text_font_by_name(GtkWidget *widget, gchar *fontname)
PangoFontDescription *font_desc;
font_desc = pango_font_description_from_string(fontname);
gtk_widget_modify_font(widget, font_desc);
gtk_widget_override_font(widget, font_desc);
pango_font_description_free(font_desc);
}
gchar *get_font_name_from_widget(GtkWidget *widget) /* MUST BE FREED */
{
GtkStyle *style;
style = gtk_widget_get_style(widget);
return pango_font_description_to_string(style->font_desc);
}
static gchar *get_font_name_by_selector(GtkWidget *window, gchar *current_fontname)
{
GtkWidget *dialog;
@@ -57,7 +49,7 @@ void change_text_font_by_selector(GtkWidget *widget)
{
gchar *current_fontname, *fontname;
current_fontname = get_font_name_from_widget(widget);
current_fontname = pango_font_description_to_string(gtk_style_context_get_font(gtk_widget_get_style_context(widget), 0));
fontname = get_font_name_by_selector(
gtk_widget_get_toplevel(widget), current_fontname);
if (fontname) {

1
src/font.h
View File

@@ -21,7 +21,6 @@
#define _FONT_H
void set_text_font_by_name(GtkWidget *widget, gchar *fontname);
gchar *get_font_name_from_widget(GtkWidget *widget); /* MUST BE FREED */
void change_text_font_by_selector(GtkWidget *widget);
#endif /* _FONT_H */

5
src/gtksourceiter.c
View File

@@ -23,12 +23,9 @@
* Parts of this file are copied from the gedit and glimmer project.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include "gtksourceiter.h"
#include "l3afpad.h"
#define GTK_TEXT_UNKNOWN_CHAR 0xFFFC

6
src/gtksourceiter.h
View File

@@ -34,21 +34,21 @@ typedef enum
/* Possible future plans: SEARCH_REGEXP */
} GtkSourceSearchFlags;
gboolean gtk_source_iter_forward_search (const GtkTextIter *iter,
gboolean gtk_source_iter_forward_search (const GtkTextIter *iter,
const gchar *str,
GtkSourceSearchFlags flags,
GtkTextIter *match_start,
GtkTextIter *match_end,
const GtkTextIter *limit);
gboolean gtk_source_iter_backward_search (const GtkTextIter *iter,
gboolean gtk_source_iter_backward_search (const GtkTextIter *iter,
const gchar *str,
GtkSourceSearchFlags flags,
GtkTextIter *match_start,
GtkTextIter *match_end,
const GtkTextIter *limit);
gboolean gtk_source_iter_find_matching_bracket (GtkTextIter *iter);
gboolean gtk_source_iter_find_matching_bracket (GtkTextIter *iter);
G_END_DECLS

25
src/l3afpad.h
View File

@@ -31,6 +31,10 @@
#define ENABLE_PRINT 1
#endif
#ifndef ENABLE_XINPUT2
#define ENABLE_XINPUT2 1
#endif
#include "window.h"
#include "menu.h"
#include "callback.h"
@@ -65,27 +69,32 @@
#define GTK_WIDGET_VISIBLE gtk_widget_get_visible
#define GtkOptionMenu GtkComboBox
#define gtk_option_menu_get_history gtk_combo_box_get_active
#define gtk_option_menu_new gtk_combo_box_text_new
#define gtk_option_menu_set_history gtk_combo_box_set_active
#define gtk_option_menu_set_menu(x,y)
#ifndef USE_GTK_GRID
#if !USE_GTK_GRID
#define gtk_orientable_set_orientation(x,y)
#define gtk_widget_set_hexpand(x,y)
#define gtk_widget_set_vexpand(x,y)
#endif
#ifdef USE_GTK_GRID
#if USE_GTK_GRID
#undef GTK_BOX
#define GTK_BOX GTK_GRID
#define gtk_hbox_new(x,y) gtk_grid_new()
#define gtk_vbox_new(x,y) gtk_grid_new()
#define gtk_box_pack_start(v,w,x,y,z) gtk_container_add(GTK_CONTAINER(v),w)
#endif
#if GTK_CHECK_VERSION(3,1,12)
#if GLIB_CHECK_VERSION(2,29,14) && defined(G_DISABLE_DEPRECATED)
#define g_unicode_canonical_decomposition (gunichar*)g_unicode_canonical_decomposition
#endif
#if GTK_CHECK_VERSION(3,1,6) && !USE_GTK_GRID && defined(GTK_DISABLE_DEPRECATED)
#define gtk_hbox_new (GtkWidget*)gtk_hbox_new
#define gtk_vbox_new (GtkWidget*)gtk_vbox_new
#endif
#if GTK_CHECK_VERSION(3,1,90)
#undef GTK_FONT_SELECTION_DIALOG
#define GTK_FONT_SELECTION_DIALOG GTK_FONT_CHOOSER_DIALOG
#define GTK_FONT_SELECTION_DIALOG GTK_FONT_CHOOSER
#define gtk_font_selection_dialog_new(x) gtk_font_chooser_dialog_new(x, NULL)
#define gtk_font_selection_dialog_get_font_name gtk_font_chooser_dialog_get_font_name
#define gtk_font_selection_dialog_set_font_name gtk_font_chooser_dialog_set_font_name
#define gtk_font_selection_dialog_get_font_name gtk_font_chooser_get_font
#define gtk_font_selection_dialog_set_font_name gtk_font_chooser_set_font
#endif
typedef struct {

6
src/linenum.c
View File

@@ -272,12 +272,8 @@ DV({g_print("Painting line numbers %d - %d\n",
pango_layout_set_text (layout, str, -1);
gtk_paint_layout (gtk_widget_get_style(widget),
gtk_render_layout (gtk_widget_get_style_context(widget),
event,
gtk_widget_get_state (widget),
FALSE,
widget,
NULL,
layout_width + justify_width + margin / 2 + 1,
pos,
layout);

6
src/main.c
View File

@@ -78,7 +78,7 @@ void save_config_file(void)
gboolean wordwrap, linenumbers, autoindent;
gtk_window_get_size(GTK_WINDOW(pub->mw->window), &width, &height);
fontname = get_font_name_from_widget(pub->mw->view);
fontname = pango_font_description_to_string(gtk_style_context_get_font(gtk_widget_get_style_context(pub->mw->view), 0));
ifactory = gtk_item_factory_from_widget(pub->mw->menubar);
wordwrap = gtk_check_menu_item_get_active(
GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item(ifactory,
@@ -203,6 +203,10 @@ gint main(gint argc, gchar **argv)
parse_args(argc, argv, pub->fi);
#if !ENABLE_XINPUT2
gdk_disable_multidevice();
#endif
gtk_init(&argc, &argv);
g_set_application_name(PACKAGE_NAME);

1
src/selector.c
View File

@@ -1,6 +1,7 @@
/*
* L3afpad - GTK+ based simple text editor
* Copyright (C) 2004-2005 Tarot Osuji
* Copyright (C) 2011 Wen-Yen Chuang <caleb AT calno DOT com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/view.c
View File

@@ -323,7 +323,7 @@ static void cb_end_user_action(GtkTextBuffer *buffer, GtkWidget *view)
GtkWidget *create_text_view(void)
{
GtkWidget *view;
GtkWidget *view;
GtkTextBuffer *buffer;
view = gtk_text_view_new();

8
src/window.c
View File

@@ -28,10 +28,10 @@ MainWin *create_main_window(void)
{
GtkWidget *window;
GtkWidget *vbox;
GtkWidget *menubar;
GtkWidget *sw;
GtkWidget *view;
// gint size;
GtkWidget *menubar;
GtkWidget *sw;
GtkWidget *view;
// gint size;
// GtkAdjustment *hadj, *vadj;
MainWin *mw = g_malloc(sizeof(MainWin));