mcabber: mcabber/src/screen.c comparison

comparison mcabber/src/screen.c @ 939:12fa2ae6445d

Get rid of "busy-waiting" (Christof Meerwald) This patch from Christof Meerwald, slightly modified, reduces mcabber CPU usage and the number of context switches per second.

author	Mikael Berthe <mikael@lilotux.net>
date	Tue, 11 Jul 2006 22:50:48 +0200
parents	3e592fb33aab
children	fc30221b952d

comparison

equal deleted inserted replaced

-:40175f3dcef7
+:12fa2ae6445d
 static char *multiline, *multimode_subj;
 int update_roster;
 int utf8_mode = 0;
 static bool Autoaway;
 static bool Curses;
+static time_t LastActivity;
 static char       inputLine[INPUTLINE_LENGTH+1];
 static char      *ptr_inputline;
 static short int  inputline_offset;
 static int    completion_started;
 if (!buffer_locale) {
 wprintw(logWnd,
 "\n%s*Error: cannot convert string to locale.", strtimestamp);
 update_panels();
-doupdate();
 g_free(buffer);
 g_free(btext);
 return;
 }
 buf_specialwindow = btext;
 if (Curses) {
 wprintw(logWnd, "\n%s", buffer_locale);
 update_panels();
-doupdate();
 scr_WriteInWindow(NULL, buf_specialwindow, timestamp,
 HBB_PREFIX_SPECIAL, FALSE);
 } else {
 printf("%s\n", buffer_locale);
 // ncurses are not initialized yet, so we call directly hbuf routine
 // Show and refresh the window
 top_panel(win_entry->panel);
 scr_UpdateWindow(win_entry);
 top_panel(inputPanel);
 update_panels();
-doupdate();
 } else if (!(prefix_flags & HBB_PREFIX_NOFLAG)) {
 setmsgflg = TRUE;
 }
 if (setmsgflg && !special) {
 if (special && !winId)
 (unread_msg(NULL) ? '#' : ' '),
 imstatus2char[jb_getstatus()], (sm ? sm : ""));
 if (forceupdate) {
 top_panel(inputPanel);
 update_panels();
-doupdate();
 }
 g_free(sm);
 }
 //  scr_DrawMainWindow()
 scr_ShowBuddyWindow();
 }
 //  scr_UpdateChatStatus(forceupdate)
 // Redraw the buddy status bar.
-// Set forceupdate to TRUE if doupdate() must be called.
+// Set forceupdate to TRUE if update_panels() must be called.
 void scr_UpdateChatStatus(int forceupdate)
 {
 unsigned short btype, isgrp, ismuc, isspe;
 const char *fullname;
 const char *msg = NULL;
 wprintw(chatstatusWnd, "~");
 if (!current_buddy) {
 if (forceupdate) {
 update_panels();
-doupdate();
 }
 return;
 }
 fullname = buddy_getname(BUDDATA(current_buddy));
 else
 mvwprintw(chatstatusWnd, 0, 5, "Special buffer: %s", buf_locale);
 g_free(buf_locale);
 if (forceupdate) {
 update_panels();
-doupdate();
 }
 return;
 }
 status = '?';
 g_free(buf_locale);
 g_free(buf);
 if (forceupdate) {
 update_panels();
-doupdate();
 }
 }
 //  scr_DrawRoster()
 // Display the buddylist (not really the roster) on the screen
 }
 // Leave now if buddylist is empty or the roster is hidden
 if (!buddylist || !Roster_Width) {
 update_panels();
-doupdate();
 curs_set(cursor_backup);
 return;
 }
 name = g_new0(char, Roster_Width);
 g_free(rline);
 g_free(name);
 top_panel(inputPanel);
 update_panels();
-doupdate();
 curs_set(cursor_backup);
 }
 //  scr_RosterVisibility(status)
 // Set the roster visibility:
 if (!(prefix & ~HBB_PREFIX_NOFLAG & ~HBB_PREFIX_HLIGHT))
 prefix |= HBB_PREFIX_IN;
 scr_WriteMessage(jidfrom, text, timestamp, prefix);
 update_panels();
