Compare commits

...
Sign in to create a new pull request.

8 commits

Author SHA1 Message Date
Fedora Release Engineering
e3d2326019 dist-git conversion 2010-07-29 18:07:03 +00:00
Behdad Esfahbod
65645da811 - Update to 0.16.9 2007-09-22 21:40:54 +00:00
Matthias Clasen
f085988585 0.16.8 2007-07-31 03:41:25 +00:00
Matthias Clasen
1e674af9fa 0.16.7 2007-07-31 03:07:01 +00:00
Matthias Clasen
b5e339542c 0.16.6 2007-06-19 02:12:26 +00:00
Behdad Esfahbod
f4d5eb75e7 - Update to 0.16.5 2007-06-05 19:23:06 +00:00
Matthias Clasen
df4606500a 0.16.4 2007-05-30 02:09:07 +00:00
Bill Nottingham
b2910469fb Initialize branch F-7 for vte 2007-05-18 11:00:58 +00:00
6 changed files with 20 additions and 82 deletions

View file

@ -1 +0,0 @@
vte-0.16.3.tar.bz2

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
vte-0.16.5.tar.bz2

View file

@ -1,6 +0,0 @@
# Makefile for source rpm: vte
# $Id$
NAME := vte
SPECFILE = $(firstword $(wildcard *.spec))
include ../common/Makefile.common

View file

@ -1 +1 @@
a35cb0694159a9782fe43f49215c1bf5 vte-0.16.3.tar.bz2
a42c893a01e3d9818789be373e529422 vte-0.16.9.tar.bz2

View file

@ -1,68 +0,0 @@
Index: src/vte.c
===================================================================
--- src/vte.c (revision 1880)
+++ src/vte.c (revision 1887)
@@ -9768,10 +9768,8 @@
VteTerminal *terminal;
VteScreen *screen;
struct vte_charcell *cell;
- struct _vte_draw_text_request item, *items;
+ struct _vte_draw_text_request item;
int row, drow, col, columns;
- char *preedit;
- int preedit_cursor;
long width, height, ascent, descent, delta, cursor_width;
int i, len, fore, back, x, y;
gboolean blink, selected;
@@ -10017,8 +10015,6 @@
row = screen->cursor_current.row - delta;
/* Find out how many columns the pre-edit string takes up. */
- preedit = terminal->pvt->im_preedit;
- preedit_cursor = -1;
columns = vte_terminal_preedit_width(terminal, FALSE);
len = vte_terminal_preedit_length(terminal, FALSE);
@@ -10031,13 +10027,12 @@
/* Draw the preedit string, boxed. */
if (len > 0) {
+ struct _vte_draw_text_request *items;
+ const char *preedit = terminal->pvt->im_preedit;
+ int preedit_cursor;
+
items = g_new(struct _vte_draw_text_request, len);
- preedit = terminal->pvt->im_preedit;
for (i = columns = 0; i < len; i++) {
- if ((preedit - terminal->pvt->im_preedit) ==
- terminal->pvt->im_preedit_cursor) {
- preedit_cursor = i;
- }
items[i].c = g_utf8_get_char(preedit);
items[i].columns = _vte_iso2022_unichar_width(items[i].c);
items[i].x = (col + columns) * width;
@@ -10045,10 +10040,6 @@
columns += items[i].columns;
preedit = g_utf8_next_char(preedit);
}
- if ((preedit - terminal->pvt->im_preedit) ==
- terminal->pvt->im_preedit_cursor) {
- preedit_cursor = i;
- }
_vte_draw_clear(terminal->pvt->draw,
col * width + VTE_PAD_WIDTH,
row * height + VTE_PAD_WIDTH,
@@ -10061,10 +10052,11 @@
terminal->pvt->im_preedit_attrs,
TRUE,
width, height);
- if ((preedit_cursor >= 0) && (preedit_cursor < len)) {
+ preedit_cursor = terminal->pvt->im_preedit_cursor;
+ if (preedit_cursor >= 0 && preedit_cursor < len) {
/* Cursored letter in reverse. */
vte_terminal_draw_cells(terminal,
- &items[terminal->pvt->im_preedit_cursor], 1,
+ &items[preedit_cursor], 1,
back, fore, TRUE, TRUE,
FALSE,
FALSE,

View file

@ -1,13 +1,11 @@
Name: vte
Version: 0.16.3
Release: 2%{?dist}
Version: 0.16.9
Release: 1%{?dist}
Summary: A terminal emulator
License: LGPL
Group: User Interface/X
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: ftp://ftp.gnome.org/pub/GNOME/sources/vte/0.16/%{name}-%{version}.tar.bz2
# Fix from upstream for http://bugzilla.gnome.org/show_bug.cgi?id=433776
Patch0: vte-0.16.3-preedit-crash.patch
Source: http://download.gnome.org/sources/vte/0.16/%{name}-%{version}.tar.bz2
BuildRequires: gtk2-devel, pygtk2-devel, python-devel, ncurses-devel
BuildRequires: gettext
@ -32,7 +30,6 @@ package contains the files needed for building applications using VTE.
%prep
%setup -q
%patch0 -p0 -b .preedit-crash
%build
PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
@ -104,6 +101,21 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/%{name}
%{_libdir}/pkgconfig/*
%changelog
* Mon Sep 22 2007 Behdad Esfahbod <besfahbo@redhat.com> 0.16.9-1
- Update to 0.16.9
* Mon Jul 30 2007 Matthias Clasen <mclasen@redhat.com> 0.16.8-1
- Update to 0.16.8
* Mon Jun 18 2007 Matthias Clasen <mclasen@redhat.com> 0.16.6-1
- Update to 0.16.6
* Mon Jun 05 2007 Behdad Esfahbod <besfahbo@redhat.com> 0.16.5-1
- Update to 0.16.5
* Tue May 29 2007 Matthias Clasen <mclasen@redhat.com> 0.16.4-1
- Update to 0.16.4
* Fri May 4 2007 Matthias Clasen <mclasen@redhat.com> 0.16.3-2
- Fix a gnome-terminal crash with input methods