Merge with 2.5 -r 21619:21756.
[blender.git] / source / blender / editors / space_console / space_console.c
index 5551a303ead0959da6c045d49500ed18ff9a9575..763be0392dccbc06b8f8c015a17fcab644b6fa2a 100644 (file)
@@ -203,6 +203,7 @@ static void console_main_area_draw(const bContext *C, ARegion *ar)
 
 void console_operatortypes(void)
 {
+       /* console_ops.c */
        WM_operatortype_append(CONSOLE_OT_move);
        WM_operatortype_append(CONSOLE_OT_delete);
        WM_operatortype_append(CONSOLE_OT_insert);
@@ -211,14 +212,19 @@ void console_operatortypes(void)
        WM_operatortype_append(CONSOLE_OT_history_append); 
        WM_operatortype_append(CONSOLE_OT_scrollback_append);
        
-       
        WM_operatortype_append(CONSOLE_OT_clear); 
        WM_operatortype_append(CONSOLE_OT_history_cycle);
        WM_operatortype_append(CONSOLE_OT_zoom);
 
-       /* Dummy, defined in space_console.py */
-       WM_operatortype_append(CONSOLE_OT_exec);
-       WM_operatortype_append(CONSOLE_OT_autocomplete);
+
+       /* console_report.c */
+       WM_operatortype_append(CONSOLE_OT_select_pick);
+       WM_operatortype_append(CONSOLE_OT_select_all_toggle);
+       WM_operatortype_append(CONSOLE_OT_select_border);
+
+       WM_operatortype_append(CONSOLE_OT_report_replay);
+       WM_operatortype_append(CONSOLE_OT_report_delete);
+       WM_operatortype_append(CONSOLE_OT_report_copy);
 }
 
 void console_keymap(struct wmWindowManager *wm)
@@ -275,6 +281,21 @@ void console_keymap(struct wmWindowManager *wm)
        WM_keymap_add_item(keymap, "CONSOLE_OT_autocomplete", RETKEY, KM_PRESS, KM_CTRL, 0); /* python operator - space_text.py */
 #endif
 
+       /* report selection */
+       WM_keymap_add_item(keymap, "CONSOLE_OT_select_pick", SELECTMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "CONSOLE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "CONSOLE_OT_select_border", BKEY, KM_PRESS, 0, 0);
+
+       WM_keymap_add_item(keymap, "CONSOLE_OT_report_replay", RKEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "CONSOLE_OT_report_delete", XKEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "CONSOLE_OT_report_delete", DELKEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "CONSOLE_OT_report_copy", CKEY, KM_PRESS, KM_CTRL, 0);
+
+
+
+
+
+
        RNA_string_set(WM_keymap_add_item(keymap, "CONSOLE_OT_insert", TABKEY, KM_PRESS, 0, 0)->ptr, "text", "    "); /* fake tabs */
        WM_keymap_add_item(keymap, "CONSOLE_OT_insert", KM_TEXTINPUT, KM_PRESS, KM_ANY, 0); // last!
 }