Changes in commands.c [9bd51b8:987cf3f]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
commands.c
r9bd51b8 r987cf3f 136 136 "Send a local message.\n"), 137 137 138 OWLCMD_ARGS("zcrypt", owl_command_z crypt, OWL_CTX_INTERACTIVE,138 OWLCMD_ARGS("zcrypt", owl_command_zwrite, OWL_CTX_INTERACTIVE, 139 139 "send an encrypted zephyr", 140 140 "zcrypt [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcode] [-m <message...>]\n", … … 1371 1371 { 1372 1372 owl_function_full_redisplay(); 1373 owl_global_set_needrefresh(&g); 1373 1374 } 1374 1375 … … 1386 1387 { 1387 1388 owl_global_set_rightshift(&g, shift); 1389 owl_mainwin_redisplay(owl_global_get_mainwin(&g)); 1390 owl_global_set_needrefresh(&g); 1388 1391 } 1389 1392 … … 1911 1914 char *owl_command_zwrite(int argc, const char *const *argv, const char *buff) 1912 1915 { 1913 owl_zwrite z;1916 owl_zwrite *z; 1914 1917 1915 1918 if (!owl_global_is_havezephyr(&g)) { … … 1918 1921 } 1919 1922 /* check for a zwrite -m */ 1920 owl_zwrite_create_from_line(&z, buff); 1921 if (owl_zwrite_is_message_set(&z)) { 1922 owl_function_zwrite(buff, NULL); 1923 owl_zwrite_cleanup(&z); 1924 return (NULL); 1925 } 1926 owl_zwrite_cleanup(&z); 1923 z = owl_zwrite_new(buff); 1924 if (!z) { 1925 owl_function_error("Error in zwrite arguments"); 1926 return NULL; 1927 } 1928 1929 if (owl_zwrite_is_message_set(z)) { 1930 owl_function_zwrite(z, NULL); 1931 owl_zwrite_delete(z); 1932 return NULL; 1933 } 1927 1934 1928 1935 if (argc < 2) { 1936 owl_zwrite_delete(z); 1929 1937 owl_function_makemsg("Not enough arguments to the zwrite command."); 1930 1938 } else { 1931 owl_function_zwrite_setup( buff);1939 owl_function_zwrite_setup(z); 1932 1940 } 1933 1941 return(NULL); … … 2016 2024 { 2017 2025 owl_function_loopwrite_setup(); 2018 return(NULL);2019 }2020 2021 char *owl_command_zcrypt(int argc, const char *const *argv, const char *buff)2022 {2023 owl_zwrite z;2024 2025 if (!owl_global_is_havezephyr(&g)) {2026 owl_function_makemsg("Zephyr is not available");2027 return(NULL);2028 }2029 /* check for a zcrypt -m */2030 owl_zwrite_create_from_line(&z, buff);2031 if (owl_zwrite_is_message_set(&z)) {2032 owl_function_zcrypt(buff, NULL);2033 owl_zwrite_cleanup(&z);2034 return (NULL);2035 }2036 owl_zwrite_cleanup(&z);2037 2038 if (argc < 2) {2039 owl_function_makemsg("Not enough arguments to the zcrypt command.");2040 } else {2041 owl_function_zwrite_setup(buff);2042 }2043 2026 return(NULL); 2044 2027 } … … 2710 2693 } 2711 2694 2695 owl_global_set_needrefresh(&g); 2712 2696 owl_global_pop_context(&g); 2713 2697 … … 2730 2714 owl_editwin_clear(e); 2731 2715 owl_editwin_insert_string(e, ptr); 2716 owl_editwin_redisplay(e); 2717 owl_global_set_needrefresh(&g); 2732 2718 } else { 2733 2719 owl_function_beep(); … … 2745 2731 owl_editwin_clear(e); 2746 2732 owl_editwin_insert_string(e, ptr); 2733 owl_editwin_redisplay(e); 2734 owl_global_set_needrefresh(&g); 2747 2735 } else { 2748 2736 owl_function_beep(); … … 2754 2742 buff = skiptokens(buff, 1); 2755 2743 owl_editwin_insert_string(e, buff); 2744 owl_editwin_redisplay(e); 2745 owl_global_set_needrefresh(&g); 2756 2746 return NULL; 2757 2747 } … … 2768 2758 owl_global_set_typwin_inactive(&g); 2769 2759 owl_global_pop_context(&g); 2760 owl_global_set_needrefresh(&g); 2770 2761 2771 2762 owl_editwin_do_callback(e); … … 2789 2780 void owl_command_popless_quit(owl_viewwin *vw) 2790 2781 { 2791 owl_viewwin_cleanup(vw);2792 2782 owl_popwin_close(owl_global_get_popwin(&g)); 2793 2783 owl_global_pop_context(&g); 2794 } 2784 owl_viewwin_cleanup(vw); 2785 owl_global_set_needrefresh(&g); 2786 }
Note: See TracChangeset
for help on using the changeset viewer.