changeset fbbe1cc6ab52 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=fbbe1cc6ab52
description: Correct display hyperlinks in XHTML-IM content.
Fixed the ability to run htmltextview.py as separate application.
Cut long lines. Fixed # 6045
diffstat:
src/conversation_textview.py | 65 +++++++++++--------
src/htmltextview.py | 138 +++++++++++++++++++++++++++---------------
2 files changed, 126 insertions(+), 77 deletions(-)
diffs (truncated from 448 to 300 lines):
diff -r 9a3002ba9be8 -r fbbe1cc6ab52 src/conversation_textview.py
--- a/src/conversation_textview.py Sun Nov 21 01:24:31 2010 +0300
+++ b/src/conversation_textview.py Fri Nov 26 17:50:20 2010 +0300
@@ -191,7 +191,7 @@
# no need to inherit TextView, use it as atrribute is safer
self.tv = HtmlTextView()
- self.tv.html_hyperlink_handler = self.html_hyperlink_handler
+ self.tv.hyperlink_handler = self.hyperlink_handler
# set properties
self.tv.set_border_width(1)
@@ -946,10 +946,24 @@
# we get the end of the tag
while not end_iter.ends_tag(texttag):
end_iter.forward_char()
- word = self.tv.get_buffer().get_text(begin_iter, end_iter).decode(
+
+ # Detect XHTML-IM link
+ word = getattr(texttag, 'href', None)
+ if word:
+ if word.startswith('xmpp'):
+ kind = 'xmpp'
+ elif word.startswith('mailto:'):
+ kind = 'mail'
+ elif gajim.interface.sth_at_sth_dot_sth_re.match(word):
+ # it's a JID or mail
+ kind = 'sth_at_sth'
+ else:
+ word = self.tv.get_buffer().get_text(begin_iter,
end_iter).decode(
'utf-8')
+
if event.button == 3: # right click
self.make_link_menu(event, kind, word)
+ return True
else:
# we launch the correct application
if kind == 'xmpp':
@@ -965,16 +979,6 @@
else:
helpers.launch_browser_mailer(kind, word)
- def html_hyperlink_handler(self, texttag, widget, event, iter_, kind,
href):
- if event.type == gtk.gdk.BUTTON_PRESS:
- if event.button == 3: # right click
- self.make_link_menu(event, kind, href)
- return True
- else:
- # we launch the correct application
- helpers.launch_browser_mailer(kind, href)
-
-
def detect_and_print_special_text(self, otext, other_tags, graphics=True):
"""
Detect special text (emots & links & formatting), print normal text
@@ -1039,6 +1043,14 @@
gajim.config.get('show_ascii_formatting_chars')
buffer_ = self.tv.get_buffer()
+ # Detect XHTML-IM link
+ ttt = buffer_.get_tag_table()
+ tags_ = [(ttt.lookup(t) if isinstance(t, str) else t) for t in
other_tags]
+ for t in tags_:
+ is_xhtml_link = getattr(t, 'href', None)
+ if is_xhtml_link:
+ break
+
# Check if we accept this as an uri
schemes = gajim.config.get('uri_schemes').split()
for scheme in schemes:
@@ -1062,21 +1074,18 @@
self.images.append(img)
# add with possible animation
self.tv.add_child_at_anchor(img, anchor)
- elif special_text.startswith('www.') or \
- special_text.startswith('ftp.') or \
- text_is_valid_uri:
- tags.append('url')
- use_other_tags = False
- elif special_text.startswith('mailto:'):
- tags.append('mail')
- use_other_tags = False
- elif special_text.startswith('xmpp:'):
- tags.append('xmpp')
- use_other_tags = False
- elif gajim.interface.sth_at_sth_dot_sth_re.match(special_text):
- # it's a JID or mail
- tags.append('sth_at_sth')
- use_other_tags = False
+ elif not is_xhtml_link:
+ if special_text.startswith('www.') or \
+ special_text.startswith('ftp.') or \
+ text_is_valid_uri:
+ tags.append('url')
+ elif special_text.startswith('mailto:'):
+ tags.append('mail')
+ elif special_text.startswith('xmpp:'):
+ tags.append('xmpp')
+ elif gajim.interface.sth_at_sth_dot_sth_re.match(special_text):
+ # it's a JID or mail
+ tags.append('sth_at_sth')
elif special_text.startswith('*'): # it's a bold text
tags.append('bold')
if special_text[1] == '/' and special_text[-2] == '/' and\
@@ -1163,7 +1172,6 @@
if use_other_tags:
all_tags += other_tags
# convert all names to TextTag
- ttt = buffer_.get_tag_table()
all_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in
all_tags]
buffer_.insert_with_tags(end_iter, special_text, *all_tags)
@@ -1361,6 +1369,7 @@
self.tv.display_html(xhtml.encode('utf-8'), self)
return
except Exception, e:
+ print e
gajim.log.debug('Error processing xhtml' + str(e))
gajim.log.debug('with |' + xhtml + '|')
diff -r 9a3002ba9be8 -r fbbe1cc6ab52 src/htmltextview.py
--- a/src/htmltextview.py Sun Nov 21 01:24:31 2010 +0300
+++ b/src/htmltextview.py Fri Nov 26 17:50:20 2010 +0300
@@ -50,7 +50,9 @@
if __name__ == '__main__':
from common import i18n
import common.configpaths
+ common.configpaths.gajimpaths.init_profile()
common.configpaths.gajimpaths.init(None)
+ import gtkgui_helpers
from common import gajim
import tooltips
@@ -182,8 +184,7 @@
size = (num-1) // 2
weigth = (num - 1) % 2
element_styles[name] = '; font-size: %s; %s' % ( ('large', 'medium',
'small')[size],
-
('font-weight: bold', 'font-style: oblique')[weigth],
-
)
+ ('font-weight: bold', 'font-style: oblique')[weigth],)
def _parse_css_color(color):
if color.startswith('rgb(') and color.endswith(')'):
@@ -215,7 +216,7 @@
self.preserve = False
self.styles = [] # a gtk.TextTag or None, for each span level
self.list_counters = [] # stack (top at head) of list
- # counters, or None
for unordered list
+ # counters, or None for unordered list
def _parse_style_color(self, tag, value):
color = _parse_css_color(value)
@@ -234,11 +235,12 @@
self.iter.forward_char()
return attrs
- def __parse_length_frac_size_allocate(self, textview, allocation,
-
frac, callback, args):
+ def __parse_length_frac_size_allocate(self, textview, allocation, frac,
+ callback, args):
callback(allocation.width*frac, *args)
- def _parse_length(self, value, font_relative, block_relative, minl, maxl,
callback, *args):
+ def _parse_length(self, value, font_relative, block_relative, minl, maxl,
+ callback, *args):
"""
Parse/calc length, converting to pixels, calls callback(length, *args)
when the length is first computed or changes
@@ -260,10 +262,10 @@
# textview width instead; a reasonable approximation..
alloc = self.textview.get_allocation()
self.__parse_length_frac_size_allocate(self.textview, alloc,
-
frac, callback, args)
+ frac, callback, args)
self.textview.connect('size-allocate',
-
self.__parse_length_frac_size_allocate,
- frac, callback, args)
+ self.__parse_length_frac_size_allocate,
+ frac, callback, args)
else:
callback(frac, *args)
return
@@ -335,7 +337,8 @@
tag.set_property('scale', pango.SCALE_LARGE)
return
# font relative (5 ~ 4pt, 110 ~ 72pt)
- self._parse_length(value, True, False, 5, 110,
self.__parse_font_size_cb, tag)
+ self._parse_length(value, True, False, 5,
110,self.__parse_font_size_cb,
+ tag)
def _parse_style_font_style(self, tag, value):
try:
@@ -358,13 +361,13 @@
def _parse_style_margin_left(self, tag, value):
# block relative
- self._parse_length(value, False, True, 1, 1000,
self.__frac_length_tag_cb,
- tag, 'left-margin')
+ self._parse_length(value, False, True, 1, 1000,
+ self.__frac_length_tag_cb, tag, 'left-margin')
def _parse_style_margin_right(self, tag, value):
# block relative
- self._parse_length(value, False, True, 1, 1000,
self.__frac_length_tag_cb,
- tag, 'right-margin')
+ self._parse_length(value, False, True, 1, 1000,
+ self.__frac_length_tag_cb, tag, 'right-margin')
def _parse_style_font_weight(self, tag, value):
# TODO: missing 'bolder' and 'lighter'
@@ -440,20 +443,20 @@
if value == 'auto':
return
self._parse_length(value, False, False, 1, 1000, self.__length_tag_cb,
- tag, "width")
+ tag, "width")
def _parse_style_height(self, tag, value):
if value == 'auto':
return
self._parse_length(value, False, False, 1, 1000, self.__length_tag_cb,
- tag, "height")
+ tag, "height")
# build a dictionary mapping styles to methods, for greater speed
__style_methods = dict()
for style in ('background-color', 'color', 'font-family', 'font-size',
- 'font-style', 'font-weight', 'margin-left',
'margin-right',
- 'text-align', 'text-decoration', 'white-space',
'display',
- 'width', 'height' ):
+ 'font-style', 'font-weight', 'margin-left', 'margin-right',
+ 'text-align', 'text-decoration', 'white-space', 'display',
+ 'width', 'height' ):
try:
method = locals()['_parse_style_%s' % style.replace('-', '_')]
except KeyError:
@@ -473,7 +476,7 @@
if href and href[0] != '#':
tag.href = href
tag.type_ = type_ # to be used by the URL handler
- tag.connect('event', self.textview.html_hyperlink_handler, 'url',
href)
+ tag.connect('event', self.textview.hyperlink_handler, 'url')
tag.set_property('foreground', gajim.config.get('urlmsgcolor'))
tag.set_property('underline', pango.UNDERLINE_SINGLE)
tag.is_anchor = True
@@ -507,7 +510,7 @@
while True:
if time.time() > deadline:
gajim.log.debug(str('Timeout loading image %s ' % \
- attrs['src'] + ex))
+ attrs['src'] + ex))
mem = ''
alt = attrs.get('alt', '')
if alt:
@@ -517,8 +520,8 @@
try:
temp = f.read(100)
except socket.timeout, ex:
- gajim.log.debug('Timeout loading image %s ' %
attrs['src'] + \
- str(ex))
+ gajim.log.debug('Timeout loading image %s ' % \
+ attrs['src'] + str(ex))
alt = attrs.get('alt', '')
if alt:
alt += '\n'
@@ -618,7 +621,7 @@
method = self.__style_methods[attr]
except KeyError:
warnings.warn('Style attribute "%s" requested '
- 'but not yet implemented' % attr)
+ 'but not yet implemented' % attr)
else:
method(self, tag, val)
self.styles.append(tag)
@@ -658,14 +661,14 @@
return False
def handle_specials(self, text):
- self.iter = self.conv_textview.detect_and_print_special_text(text,
self._get_style_tags())
+ self.iter = self.conv_textview.detect_and_print_special_text(text,
+ self._get_style_tags())
def characters(self, content):
if self.preserve:
self.text += content
return
if allwhitespace_rx.match(content) is not None and self._starts_line():
- self.text += ' '
return
self.text += content
self.starting = False
@@ -763,7 +766,8 @@
#FIXME: plenty of unused attributes (width, height,...) :)
self._jump_line()
try:
- self.textbuf.insert_pixbuf(self.iter,
self.textview.focus_out_line_pixbuf)
+ self.textbuf.insert_pixbuf(self.iter,
+ self.textview.focus_out_line_pixbuf)
#self._insert_text(u'\u2550'*40)
self._jump_line()
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
