Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e3d2326019 | ||
|
|
65645da811 | ||
|
|
f085988585 | ||
|
|
1e674af9fa | ||
|
|
b5e339542c | ||
|
|
f4d5eb75e7 | ||
|
|
df4606500a | ||
|
|
b2910469fb |
6 changed files with 20 additions and 82 deletions
|
|
@ -1 +0,0 @@
|
|||
vte-0.16.3.tar.bz2
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
vte-0.16.5.tar.bz2
|
||||
6
Makefile
6
Makefile
|
|
@ -1,6 +0,0 @@
|
|||
# Makefile for source rpm: vte
|
||||
# $Id$
|
||||
NAME := vte
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
include ../common/Makefile.common
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
a35cb0694159a9782fe43f49215c1bf5 vte-0.16.3.tar.bz2
|
||||
a42c893a01e3d9818789be373e529422 vte-0.16.9.tar.bz2
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
24
vte.spec
24
vte.spec
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue