summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-05-06 12:29:28 +0200
committerhut <hut@lavabit.com>2010-05-10 21:04:47 +0200
commit30c8fb813f98268d93a091365f051413e4160155 (patch)
tree897662e7d218fc716b51647074773d02241b9a35
parentccbe8b8d13ebdad09d282da51d118670a566cba5 (diff)
downloadranger-30c8fb813f98268d93a091365f051413e4160155.tar.gz
utf stuff
Diffstat
-rw-r--r--ranger/ext/utfwidth.py18


-rw-r--r--ranger/gui/widgets/console.py4


2 files changed, 16 insertions, 6 deletions
diff --git a/ranger/ext/utfwidth.py b/ranger/ext/utfwidth.py
index bbc67deb..2881a2a0 100644
--- a/ranger/ext/utfwidth.py
+++ b/ranger/ext/utfwidth.py
@@ -27,14 +27,14 @@ def utf_byte_length(string):
 	if firstord < 0x01111111:
 		return 1
 	if firstord < 0x10111111:
-		return 0  # invalid
+		return 1  # invalid
 	if firstord < 0x11011111:
 		return min(2, len(string))
 	if firstord < 0x11101111:
 		return min(3, len(string))
 	if firstord < 0x11110100:
 		return min(4, len(string))
-	return 0  # invalid
+	return 1  # invalid
 
 def utf_char_width(string):
 	# XXX
@@ -45,6 +45,7 @@ def utf_char_width(string):
 		return WIDE
 
 def _utf_char_to_int(string):
+	# Squash the last 6 bits of each byte together to an integer
 	u = 0
 	for c in string:
 		u = (u << 6) | (ord(c) & 0b00111111)
@@ -56,9 +57,16 @@ def uwid(string):
 	width = 0
 	while i < end:
 		bytelen = utf_byte_length(string[i:])
-		if bytelen:
-			width += utf_char_width(string[i:i+bytelen])
-		else:
 			width += 1
 		i += bytelen
 	return width
+
+def uchars(string):
+	end = len(string)
+	i = 0
+	result = []
+	while i < end:
+		bytelen = utf_byte_length(string[i:])
+		result.append(string[i:i+bytelen])
+		i += bytelen
+	return result
diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py
index 30872639..5a538ce2 100644
--- a/ranger/gui/widgets/console.py
+++ b/ranger/gui/widgets/console.py
@@ -31,6 +31,7 @@ from ranger.ext.utfwidth import uwid
 from ranger.container.keymap import CommandArgs
 from ranger.ext.get_executables import get_executables
 from ranger.ext.direction import Direction
+from ranger.ext.utfwidth import uwid, uchars
 from ranger.container import History
 from ranger.container.history import HistoryEmptyException
 import ranger
@@ -264,7 +265,8 @@ class Console(Widget):
 			self.close()
 		pos = self.pos + mod
 
-		self.line = self.line[0:pos] + self.line[pos+1:]
+		chars = uchars(self.line)
+		self.line = ''.join(chars[0:pos] + chars[pos+1:])
 		self.move(right=mod)
 		self.on_line_change()
 

 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-09-14 04:31:52 +0000


 


fani-tty/commit/tests/test_server_events.c?id=a7a28506376ff3ddf9eef5a6b3b140f8cb9c1da7'>a7a28506 ^

a7a28506 ^

a48df401 ^

055a5f71 ^

6d39f49f ^

a2726b6a ^

a2c62117 ^

a2726b6a ^

a7a28506 ^

a2c62117 ^



0e2fbeb3 ^

8ebc1d4a ^

0e2fbeb3 ^

055a5f71 ^

a48df401 ^

a7a28506 ^


a2726b6a ^


a7a28506 ^

a7a28506 ^

a48df401 ^

055a5f71 ^

6d39f49f ^

a2726b6a ^

a2c62117 ^

a2726b6a ^

0e2fbeb3 ^

a2c62117 ^



0e2fbeb3 ^

8ebc1d4a ^

a7a28506 ^

055a5f71 ^

a48df401 ^

a7a28506 ^


a2726b6a ^


a7a28506 ^

a7a28506 ^

a48df401 ^

055a5f71 ^

6d39f49f ^

a2726b6a ^

a2c62117 ^

a2726b6a ^

a7a28506 ^

a2c62117 ^



0e2fbeb3 ^

8ebc1d4a ^

0e2fbeb3 ^

055a5f71 ^

a48df401 ^

a7a28506 ^

5afb296e ^

a2726b6a ^


95ad5643 ^

a48df401 ^

055a5f71 ^

6d39f49f ^

95ad5643 ^

a2726b6a ^


95ad5643 ^

a2726b6a ^

95ad5643 ^

51bd4ed3 ^

a2726b6a ^

055a5f71 ^


8aba52f4 ^

a2726b6a ^

95ad5643 ^

9bd2315d ^

95ad5643 ^

055a5f71 ^

95ad5643 ^

a48df401 ^

95ad5643 ^

f180925c ^

a2726b6a ^


f180925c ^

055a5f71 ^

6d39f49f ^

f180925c ^

51bd4ed3 ^


f180925c ^


8aba52f4 ^

f180925c ^

a2726b6a ^


f180925c ^





1
2

3
4

5
6

7

8

9

10
11

12

13
14
15

16

17
18

19

20
21

