Miroirs/ruby-x11
1
0
Fork 0
mirror of https://github.com/vidarh/ruby-x11 synced 2024-11-16 07:48:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better exceptions structure

Browse source
This commit is contained in:
Vidar Hokstad 2024-01-26 07:06:13 +00:00
parent 5e91e36c25
commit 91c7d4e8df
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/X11.rb
View file

@ -1,5 +1,5 @@
module X11 module X11
class X11Error < StandardError; end class BasicError < StandardError; end
end end
require 'socket' require 'socket'

16
lib/X11/display.rb
View file

@ -3,10 +3,16 @@ require 'stringio'
module X11 module X11
class DisplayError < X11Error; end class DisplayError < X11::BasicError; end
class ConnectionError < X11Error; end class ConnectionError < X11::BasicError; end
class AuthorizationError < X11Error; end class AuthorizationError < X11::BasicError; end
class ProtocolError < X11Error; end class ProtocolError < X11::BasicError; end
class Error < X11::BasicError
def initialize(pkt)
super("Error: #{pkt.error}, code=#{pkt.code}, seq=#{pkt.sequence_number}, resource=#{pkt.bad_resource_id}, major=#{pkt.major_opcode}, minor=#{pkt.minor_opcode}")
@error = pkt
end
end
class Display class Display
attr_accessor :socket attr_accessor :socket
@ -189,7 +195,7 @@ module X11
STDERR.puts "write_sync_req: #{ob.inspect}" if @debug STDERR.puts "write_sync_req: #{ob.inspect}" if @debug
pkt = q.shift pkt = q.shift
STDERR.puts "write_sync_rep: #{pkt.inspect}" if @debug STDERR.puts "write_sync_rep: #{pkt.inspect}" if @debug
raise(pkt) if pkt.is_a?(X11::Form::Error) raise(X11::Error.new(pkt)) if pkt.is_a?(X11::Form::Error)
return pkt if !pkt.is_a?(String) return pkt if !pkt.is_a?(String)
reply ? reply.from_packet(StringIO.new(pkt)) : pkt reply ? reply.from_packet(StringIO.new(pkt)) : pkt
end end

2
lib/X11/version.rb
View file

@ -1,3 +1,3 @@
module X11 module X11
VERSION = "0.0.8" VERSION = "0.0.9"
end end