Changeset ee310eb for fmtext.c

Timestamp:

Feb 3, 2008, 1:08:11 AM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

99219ed

Parents:

625802a (diff), af1920fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged revisions 909-923 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r910 | nelhage | 2008-01-29 20:47:41 -0500 (Tue, 29 Jan 2008) | 1 line
  
  Fix IRC -- I forgot to add one ->conn in the last patch
........
  r911 | asedeno | 2008-01-30 15:49:35 -0500 (Wed, 30 Jan 2008) | 5 lines
  
  Jabber Buddy Lists:
  * Query the jabber:show_offline_buddies once when invoking onGetBuddyList()
  * Don't bold online roster entries when hiding offline ones
........
  r922 | asedeno | 2008-02-03 00:49:46 -0500 (Sun, 03 Feb 2008) | 1 line
  
  Bounds checking.
........
  r923 | asedeno | 2008-02-03 01:01:07 -0500 (Sun, 03 Feb 2008) | 1 line
  
  Portability - removing C++ style comments.
........

File:

• fmtext.c (modified) (5 diffs)

fmtext.c

@@ -793 +793 @@
 void owl_fmtext_init_colorpair_mgr(owl_colorpair_mgr *cpmgr)
 {
-  // This could be a bitarray if we wanted to save memory.
+  /* This could be a bitarray if we wanted to save memory. */
   short i, j;
   cpmgr->next = 8;
   
-  // The test is <= because we allocate COLORS+1 entries.
+  /* The test is <= because we allocate COLORS+1 entries. */
   cpmgr->pairs = owl_malloc((COLORS+1) * sizeof(short*));
   for(i = 0; i <= COLORS; i++) {
@@ -823 +823 @@
     cpmgr->next = 8;
     
-    // The test is <= because we allocated COLORS+1 entries.
+    /* The test is <= because we allocated COLORS+1 entries. */
     for(i = 0; i <= COLORS; i++) {
       for(j = 0; j <= COLORS; j++) {
@@ -844 +844 @@
   short pair, default_bg;
 
+  /* Sanity (Bounds) Check */
+  if (fg > COLORS || fg < OWL_COLOR_DEFAULT) fg = OWL_COLOR_DEFAULT;
+  if (bg > COLORS || bg < OWL_COLOR_DEFAULT) bg = OWL_COLOR_DEFAULT;
+            
 #ifdef HAVE_USE_DEFAULT_COLORS
   if (fg == OWL_COLOR_DEFAULT) fg = -1;
@@ -853 +857 @@
 #endif
 
-  // looking for a pair we already set up for this draw.
+  /* looking for a pair we already set up for this draw. */
   cpmgr = owl_global_get_colorpair_mgr(&g);
   pair = cpmgr->pairs[fg+1][bg+1];
   if (!(pair != -1 && pair < cpmgr->next)) {
-/*    owl_global_set_needrefresh(&g);*/
-    // If we didn't find a pair, search for a free one to assign.
+    /* If we didn't find a pair, search for a free one to assign. */
     pair = (cpmgr->next < COLOR_PAIRS) ? cpmgr->next : -1;
     if (pair != -1) {
-      // We found a free pair, initialize it.
+      /* We found a free pair, initialize it. */
       init_pair(pair, fg, bg);
       cpmgr->pairs[fg+1][bg+1] = pair;
@@ -867 +870 @@
     }
     else if (bg != OWL_COLOR_DEFAULT) {
-      // We still don't have a pair, drop the background color. Too bad.
+      /* We still don't have a pair, drop the background color. Too bad. */
       owl_function_debugmsg("colorpairs: color shortage - dropping background color.");
       pair = owl_fmtext_get_colorpair(fg, OWL_COLOR_DEFAULT);
     }
     else {
-      // We still don't have a pair, defaults all around.
+      /* We still don't have a pair, defaults all around. */
       owl_function_debugmsg("colorpairs: color shortage - dropping foreground and background color.");
       pair = 0;