Mercurial > hg > xemacs-beta
annotate src/imgproc.h @ 5803:b79e1e02bf01
Preserve extent information in the command builder code.
src/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* event-stream.c:
* event-stream.c (mark_command_builder):
* event-stream.c (finalize_command_builder): Removed.
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder): Removed. Use
free_normal_lisp_object() instead.
* event-stream.c (echo_key_event):
* event-stream.c (regenerate_echo_keys_from_this_command_keys):
Detach all extents here.
* event-stream.c (maybe_echo_keys):
* event-stream.c (reset_key_echo):
* event-stream.c (execute_help_form):
* event-stream.c (Fnext_event):
* event-stream.c (command_builder_find_leaf_no_jit_binding):
* event-stream.c (command_builder_find_leaf):
* event-stream.c (lookup_command_event):
* events.h (struct command_builder):
Move the command builder's echo_buf to being a Lisp string rather
than a malloced Ibyte array. This allows passing through extent
information, which was previously dropped. It also simplifies the
allocation and release code for the command builder.
Rename echo_buf_index to echo_buf_fill_pointer, better reflecting
its function.
Don't rely on zero-termination (something not particularly
compatible with Lisp-level code) when showing a substring of
echo_buf that differs from that designated by
echo_buf_fill_pointer, keep a separate counter instead and use
that.
* minibuf.c:
* minibuf.c (echo_area_append):
Use the new START and END keyword arguments to #'append-message,
rather than consing a new string for basically every #'next-event
prompt displayed.
test/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* automated/extent-tests.el:
Check that extent information is passed through to the echo area
correctly with #'next-event's PROMPT argument.
lisp/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (raw-append-message):
Use #'write-sequence in this, take its START and END keyword
arguments, so our callers don't have to cons as much.
* simple.el (append-message):
Pass through START and END here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 14 Jul 2014 13:42:42 +0100 |
| parents | 2aa9cd456ae7 |
| children | 574f0cded429 |
| rev | line source |
|---|---|
| 428 | 1 /* Image processing aux functions header file |
| 2 Copyright (C) 1998 Jareth Hein | |
| 3 | |
| 4 This file is a part of XEmacs | |
| 5 | |
| 5405 | 6 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 7 under the terms of the GNU General Public License as published by the |
| 5405 | 8 Free Software Foundation, either version 3 of the License, or (at your |
| 9 option) any later version. | |
| 428 | 10 |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 5405 | 17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 18 |
| 440 | 19 #ifndef INCLUDED_imgproc_h_ |
| 20 #define INCLUDED_imgproc_h_ | |
| 21 | |
| 428 | 22 /* Synched up with: Not in FSF. */ |
| 23 | |
| 24 /* Original author: Jareth Hein */ | |
| 25 | |
| 26 #define MAX_CMAP_SIZE 256 | |
| 27 #define COLOR_DEPTH 8 | |
| 28 #define MAX_COLOR 256 | |
| 29 | |
| 30 #define B_DEPTH 5 /* # bits/pixel to use */ | |
| 31 #define B_LEN (1L<<B_DEPTH) | |
| 32 | |
| 33 #define C_DEPTH 2 | |
| 34 #define C_LEN (1L<<C_DEPTH) /* # cells/color to use */ | |
| 35 | |
| 36 #define COLOR_SHIFT (COLOR_DEPTH-B_DEPTH) | |
| 37 | |
| 38 typedef struct colorbox { | |
| 39 struct colorbox *next, *prev; | |
| 40 int rmin, rmax; | |
| 41 int gmin, gmax; | |
| 42 int bmin, bmax; | |
| 43 int total; | |
| 44 } Colorbox; | |
| 45 | |
| 46 typedef struct { | |
| 47 int num_ents; | |
| 48 int entries[MAX_CMAP_SIZE][2]; | |
| 49 } C_cell; | |
| 50 | |
| 51 typedef struct { | |
| 52 unsigned short rm[MAX_CMAP_SIZE], gm[MAX_CMAP_SIZE], bm[MAX_CMAP_SIZE]; /* map values */ | |
| 53 int um[MAX_CMAP_SIZE]; /* usage counts for each mapentry */ | |
| 54 int histogram[B_LEN][B_LEN][B_LEN]; | |
| 55 int num_active_colors; | |
| 56 Colorbox *freeboxes; /* used and freed internally */ | |
| 57 Colorbox *usedboxes; /* used and freed internally */ | |
| 58 C_cell **ColorCells; /* used and freed internally */ | |
| 59 } quant_table; | |
| 60 | |
| 61 #define QUANT_GET_COLOR(qt,r,g,b) (qt->histogram[r>>COLOR_SHIFT][g>>COLOR_SHIFT][b>>COLOR_SHIFT]) | |
| 62 | |
| 63 quant_table *build_EImage_quantable(unsigned char *eimage, int width, int height, int num_colors); | |
| 440 | 64 |
| 65 #endif /* INCLUDED_imgproc_h_ */ |