mcabber: mcabber/mcabber/commands.c comparison

comparison mcabber/mcabber/commands.c @ 1780:e4378fbab5d7

Major API cleanup - bump API to 4 Get rid of old CamelCase names in screen.h

author	Mikael Berthe <mikael@lilotux.net>
date	Sun, 14 Mar 2010 12:09:08 +0100
parents	dc4bd31c2254
children	e6d355e50d7a

comparison

equal deleted inserted replaced

-:2911c950dcd1
+:e4378fbab5d7
 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP)
 do_group("toggle");
 else {
 // Enter chat mode
 scr_set_chatmode(TRUE);
-scr_ShowBuddyWindow();
+scr_show_buddy_window();
 }
 }
 return 0;
 }
 nbitems = 1;
 else
 nbitems = strtol(nitems, NULL, 10);
 if (nbitems > 0)
-scr_RosterUpDown(updown, nbitems);
+scr_roster_up_down(updown, nbitems);
 }
 /* Commands callback functions */
 /* All these do_*() functions will be called with a "arg" parameter */
 /* (with arg not null)                                              */
 free_arg_lst(paramlst);
 return;
 }
 if (!strcasecmp(subcmd, "top")) {
-scr_RosterTop();
+scr_roster_top();
 update_roster = TRUE;
 } else if (!strcasecmp(subcmd, "bottom")) {
-scr_RosterBottom();
+scr_roster_bottom();
 update_roster = TRUE;
 } else if (!strcasecmp(subcmd, "hide")) {
-scr_RosterVisibility(0);
+scr_roster_visibility(0);
 } else if (!strcasecmp(subcmd, "show")) {
-scr_RosterVisibility(1);
+scr_roster_visibility(1);
 } else if (!strcasecmp(subcmd, "toggle")) {
-scr_RosterVisibility(-1);
+scr_roster_visibility(-1);
 } else if (!strcasecmp(subcmd, "hide_offline")) {
 buddylist_set_hide_offline_buddies(TRUE);
 if (current_buddy)
 buddylist_build();
 update_roster = TRUE;
 } else if (!strcasecmp(subcmd, "toggle_offline")) {
 buddylist_set_hide_offline_buddies(-1);
 buddylist_build();
 update_roster = TRUE;
 } else if (!strcasecmp(subcmd, "display")) {
-scr_RosterDisplay(arg);
+scr_roster_display(arg);
 } else if (!strcasecmp(subcmd, "item_lock")) {
 roster_buddylock(arg, 1);
 } else if (!strcasecmp(subcmd, "item_unlock")) {
 roster_buddylock(arg, 0);
 } else if (!strcasecmp(subcmd, "item_toggle_lock")) {
 roster_buddylock(arg, -1);
 } else if (!strcasecmp(subcmd, "unread_first")) {
-scr_RosterUnreadMessage(0);
+scr_roster_unread_message(0);
 } else if (!strcasecmp(subcmd, "unread_next")) {
-scr_RosterUnreadMessage(1);
+scr_roster_unread_message(1);
 } else if (!strcasecmp(subcmd, "alternate")) {
-scr_RosterJumpAlternate();
+scr_roster_jump_alternate();
 } else if (!strncasecmp(subcmd, "search", 6)) {
 strip_arg_special_chars(arg);
 if (!arg || !*arg) {
 scr_LogPrint(LPRINT_NORMAL, "What name or JID are you looking for?");
 free_arg_lst(paramlst);
 return;
 }
-scr_RosterSearch(arg);
+scr_roster_search(arg);
 update_roster = TRUE;
 } else if (!strcasecmp(subcmd, "up")) {
 roster_updown(-1, arg);
 } else if (!strcasecmp(subcmd, "down")) {
 roster_updown(1, arg);
 } else if (!strcasecmp(subcmd, "group_prev")) {
-scr_RosterPrevGroup();
+scr_roster_prev_group();
 } else if (!strcasecmp(subcmd, "group_next")) {
-scr_RosterNextGroup();
+scr_roster_next_group();
 } else if (!strcasecmp(subcmd, "note")) {
 roster_note(arg);
 } else
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 free_arg_lst(paramlst);
 status = *arglist;
 wildcard = to_utf8(arglist[1]);
 color = arglist[2];
 if (status && !strcmp(status, "clear")) { // Not a color command, clear all
-scr_RosterClearColor();
+scr_roster_clear_color();
 update_roster = TRUE;
 } else {
 if (!status || !*status || !wildcard || !*wildcard || !color || !*color) {
 scr_LogPrint(LPRINT_NORMAL, "Missing argument");
 } else {
-update_roster = scr_RosterColor(status, wildcard, color)
+update_roster = scr_roster_color(status, wildcard, color) ||
-|| update_roster;
+update_roster;
 }
 }
 free_arg_lst(arglist);
 g_free(wildcard);
 } else if (!strcasecmp(subcmd, "muc")) {
 if (muc) {
 if (check_jid_syntax(muc) && strcmp(muc, "*"))
 scr_LogPrint(LPRINT_NORMAL, "Not a JID");
 else {
 if (!mode || !*mode || !strcasecmp(mode, "on"))
-scr_MucColor(muc, MC_ALL);
+scr_muc_color(muc, MC_ALL);
 else if (!strcasecmp(mode, "preset"))
-scr_MucColor(muc, MC_PRESET);
+scr_muc_color(muc, MC_PRESET);
 else if (!strcasecmp(mode, "off"))
-scr_MucColor(muc, MC_OFF);
+scr_muc_color(muc, MC_OFF);
 else if (!strcmp(mode, "-"))
-scr_MucColor(muc, MC_REMOVE);
+scr_muc_color(muc, MC_REMOVE);
 else
 scr_LogPrint(LPRINT_NORMAL, "Unknown coloring mode");
 }
 }
 }
 char **arglist = split_arg(arg, 2, 0);
 const char *nick = *arglist, *color = arglist[1];
 if (!nick || !*nick || !color || !*color)
 scr_LogPrint(LPRINT_NORMAL, "Missing argument");
 else
