Develop and Download Open Source Software

Browse CVS Repository

Diff of /shiki/shiki/shiki.c

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.39 by aloha, Sun Nov 19 10:18:37 2006 UTC revision 1.40 by aloha, Sun Nov 19 10:29:42 2006 UTC
# Line 46  typedef struct { Line 46  typedef struct {
46  typedef struct {  typedef struct {
47    const gchar       *locale;           /* バッファ内容のロケール */    const gchar       *locale;           /* バッファ内容のロケール */
48    GtkScrolledWindow *tabpage;          /* タブ */    GtkScrolledWindow *tabpage;          /* タブ */
49    gchar             *tabpage_label;    /* ベース (ファイル名) のみ */    gchar             *tabpage_label;    /* タブのタイトル */
50      gchar             *basename;         /* ベース (ファイル名) のみ */
51    GtkTextView       *text_view;        /* タブの表示 */    GtkTextView       *text_view;        /* タブの表示 */
52    GtkTextBuffer     *text_buffer;      /* タブのテキストバッファ */    GtkTextBuffer     *text_buffer;      /* タブのテキストバッファ */
53    gchar             *filename;         /* ファイル名のフルパス */    gchar             *filename;         /* ファイル名のフルパス */
# Line 86  static struct { Line 87  static struct {
87  #define Shiki_CURRENT_TAB_TITLE      (shiki_editor.current_tabpage_info)->tabpage_label  #define Shiki_CURRENT_TAB_TITLE      (shiki_editor.current_tabpage_info)->tabpage_label
88  #define Shiki_CURRENT_TEXT_VIEW      (shiki_editor.current_tabpage_info)->text_view  #define Shiki_CURRENT_TEXT_VIEW      (shiki_editor.current_tabpage_info)->text_view
89  #define Shiki_CURRENT_TEXT_BUFFER    (shiki_editor.current_tabpage_info)->text_buffer  #define Shiki_CURRENT_TEXT_BUFFER    (shiki_editor.current_tabpage_info)->text_buffer
90    #define Shiki_CURRENT_BASENAME      (shiki_editor.current_tabpage_info)->basename
91  #define Shiki_CURRENT_FILENAME       (shiki_editor.current_tabpage_info)->filename  #define Shiki_CURRENT_FILENAME       (shiki_editor.current_tabpage_info)->filename
92  #define Shiki_CURRENT_BUFFER_ENV     (shiki_editor.current_tabpage_info)->env  #define Shiki_CURRENT_BUFFER_ENV     (shiki_editor.current_tabpage_info)->env
93    
# Line 426  static void append_tabpage(gchar *filena Line 428  static void append_tabpage(gchar *filena
428    tabinfo->locale        = "Gtk Default (utf8)";    tabinfo->locale        = "Gtk Default (utf8)";
429    tabinfo->undoInfoList  = NULL;    tabinfo->undoInfoList  = NULL;
430    tabinfo->filename      = filename;    tabinfo->filename      = filename;
431    tabinfo->tabpage_label = g_path_get_basename(filename);    tabinfo->basename      = g_path_get_basename(filename);
432      tabinfo->tabpage_label = g_strndup(tabinfo->basename, 7);
433    tabinfo->env           = Scm_MakeModule(NULL, FALSE);    tabinfo->env           = Scm_MakeModule(NULL, FALSE);
434    
435    g_return_if_fail(tabinfo->env != SCM_FALSE);    g_return_if_fail(tabinfo->env != SCM_FALSE);
# Line 487  static void remove_tabpage() { Line 490  static void remove_tabpage() {
490      gtk_widget_destroy(GTK_WIDGET(Shiki_CURRENT_TEXT_VIEW));      gtk_widget_destroy(GTK_WIDGET(Shiki_CURRENT_TEXT_VIEW));
491      /* タブに対応するタブ情報を削除 */      /* タブに対応するタブ情報を削除 */
492      g_free(Shiki_CURRENT_TAB_TITLE);      g_free(Shiki_CURRENT_TAB_TITLE);
493        g_free(Shiki_CURRENT_BASENAME);
494      g_free(Shiki_CURRENT_FILENAME);      g_free(Shiki_CURRENT_FILENAME);
495      Shiki_EDITOR_TAB_INFO_LIST = g_list_delete_link(Shiki_EDITOR_TAB_INFO_LIST, g_list_nth(Shiki_EDITOR_TAB_INFO_LIST, Shiki_CURRENT_TAB_NUM));      Shiki_EDITOR_TAB_INFO_LIST = g_list_delete_link(Shiki_EDITOR_TAB_INFO_LIST, g_list_nth(Shiki_EDITOR_TAB_INFO_LIST, Shiki_CURRENT_TAB_NUM));
496      g_free(Shiki_CURRENT_TAB_INFO);      g_free(Shiki_CURRENT_TAB_INFO);
# Line 620  static void update_modeline_label() { Line 624  static void update_modeline_label() {
624    
625    g_snprintf(label, 1024, "--%s- %-10s (Gauche Interaction) [%s]     L%d:%d    ",    g_snprintf(label, 1024, "--%s- %-10s (Gauche Interaction) [%s]     L%d:%d    ",
626        gtk_text_buffer_get_modified(Shiki_CURRENT_TEXT_BUFFER) ? "**" : "--",        gtk_text_buffer_get_modified(Shiki_CURRENT_TEXT_BUFFER) ? "**" : "--",
627        Shiki_CURRENT_TAB_TITLE,        Shiki_CURRENT_BASENAME,
628        Shiki_CURRENT_LOCALE,        Shiki_CURRENT_LOCALE,
629        gtk_text_iter_get_line(&p) + 1,        gtk_text_iter_get_line(&p) + 1,
630        gtk_text_iter_get_line_offset (&p) + 1);        gtk_text_iter_get_line_offset (&p) + 1);

Legend:
Removed from v.1.39  
changed lines
  Added in v.1.40

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26