-doupdate();
 }
 void scr_WriteOutgoingMessage(const char *jidto, const char *text)
 {
 scr_WriteMessage(jidto, text, 0, HBB_PREFIX_OUT|HBB_PREFIX_HLIGHT);
 oldmsg = NULL;
 }
 }
 }
+unsigned int scr_GetAutoAwayTimeout()
+{
+unsigned int autoaway_timeout = settings_opt_get_int("autoaway");
+time_t now;
+if (Autoaway || !autoaway_timeout)
+return (unsigned)INT_MAX;
+time(&now);
+if (now > LastActivity + (time_t)autoaway_timeout)
+return 0;
+else
+return LastActivity + (time_t)autoaway_timeout - now;
+}
 // Check if we should enter/leave automatic away status
 void scr_CheckAutoAway(int activity)
 {
-static time_t LastActivity;
 enum imstatus cur_st;
 unsigned int autoaway_timeout = settings_opt_get_int("autoaway");
 if (Autoaway && activity) set_autoaway(FALSE);
 if (!autoaway_timeout) return;
 // Refresh the window
 scr_UpdateWindow(win_entry);
 // Finished :)
 update_panels();
-doupdate();
 }
 //  scr_BufferClear()
 // Clear the current buddy window (used for the /clear command)
 void scr_BufferClear(void)
 // Refresh the window
 scr_UpdateWindow(win_entry);
 // Finished :)
 update_panels();
-doupdate();
 }
 //  scr_BufferPurge()
 // Purge/Drop the current buddy buffer
 void scr_BufferPurge(void)
 // Refresh the window
 scr_UpdateBuddyWindow();
 // Finished :)
 update_panels();
-doupdate();
 }
 //  scr_BufferScrollLock(lock)
 // Lock/unlock the current buddy buffer
 // lock = 1 : lock
 // Refresh the window
 scr_UpdateBuddyWindow();
 // Finished :)
 update_panels();
-doupdate();
 }
 //  scr_BufferTopBottom()
 // Jump to the head/tail of the current buddy window
 // (top if topbottom == -1, bottom topbottom == 1)
 // Refresh the window
 scr_UpdateWindow(win_entry);
 // Finished :)
 update_panels();
-doupdate();
 }
 //  scr_BufferSearch(direction, text)
 // Jump to the next line containing text
 // (backward search if direction == -1, forward if topbottom == 1)
 // Refresh the window
 scr_UpdateWindow(win_entry);
 // Finished :)
 update_panels();
-doupdate();
 } else
 scr_LogPrint(LPRINT_NORMAL, "Search string not found");
 }
 //  scr_BufferPercent(n)
 // Refresh the window
 scr_UpdateWindow(win_entry);
 // Finished :)
 update_panels();
-doupdate();
 }
 //  scr_BufferDate(t)
 // Jump to the first line after date t in the buffer
 // t is a date in seconds since `00:00:00 1970-01-01 UTC'
 // Refresh the window
 scr_UpdateWindow(win_entry);
 // Finished :)
 update_panels();
-doupdate();
 }
 //  scr_set_chatmode()
 // Public function to (un)set chatmode...
 inline void scr_set_chatmode(int enable)
 ungetch(ks[i]);
 }
 return;
 }
+inline void scr_DoUpdate(void)
+{
+doupdate();
+}
 static int bindcommand(keycode kcode)
 {
 gchar asciikey[16];
 const gchar *boundcmd;
 }
 if (completion_started && key != 9 && key != KEY_RESIZE)
 scr_end_current_completion();
 refresh_inputline();
-if (!update_roster)
-doupdate();
 return 0;
 }
 /* vim: set expandtab cindent cinoptions=>2\:2(0:  For Vim users... */

Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/screen.c @ 939:12fa2ae6445d