Diff of /shiki/shiki/shiki.c

OSDN > Find Software > S 式エディタ

 Browse CVS Repository



/[OSDN]/shiki/shiki/shiki.c




Diff of /shiki/shiki/shiki.c



 Parent Directory

|  Revision Log


|  Revision Graph


|  Patch














revision 1.51 by aloha,
Thu Nov 23 15:18:28 2006 UTC




revision 1.52 by aloha,
Thu Nov 23 16:58:36 2006 UTC






#

Line 183 
 static void about_this_application();


Line 183 
 static void about_this_application();












183
 /* エディタの初期化 */
 /* エディタの初期化 */

















184
 static void shiki_editor_window_init(int argc, char **argv);
 static void shiki_editor_window_init(int argc, char **argv);

















185
 
 












186
 
 







187
 
 static ScmObj Shiki_buffer_substring(ScmObj *SCM_FP, int SCM_ARGCNT, void *data_)







188
 
 {







189
 
   ScmObj start, end, result;







190
 
   GtkTextIter s, e;







191
 
   gchar *substring;







192
 
   SCM_ENTER_SUBR("buffer-substring");







193
 
   start = SCM_ARGREF(0);







194
 
   end = SCM_ARGREF(1);







195
 
   if(Scm_NumCmp(start, end) >= 0)







196
 
     return SCM_FALSE;







197
 
   gtk_text_buffer_get_iter_at_offset(Shiki_CURRENT_TEXT_BUFFER, &s, SCM_INT_VALUE(start)); 







198
 
   gtk_text_buffer_get_iter_at_offset(Shiki_CURRENT_TEXT_BUFFER, &e, SCM_INT_VALUE(end));







199
 
 







200
 
   substring = gtk_text_buffer_get_text(Shiki_CURRENT_TEXT_BUFFER, &s, &e, FALSE);







201
 
   result = SCM_MAKE_STR_COPYING(substring);







202
 
   g_free(substring);







203
 
   SCM_RETURN(result);







204
 
 }







205
 
 







206
 
 static SCM_DEFINE_STRING_CONST(buffer_substring__NAME, "buffer-substring", 16, 16);







207
 
 static SCM_DEFINE_SUBR(buffer_substring__STUB, 2, 0, SCM_OBJ(&buffer_substring__NAME), Shiki_buffer_substring, NULL, NULL);







208
 
 












209
 /* バッファの内容を消去 */
 /* バッファの内容を消去 */

















210
 static void clear_current_buffer() {
 static void clear_current_buffer() {

















211
   GtkTextIter start, end;
   GtkTextIter start, end;











#

Line 495 
 static gboolean signal_key_press_handler


Line 518 
 static gboolean signal_key_press_handler












518
           
           

















519
           gtk_text_buffer_get_iter_at_mark(Shiki_CURRENT_TEXT_BUFFER, &end, gtk_text_buffer_get_insert(Shiki_CURRENT_TEXT_BUFFER));
           gtk_text_buffer_get_iter_at_mark(Shiki_CURRENT_TEXT_BUFFER, &end, gtk_text_buffer_get_insert(Shiki_CURRENT_TEXT_BUFFER));

















520
           
           















521


           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n\n", -1);


           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n", -1);















522
           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, result, -1);
           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, result, -1);












523
 
           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n", -1);












524
         }
         }

















525
         break;
         break;

















526
 
 











#

Line 513 
 static gboolean signal_key_press_handler


Line 537 
 static gboolean signal_key_press_handler












537
           
           

















538
           gtk_text_buffer_get_iter_at_mark(Shiki_CURRENT_TEXT_BUFFER, &end, gtk_text_buffer_get_insert(Shiki_CURRENT_TEXT_BUFFER));
           gtk_text_buffer_get_iter_at_mark(Shiki_CURRENT_TEXT_BUFFER, &end, gtk_text_buffer_get_insert(Shiki_CURRENT_TEXT_BUFFER));

















539
           
           















540


           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n\n", -1);


           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n", -1);















541
           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, result, -1);
           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, result, -1);












542
 
           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n", -1);












543
         }
         }

















544
         break;
         break;

















545
 
 











#