-scr_MucNickColor(nick, color);
+scr_muc_nick_color(nick, color);
 free_arg_lst(arglist);
 } else
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 free_arg_lst(paramlst);
 }
 // It makes sense to reset autoaway before changing the status
 // (esp. for FIFO or remote commands) or the behaviour could be
 // unexpected...
 if (!recipient)
-scr_CheckAutoAway(TRUE);
+scr_check_auto_away(TRUE);
 paramlst = split_arg(arg, 2, 1); // status, message
 status = *paramlst;
 msg = *(paramlst+1);
 return;
 }
 }
 // Close the buffer
-scr_BufferPurge(1, NULL);
+scr_buffer_purge(1, NULL);
 scr_LogPrint(LPRINT_LOGNORM, "Removing <%s>...", bjid);
 xmpp_delbuddy(bjid);
-scr_UpdateBuddyWindow();
+scr_update_buddy_window();
 }
 static void do_group(char *arg)
 {
 gpointer group = NULL;
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 goto do_group_return;
 }
 if (group_state != group_unfold && leave_buddywindow)
-scr_RosterPrevGroup();
+scr_roster_prev_group();
 buddy_hide_group(group, group_state);
 buddylist_build();
 update_roster = TRUE;
 else
 bare_jid = (char*)fjid;
 if (!quiet) {
 // Jump to window, create one if needed
-scr_RosterJumpJid(bare_jid);
+scr_roster_jump_jid(bare_jid);
 }
 // Check if we're sending a message to a conference room
 // If not, we must make sure rp is NULL, for hk_message_out()
 isroom = !!roster_find(bare_jid, jidsearch, ROSTER_TYPE_ROOM);
 {
 gpointer bud;
 LmMessageSubType msgtype = LM_MESSAGE_SUB_TYPE_NOT_SET;
 scr_set_chatmode(TRUE);
-scr_ShowBuddyWindow();
+scr_show_buddy_window();
 if (!current_buddy) {
 scr_LogPrint(LPRINT_NORMAL,
 "Whom are you talking to?  Please select a buddy.");
 return;
 "Use \"%s begin\" first.", mkcmdstr("msay"));
 goto do_msay_return;
 }
 scr_set_chatmode(TRUE);
-scr_ShowBuddyWindow();
+scr_show_buddy_window();
 if (!strcasecmp(subcmd, "send_to")) {
 int err = FALSE;
 gchar *msg_utf8;
 LmMessageSubType msg_type = scan_mtype(&arg);
 nblines = 0;
 else
 nblines = strtol(nlines, NULL, 10);
 if (nblines >= 0)
-scr_BufferScrollUpDown(updown, nblines);
+scr_buffer_scroll_up_down(updown, nblines);
 }
 static void buffer_search(int direction, char *arg)
 {
 if (!arg || !*arg) {
 scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 return;
 }
-scr_BufferSearch(direction, arg);
+scr_buffer_search(direction, arg);
 }
 static void buffer_date(char *date)
 {
 time_t t;
 strip_arg_special_chars(date);
 t = from_iso8601(date, 0);
 if (t)
-scr_BufferDate(t);
+scr_buffer_date(t);
 else
 scr_LogPrint(LPRINT_NORMAL, "The date you specified is "
 "not correctly formatted or invalid.");
 }
 if (*arg1 && arg2 && *arg2) {     // Two values
 scr_LogPrint(LPRINT_NORMAL, "Wrong parameters.");
 return;
 }
