Minor cleanups

This commit is contained in:
Vidar Hokstad 2024-01-11 19:17:35 +00:00
parent 6256db9692
commit 04a7851a65

View file

@ -11,14 +11,14 @@ module X11
AUTHENTICATE = 2 AUTHENTICATE = 2
ADDRESS_TYPES = { ADDRESS_TYPES = {
256 => :Local, 0 => :Internet,
1 => :DECnet,
2 => :Chaos,
252 => :LocalHost,
253 => :Krb5Principal,
254 => :Netname,
256 => :Local,
65535 => :Wild, 65535 => :Wild,
254 => :Netname,
253 => :Krb5Principal,
252 => :LocalHost,
0 => :Internet,
1 => :DECnet,
2 => :Chaos
} }
AuthInfo = Struct.new :family, :address, :display, :auth_name, :auth_data AuthInfo = Struct.new :family, :address, :display, :auth_name, :auth_data
@ -52,18 +52,15 @@ module X11
# returns one entry from Xauthority file # returns one entry from Xauthority file
def read def read
auth_info = [] << ADDRESS_TYPES[ @file.read(2).unpack('n').first ] auth_info = [] << ADDRESS_TYPES[ @file.read(2).unpack1('n') ]
4.times do 4.times do
length = @file.read(2).unpack('n').first length = @file.read(2).unpack1('n')
auth_info << @file.read(length) auth_info << @file.read(length)
end end
AuthInfo[*auth_info] AuthInfo[*auth_info]
end end
def reset def reset = @file.seek(0, IO::SEEK_SET)
@file.seek(0, IO::SEEK_SET)
end
end end
end end