Line 559 
 static void get_buffer_create(gchar *fil


Line 584 
 static void get_buffer_create(gchar *fil












584
   tabinfo->env           = Scm_MakeModule(NULL, FALSE);
   tabinfo->env           = Scm_MakeModule(NULL, FALSE);

















585
 
 

















586
   SCM_DEFINE(tabinfo->env, "clear-current-buffer", SCM_OBJ(&clear_current_buffer__STUB));
   SCM_DEFINE(tabinfo->env, "clear-current-buffer", SCM_OBJ(&clear_current_buffer__STUB));












587
 
   SCM_DEFINE(tabinfo->env, "buffer-substring", SCM_OBJ(&buffer_substring__STUB));












588
 
 

















589
   g_return_if_fail(tabinfo->env != SCM_FALSE); 
   g_return_if_fail(tabinfo->env != SCM_FALSE); 

















590
 
 





























Legend:



Removed from v.1.51
 


changed lines


 
Added in v.1.52













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[OSDN]/shiki/shiki/shiki.c
-revision 1.51 by aloha,
Thu Nov 23 15:18:28 2006 UTC
+revision 1.52 by aloha,
Thu Nov 23 16:58:36 2006 UTC
 Line 183 
 static void about_this_application();
  /* エディタの初期化 */
  static void shiki_editor_window_init(int argc, char **argv);
+ static ScmObj Shiki_buffer_substring(ScmObj *SCM_FP, int SCM_ARGCNT, void *data_)
+ {
+   ScmObj start, end, result;
+   GtkTextIter s, e;
+   gchar *substring;
+   SCM_ENTER_SUBR("buffer-substring");
+   start = SCM_ARGREF(0);
+   end = SCM_ARGREF(1);
+   if(Scm_NumCmp(start, end) >= 0)
+     return SCM_FALSE;
+   gtk_text_buffer_get_iter_at_offset(Shiki_CURRENT_TEXT_BUFFER, &s, SCM_INT_VALUE(start));
+   gtk_text_buffer_get_iter_at_offset(Shiki_CURRENT_TEXT_BUFFER, &e, SCM_INT_VALUE(end));
+   substring = gtk_text_buffer_get_text(Shiki_CURRENT_TEXT_BUFFER, &s, &e, FALSE);
+   result = SCM_MAKE_STR_COPYING(substring);
+   g_free(substring);
+   SCM_RETURN(result);
+ }
+ static SCM_DEFINE_STRING_CONST(buffer_substring__NAME, "buffer-substring", 16, 16);
+ static SCM_DEFINE_SUBR(buffer_substring__STUB, 2, 0, SCM_OBJ(&buffer_substring__NAME), Shiki_buffer_substring, NULL, NULL);
  /* バッファの内容を消去 */
  static void clear_current_buffer() {
    GtkTextIter start, end;
-Line 495 
 static gboolean signal_key_press_handler
+Line 518 
 static gboolean signal_key_press_handler
            gtk_text_buffer_get_iter_at_mark(Shiki_CURRENT_TEXT_BUFFER, &end, gtk_text_buffer_get_insert(Shiki_CURRENT_TEXT_BUFFER));
-           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n\n", -1);
+           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n", -1);
            gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, result, -1);
+           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n", -1);
          }
          break;
-Line 513 
 static gboolean signal_key_press_handler
+Line 537 
 static gboolean signal_key_press_handler
            gtk_text_buffer_get_iter_at_mark(Shiki_CURRENT_TEXT_BUFFER, &end, gtk_text_buffer_get_insert(Shiki_CURRENT_TEXT_BUFFER));
-           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n\n", -1);
+           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n", -1);
            gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, result, -1);
+           gtk_text_buffer_insert(Shiki_CURRENT_TEXT_BUFFER, &end, "\n", -1);
          }
          break;
-Line 559 
 static void get_buffer_create(gchar *fil
+Line 584 
 static void get_buffer_create(gchar *fil
    tabinfo->env           = Scm_MakeModule(NULL, FALSE);
    SCM_DEFINE(tabinfo->env, "clear-current-buffer", SCM_OBJ(&clear_current_buffer__STUB));
+   SCM_DEFINE(tabinfo->env, "buffer-substring", SCM_OBJ(&buffer_substring__STUB));
    g_return_if_fail(tabinfo->env != SCM_FALSE);
 Legend:



Removed from v.1.51
 


changed lines


 
Added in v.1.52
 Legend:



Removed from v.1.51
 


changed lines


 
Added in v.1.52
-Removed from v.1.51
+Added in v.1.52
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

S 式エディタ

Browse CVS Repository