-scr_BufferPercent(atoi((*arg1 ? arg1 : arg2)));
+scr_buffer_percent(atoi((*arg1 ? arg1 : arg2)));
 }
 static void do_buffer(char *arg)
 {
 char **paramlst;
 free_arg_lst(paramlst);
 return;
 }
 if (!strcasecmp(subcmd, "top")) {
-scr_BufferTopBottom(-1);
+scr_buffer_top_bottom(-1);
 } else if (!strcasecmp(subcmd, "bottom")) {
-scr_BufferTopBottom(1);
+scr_buffer_top_bottom(1);
 } else if (!strcasecmp(subcmd, "clear")) {
-scr_BufferClear();
+scr_buffer_clear();
 } else if (!strcasecmp(subcmd, "close")) {
-scr_BufferPurge(1, arg);
+scr_buffer_purge(1, arg);
 } else if (!strcasecmp(subcmd, "close_all")) {
-scr_BufferPurgeAll(1);
+scr_buffer_purge_all(1);
 } else if (!strcasecmp(subcmd, "purge")) {
-scr_BufferPurge(0, arg);
+scr_buffer_purge(0, arg);
 } else if (!strcasecmp(subcmd, "scroll_lock")) {
-scr_BufferScrollLock(1);
+scr_buffer_scroll_lock(1);
 } else if (!strcasecmp(subcmd, "scroll_unlock")) {
-scr_BufferScrollLock(0);
+scr_buffer_scroll_lock(0);
 } else if (!strcasecmp(subcmd, "scroll_toggle")) {
-scr_BufferScrollLock(-1);
+scr_buffer_scroll_lock(-1);
 } else if (!strcasecmp(subcmd, "up")) {
 buffer_updown(-1, arg);
 } else if (!strcasecmp(subcmd, "down")) {
 buffer_updown(1, arg);
 } else if (!strcasecmp(subcmd, "search_backward")) {
 } else if (!strcasecmp(subcmd, "date")) {
 buffer_date(arg);
 } else if (*subcmd == '%') {
 buffer_percent(subcmd+1, arg);
 } else if (!strcasecmp(subcmd, "save")) {
-scr_BufferDump(arg);
+scr_buffer_dump(arg);
 } else if (!strcasecmp(subcmd, "list")) {
-scr_BufferList();
+scr_buffer_list();
 } else {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 }
 free_arg_lst(paramlst);
 GSList *resources, *p_res;
 char *bstr = "unknown";
 // Enter chat mode
 scr_set_chatmode(TRUE);
-scr_ShowBuddyWindow();
+scr_show_buddy_window();
 snprintf(buffer, 4095, "jid:  <%s>", bjid);
 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0);
 if (name) {
 snprintf(buffer, 4095, "Name: %s", name);
 }
 }
 // Enter chat mode
 scr_set_chatmode(TRUE);
-scr_ShowBuddyWindow();
+scr_show_buddy_window();
 bjid = buddy_getjid(bud);
 buffer = g_new(char, 4096);
 strncpy(buffer, "Room members:", 127);
 if (type & ROSTER_TYPE_GROUP) {
 // Rename a whole group
 foreach_group_member(bud, &move_group_member, name_utf8);
 // Let's jump to the previous buddy, because this group name should
 // disappear when we receive the server answer.
-scr_RosterUpDown(-1, 1);
+scr_roster_up_down(-1, 1);
 } else {
 // Rename a single buddy
 guint del_name = 0;
 if (!*newname || !strcmp(arg, "-"))
 del_name = TRUE;
 group_utf8 = to_utf8(newgroupname);
 if (strcmp(oldgroupname, group_utf8)) {
 /* guint msgflag; */
 xmpp_updatebuddy(bjid, name, *group_utf8 ? group_utf8 : NULL);
-scr_RosterUpDown(-1, 1);
+scr_roster_up_down(-1, 1);
 /* We do not move the buddy right now because the server could reject
 * the request.  Let's wait for the server answer.
 // If the buddy has a pending message flag,
 scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!");
 return;
 }
 // Delete the room
 roster_del_user(buddy_getjid(bud));
-scr_UpdateBuddyWindow();
+scr_update_buddy_window();
 buddylist_build();
 update_roster = TRUE;
 }
 static void room_topic(gpointer bud, char *arg)
 nick = to_utf8(nick);
 if (interactive) {
 // Enter chat mode
 scr_set_chatmode(TRUE);
-scr_ShowBuddyWindow();
+scr_show_buddy_window();
 } else
 msg_flag |= HBB_PREFIX_NOFLAG;
 bjid = buddy_getjid(bud);
 rstatus = buddy_getstatus(bud, nick);

Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/commands.c @ 1780:e4378fbab5d7