22

23

24

25

26

27

28

29

30

31
32
33

34

35

36

37

38

39
40

41
42

43

44

45

46

47

48

49

50

51

52
53
54

55

56

57

58

59

60
61

62
63

64

65

66

67

68

69

70

71

72

73
74
75

76

77

78

79

80

81

82

83
84

85

86

87

88

89

90
91

92

93

94

95

96

97
98

99

100

101

102

103

104

105

106

107

108

109
110

111

112

113

114

115
116

117
118

119

120

121
122

123
124
125




                   

                   

                   
                 
 
                                

                             
                              


                               
                     

                            
 

                                                           
 
                                                      
                   
                    
                                      
                                   
                                                    
                                                                             
 


                                                                           
 
                                                        
 
                     
                       

 

                                                        
 
                                                   
                   
                    
                                      
                                   
                                                    
                                                                             
 


                                                                           
 
                                                        
 
                     
                       

 

                                                     
 
                                                   
                   
                    
                                      
                                   
                                                    
                                                                             
 


                                                                           
 
                                                        
 
                     
                       
 
 

                                                 
 
                   
                    
                                      
                         

                                             
                                                    
                                                                            
                                                     
                                                            
                                                             

                                                      
                                                   
                                                     
 
                         
 
                     
                          
                       
 
 

                                                  
 
                    
                                      
                         

                                                                       

                                 
                            
 

                                                                 


                          
#include <stdarg.h>
#include <stddef.h>
#include <setjmp.h>
#include <cmocka.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>

#include "event/server_events.h"
#include "xmpp/xmpp.h"
#include "xmpp/roster_list.h"
#include "xmpp/chat_session.h"
#include "config/preferences.h"
#include "ui/ui.h"
#include "ui/stub_ui.h"
#include "xmpp/muc.h"
#include "plugins/plugins.h"
#include "ui/window_list.h"

void
console_shows_online_presence_when_set_online(void** state)
{
    prefs_set_string(PREF_STATUSES_CONSOLE, "online");
    plugins_init();
    roster_create();
    roster_process_pending_presence();
    char* barejid = "test1@server";
    roster_add(barejid, "bob", NULL, "both", FALSE);
    Resource* resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);

    expect_memory(ui_contact_online, barejid, barejid, sizeof(barejid));
    expect_memory(ui_contact_online, resource, resource, sizeof(resource));
    expect_value(ui_contact_online, last_activity, NULL);

    sv_ev_contact_online(barejid, resource, NULL, NULL);

    roster_destroy();
    plugins_shutdown();
}

void
console_shows_online_presence_when_set_all(void** state)
{
    prefs_set_string(PREF_STATUSES_CONSOLE, "all");
    plugins_init();
    roster_create();
    roster_process_pending_presence();
    char* barejid = "test1@server";
    roster_add(barejid, "bob", NULL, "both", FALSE);
    Resource* resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);

    expect_memory(ui_contact_online, barejid, barejid, sizeof(barejid));
    expect_memory(ui_contact_online, resource, resource, sizeof(resource));
    expect_value(ui_contact_online, last_activity, NULL);

    sv_ev_contact_online(barejid, resource, NULL, NULL);

    roster_destroy();
    plugins_shutdown();
}

void
console_shows_dnd_presence_when_set_all(void** state)
{
    prefs_set_string(PREF_STATUSES_CONSOLE, "all");
    plugins_init();
    roster_create();
    roster_process_pending_presence();
    char* barejid = "test1@server";
    roster_add(barejid, "bob", NULL, "both", FALSE);
    Resource* resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);

    expect_memory(ui_contact_online, barejid, barejid, sizeof(barejid));
    expect_memory(ui_contact_online, resource, resource, sizeof(resource));
    expect_value(ui_contact_online, last_activity, NULL);

    sv_ev_contact_online(barejid, resource, NULL, NULL);

    roster_destroy();
    plugins_shutdown();
}

void
handle_offline_removes_chat_session(void** state)
{
    plugins_init();
    roster_create();
    roster_process_pending_presence();
    chat_sessions_init();
    char* barejid = "friend@server.chat.com";
    char* resource = "home";
    roster_add(barejid, "bob", NULL, "both", FALSE);
    Resource* resourcep = resource_new(resource, RESOURCE_ONLINE, NULL, 10);
    roster_update_presence(barejid, resourcep, NULL);
    chat_session_recipient_active(barejid, resource, FALSE);
    ProfConsoleWin* console = malloc(sizeof(ProfConsoleWin));
    will_return(win_create_console, &console->window);
    wins_init();
    sv_ev_contact_offline(barejid, resource, NULL);
    ChatSession* session = chat_session_get(barejid);

    assert_null(session);

    roster_destroy();
    chat_sessions_clear();
    plugins_shutdown();
}

void
lost_connection_clears_chat_sessions(void** state)
{
    roster_create();
    roster_process_pending_presence();
    chat_sessions_init();
    chat_session_recipient_active("bob@server.org", "laptop", FALSE);
    chat_session_recipient_active("steve@server.org", "mobile", FALSE);
    expect_any_cons_show_error();

    sv_ev_lost_connection();

    ChatSession* session1 = chat_session_get("bob@server.org");
    ChatSession* session2 = chat_session_get("steve@server.org");
    assert_null(session1);
    assert_null(session2);
}