Mercurial > hg > xemacs-beta

comparison src/redisplay-output.c @ 5049:548f1f47eb82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 23:38:04 -0600
parents 07dcc7000bbf 9410323e4b0d
children 8af6a32b170d
comparison
equal deleted inserted replaced
5048:32e1ae4c1e3a 5049:548f1f47eb82
81 /* #### Doing this directly breaks the encapsulation. But, the 81 /* #### Doing this directly breaks the encapsulation. But, the
82 running time of this function has a measurable impact on 82 running time of this function has a measurable impact on
83 redisplay performance so avoiding all excess overhead is a 83 redisplay performance so avoiding all excess overhead is a
84 good thing. Is all of this true? */ 84 good thing. Is all of this true? */
85 memcpy (cra->base, dra->base, sizeof (struct rune) * max_move); 85 memcpy (cra->base, dra->base, sizeof (struct rune) * max_move);
86 Dynarr_set_length (cra, max_move); 86 Dynarr_set_lengthr (cra, max_move);
87 } 87 }
88 else 88 else
89 Dynarr_reset (cra); 89 Dynarr_reset (cra);
90 90
91 for (rune_elt = max_move; rune_elt < Dynarr_length (dra); rune_elt++) 91 for (rune_elt = max_move; rune_elt < Dynarr_length (dra); rune_elt++)
169 169
170 cdb = Dynarr_atp (clp->display_blocks, db_elt); 170 cdb = Dynarr_atp (clp->display_blocks, db_elt);
171 tr = cdb->runes; 171 tr = cdb->runes;
172 memcpy (cdb, ddb, sizeof (struct display_block)); 172 memcpy (cdb, ddb, sizeof (struct display_block));
173 cdb->runes = tr; 173 cdb->runes = tr;
174 Dynarr_increment (clp->display_blocks); 174 Dynarr_incrementr (clp->display_blocks);
175 } 175 }
176 176
177 sync_rune_structs (w, cdb->runes, ddb->runes); 177 sync_rune_structs (w, cdb->runes, ddb->runes);
178 } 178 }
179 } 179 }
181 if (local) 181 if (local)
182 Dynarr_add (cdla, *clp); 182 Dynarr_add (cdla, *clp);
183 else if (line >= Dynarr_length (cdla)) 183 else if (line >= Dynarr_length (cdla))
184 { 184 {
185 assert (line == Dynarr_length (cdla)); 185 assert (line == Dynarr_length (cdla));
186 Dynarr_increment (cdla); 186 Dynarr_incrementr (cdla);
187 } 187 }
188 } 188 }
189 189
190 /***************************************************************************** 190 /*****************************************************************************
191 compare_runes 191 compare_runes
2462 } 2462 }
2463 2463
2464 /* If the number of display lines has shrunk, adjust. */ 2464 /* If the number of display lines has shrunk, adjust. */
2465 if (cdla_len > ddla_len) 2465 if (cdla_len > ddla_len)
2466 { 2466 {
2467 Dynarr_set_length (cdla, ddla_len); 2467 Dynarr_set_lengthr (cdla, ddla_len);
2468 } 2468 }
2469 2469
2470 /* Output a vertical divider between windows, if necessary. */ 2470 /* Output a vertical divider between windows, if necessary. */
2471 if (window_needs_vertical_divider (w) 2471 if (window_needs_vertical_divider (w)
2472 && (f->windows_structure_changed || f->clear)) 2472 && (f->windows_structure_changed || f->clear))