ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.48 by root, Sun Apr 9 22:26:09 2006 UTC vs.
Revision 1.98 by root, Fri Apr 14 02:06:22 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
7
8use CFClient;
9
10our ($FOCUS, $HOVER, $GRAB); # various widgets
11
12our $TOPLEVEL;
13our $BUTTON_STATE;
14
15# class methods for events
16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS;
18}
19
20sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS;
22}
23
24sub feed_sdl_button_down_event {
25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27
28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y);
30
31 $GRAB = $widget;
32 $GRAB->update if $GRAB;
33 }
34
35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
38}
39
40sub feed_sdl_button_up_event {
41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49
50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab;
53 $GRAB->update if $GRAB;
54 }
55}
56
57sub feed_sdl_motion_event {
58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62
63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget;
65
66 $hover->update if $hover;
67 $HOVER->update if $HOVER;
68 }
69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
6 78
7use SDL::OpenGL; 79use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11
12# class methods for events
13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
15sub feed_sdl_button_down_event { }
16sub feed_sdl_button_up_event { }
17 80
18sub new { 81sub new {
19 my $class = shift; 82 my $class = shift;
20 83
21 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
22} 100}
23 101
24sub move { 102sub move {
25 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 104 $self->{x} = $x;
… …
35sub size_request { 113sub size_request {
36 require Carp; 114 require Carp;
37 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
38} 116}
39 117
40sub size_allocate { 118sub _size_allocate {
41 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
42 125
43 $self->{w} = $w; 126 $self->{w} = $w;
44 $self->{h} = $h; 127 $self->{h} = $h;
128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
138# translate global coordinates to local coordinate system
139sub translate {
140 my ($self, $x, $y) = @_;
141
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
45} 143}
46 144
47sub focus_in { 145sub focus_in {
48 my ($widget) = @_; 146 my ($self) = @_;
49 $::FOCUS = $widget; 147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
150
151 my $focus = $FOCUS; $FOCUS = $self;
152 $focus->update if $focus;
153 $FOCUS->update;
50} 154}
51 155
52sub focus_out { 156sub focus_out {
53 my ($widget) = @_; 157 my ($self) = @_;
54}
55 158
159 return unless $FOCUS == $self;
160
161 my $focus = $FOCUS; undef $FOCUS;
162 $focus->update if $focus; #?
163}
164
165sub mouse_motion { }
166sub button_up { }
56sub key_down { 167sub key_down { }
57 my ($widget, $sdlev) = @_;
58}
59
60sub key_up { 168sub key_up { }
61 my ($widget, $sdlev) = @_;
62}
63 169
64sub button_down { 170sub button_down {
65 my ($widget, $sdlev) = @_; 171 my ($self, $ev, $x, $y) = @_;
66}
67 172
68sub button_up { 173 $self->focus_in;
69 my ($widget, $sdlev) = @_;
70} 174}
71 175
72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77 181
78sub draw { 182sub draw {
79 my ($self) = @_; 183 my ($self) = @_;
184
185 return unless $self->{h} && $self->{w};
80 186
81 glPushMatrix; 187 glPushMatrix;
82 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
83 $self->_draw; 189 $self->_draw;
84 if ($self == $::HOVER) { 190 glPopMatrix;
85 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
86 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
87 glBegin GL_QUADS; 198 glBegin GL_QUADS;
88 glVertex 0, 0; 199 glVertex $x , $y;
89 glVertex $self->{w} - 1, 0; 200 glVertex $x + $self->{w}, $y;
90 glVertex $self->{w} - 1, $self->{h} - 1; 201 glVertex $x + $self->{w}, $y + $self->{h};
91 glVertex 0, $self->{h} - 1; 202 glVertex $x , $y + $self->{h};
92 glEnd; 203 glEnd;
93 glDisable GL_BLEND; 204 glDisable GL_BLEND;
94 } 205 }
95 glPopMatrix;
96} 206}
97 207
98sub _draw { 208sub _draw {
99 my ($self) = @_; 209 my ($self) = @_;
100 210
101 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
102}
103
104sub bbox {
105 my ($self) = @_;
106 my ($w, $h) = $self->size_request;
107 (
108 $self->{x},
109 $self->{y},
110 $self->{x} = $w,
111 $self->{y} = $h
112 )
113} 212}
114 213
115sub find_widget { 214sub find_widget {
116 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
117 216
… …
120 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
121 220
122 () 221 ()
123} 222}
124 223
125sub del_parent { $_[0]->{parent} = undef }
126
127sub set_parent { 224sub set_parent {
128 my ($self, $par) = @_; 225 my ($self, $par) = @_;
129 226
130 $self->{parent} = $par; 227 $self->{parent} = $par;
131 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
140 237
141 $self->{parent}->update 238 $self->{parent}->update
142 if $self->{parent}; 239 if $self->{parent};
143} 240}
144 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
145sub DESTROY { 255sub DESTROY {
146 my ($self) = @_; 256 my ($self) = @_;
147 257
148 #$self->deactivate; 258 #$self->deactivate;
149} 259}
150 260
151############################################################################# 261#############################################################################
152 262
153package Crossfire::Client::Widget::Container; 263package CFClient::UI::DrawBG;
154 264
155our @ISA = Crossfire::Client::Widget::; 265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
156 269
157sub new { 270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
303package CFClient::UI::Empty;
304
305our @ISA = CFClient::UI::Base::;
306
307sub size_request {
308 (0, 0)
309}
310
311sub draw { }
312
313#############################################################################
314
315package CFClient::UI::Container;
316
317our @ISA = CFClient::UI::Base::;
318
319sub new {
158 my ($class, @widgets) = @_; 320 my ($class, %arg) = @_;
159 321
322 my $children = delete $arg{children} || [];
323
160 my $self = $class->SUPER::new (children => []); 324 my $self = $class->SUPER::new (children => [], %arg);
161 $self->add ($_) for @widgets; 325 $self->add ($_) for @$children;
162 326
163 $self 327 $self
164} 328}
165 329
166sub add { 330sub add {
167 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
168 332
169 $chld->{expand} = $expand;
170 $chld->set_parent ($self); 333 $chld->set_parent ($self);
171 334
172 @{$self->{children}} = 335 $self->{children} = [
173 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
174 @{$self->{children}}, $chld; 337 @{$self->{children}}, $chld
338 ];
175 339
176 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
177 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
178} 342}
179 343
180sub remove { 344sub remove {
181 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
182 346
183 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
184 348
185 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
186} 350}
187 351
188sub find_widget { 352sub find_widget {
189 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
190 354
… …
207 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
208} 372}
209 373
210############################################################################# 374#############################################################################
211 375
212package Crossfire::Client::Widget::Bin; 376package CFClient::UI::Bin;
213 377
214our @ISA = Crossfire::Client::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
215 379
216sub child { $_[0]->{children}[0] } 380sub new {
381 my ($class, %arg) = @_;
217 382
218sub size_request { 383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
219 $_[0]{children}[0]->size_request if $_[0]{children}[0];
220}
221 384
222sub size_allocate { 385 $class->SUPER::new (children => [$child], %arg)
223 my ($self, $w, $h) = @_;
224
225 $self->SUPER::size_allocate ($w, $h);
226 $self->{children}[0]->size_allocate ($w, $h)
227 if $self->{children}[0]
228}
229
230#############################################################################
231
232package Crossfire::Client::Widget::Toplevel;
233
234our @ISA = Crossfire::Client::Widget::Container::;
235
236sub update {
237 my ($self) = @_;
238
239 ::refresh ();
240} 386}
241 387
242sub add { 388sub add {
243 my ($self, $widget) = @_; 389 my ($self, $widget) = @_;
244 390
391 $self->{children} = [];
392
245 $self->SUPER::add ($widget); 393 $self->SUPER::add ($widget);
246
247 $widget->size_allocate ($widget->size_request);
248} 394}
249 395
250############################################################################# 396sub remove {
397 my ($self, $widget) = @_;
251 398
252package Crossfire::Client::Widget::Window; 399 $self->SUPER::remove ($widget);
253 400
254our @ISA = Crossfire::Client::Widget::Bin::; 401 $self->{children} = [new CFClient::UI::Empty]
402 unless @{$self->{children}};
403}
404
405sub child { $_[0]->{children}[0] }
406
407sub size_request {
408 $_[0]{children}[0]->size_request
409}
410
411sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_;
413
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
417}
418
419#############################################################################
420
421package CFClient::UI::Window;
422
423our @ISA = CFClient::UI::Bin::;
255 424
256use SDL::OpenGL; 425use SDL::OpenGL;
257 426
258sub new { 427sub new {
259 my ($class, $x, $y, $z, $w, $h) = @_; 428 my ($class, %arg) = @_;
260 429
261 my $self = $class->SUPER::new; 430 my $self = $class->SUPER::new (%arg);
262
263 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
264} 431}
265 432
266sub update { 433sub update {
267 my ($self) = @_; 434 my ($self) = @_;
268 435
436 # we want to do this delayed...
269 $self->render_chld; 437 $self->render_chld;
270 $self->SUPER::update; 438 $self->SUPER::update;
271} 439}
272 440
273sub render_chld { 441sub render_chld {
274 my ($self) = @_; 442 my ($self) = @_;
275 443
276 $self->{texture} = 444 $self->{texture} =
277 Crossfire::Client::Texture->new_from_opengl ( 445 CFClient::Texture->new_from_opengl (
278 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
279 ); 447 );
280} 448}
281 449
282sub size_allocate { 450sub size_allocate {
283 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
284 452
285 $self->{w} = $w; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
286 $self->{h} = $h;
287 454
288 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
289 456
290 $self->render_chld; 457 $self->render_chld;
291} 458}
292 459
293sub _draw { 460sub _draw {
… …
297 464
298 my $tex = $self->{texture} 465 my $tex = $self->{texture}
299 or return; 466 or return;
300 467
301 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
302 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
303 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
304 glBindTexture GL_TEXTURE_2D, $tex->{name};
305 472
306 glBegin GL_QUADS; 473 $tex->draw_quad (0, 0, $w, $h);
307 glTexCoord 0, 0; glVertex 0, 0;
308 glTexCoord 0, 1; glVertex 0, $h;
309 glTexCoord 1, 1; glVertex $w, $h;
310 glTexCoord 1, 0; glVertex $w, 0;
311 glEnd;
312 474
313 glDisable GL_BLEND; 475 glDisable GL_BLEND;
314 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
315} 477}
316 478
317############################################################################# 479#############################################################################
318 480
319package Crossfire::Client::Widget::Frame; 481package CFClient::UI::Frame;
320 482
321our @ISA = Crossfire::Client::Widget::Bin::; 483our @ISA = CFClient::UI::Bin::;
322 484
323use SDL::OpenGL; 485use SDL::OpenGL;
324 486
325sub size_request { 487sub size_request {
326 my ($self) = @_; 488 my ($self) = @_;
… …
331 493
332 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
333} 495}
334 496
335sub size_allocate { 497sub size_allocate {
336 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
337 499
338 $self->{w} = $w; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
339 $self->{h} = $h;
340 501
341 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
342 $self->child->move (2, 2);
343} 503}
344 504
345sub _draw { 505sub _draw {
346 my ($self) = @_; 506 my ($self) = @_;
347 507
… …
349 509
350 my ($w, $h) = $chld->size_request; 510 my ($w, $h) = $chld->size_request;
351 511
352 glBegin GL_QUADS; 512 glBegin GL_QUADS;
353 glColor 0, 0, 0; 513 glColor 0, 0, 0;
354 glTexCoord 0, 0; glVertex 0 , 0; 514 glVertex 0 , 0;
355 glTexCoord 0, 1; glVertex 0 , $h + 4; 515 glVertex 0 , $h + 4;
356 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 516 glVertex $w + 4 , $h + 4;
357 glTexCoord 1, 0; glVertex $w + 4 , 0; 517 glVertex $w + 4 , 0;
358 glEnd; 518 glEnd;
359 519
360 $chld->draw; 520 $chld->draw;
361} 521}
362 522
363############################################################################# 523#############################################################################
364 524
365package Crossfire::Client::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
366 526
367our @ISA = Crossfire::Client::Widget::Bin::; 527our @ISA = CFClient::UI::Bin::;
368 528
369use SDL::OpenGL; 529use SDL::OpenGL;
370 530
371my @tex = 531my @tex =
372 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
373 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
374 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
375sub size_request { 548sub size_request {
376 my ($self) = @_; 549 my ($self) = @_;
377 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
378 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
379 554
380 $h += $tex[1]->{height}; 555 (
381 $h += $tex[4]->{height}; 556 $w + $self->{border} * 2,
382 $w += $tex[2]->{width}; 557 $h + $self->{border} * 2,
383 $w += $tex[3]->{width}; 558 )
384
385 ($w, $h)
386} 559}
387 560
388sub size_allocate { 561sub size_allocate {
389 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
390 563
391 $self->SUPER::size_allocate ($w, $h); 564 $self->_size_allocate ($x, $y, $w, $h) or return;
392 565
393 $h -= $tex[1]->{height}; 566 $h -= List::Util::max 0, $self->{border} * 2;
394 $h -= $tex[4]->{height}; 567 $w -= List::Util::max 0, $self->{border} * 2;
395 $w -= $tex[2]->{width};
396 $w -= $tex[3]->{width};
397 568
398 $h = $h < 0 ? 0 : $h; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
399 $w = $w < 0 ? 0 : $w; 570}
400 571
401 $self->child->size_allocate ($w, $h); 572sub button_down {
402 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 573 my ($self, $ev, $x, $y) = @_;
574
575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
577
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
403} 618}
404 619
405sub _draw { 620sub _draw {
406 my ($self) = @_; 621 my ($self) = @_;
407 622
408 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
409 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
410 625
411 glEnable GL_BLEND; 626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
412 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
415 630
416 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
417 glBindTexture GL_TEXTURE_2D, $top->{name}; 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
418 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
419 glBegin GL_QUADS; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
420 glTexCoord 0, 0; glVertex 0 , 0; 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
421 glTexCoord 0, 1; glVertex 0 , $top->{height};
422 glTexCoord 1, 1; glVertex $w , $top->{height};
423 glTexCoord 1, 0; glVertex $w , 0;
424 glEnd;
425
426 my $left = $tex[3];
427 glBindTexture GL_TEXTURE_2D, $left->{name};
428
429 glBegin GL_QUADS;
430 glTexCoord 0, 0; glVertex 0 , $top->{height};
431 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
432 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
433 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
434 glEnd;
435
436 my $right = $tex[2];
437 glBindTexture GL_TEXTURE_2D, $right->{name};
438
439 glBegin GL_QUADS;
440 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
441 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
442 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
443 glTexCoord 1, 0; glVertex $w , $top->{height};
444 glEnd;
445
446 my $bottom = $tex[4];
447 glBindTexture GL_TEXTURE_2D, $bottom->{name};
448
449 glBegin GL_QUADS;
450 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
451 glTexCoord 0, 1; glVertex 0 , $h;
452 glTexCoord 1, 1; glVertex $w , $h;
453 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
454 glEnd;
455 636
456 my $bg = $tex[0]; 637 my $bg = $tex[0];
457 glBindTexture GL_TEXTURE_2D, $bg->{name};
458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
460 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
461 638
639 # TODO: repeat texture not scale
462 my $rep_x = $cw / $bg->{width}; 640 my $rep_x = $cw / $bg->{w};
463 my $rep_y = $ch / $bg->{height}; 641 my $rep_y = $ch / $bg->{h};
464 642
465 glBegin GL_QUADS; 643 glColor @{ $self->{bg} };
466 glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; 644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
467 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
468 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
469 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
470 glEnd;
471 645
646 glDisable GL_TEXTURE_2D;
472 glDisable GL_BLEND; 647 glDisable GL_BLEND;
473 glDisable GL_TEXTURE_2D;
474 648
475 $self->child->draw; 649 $self->child->draw;
476
477} 650}
478 651
479############################################################################# 652#############################################################################
480 653
481package Crossfire::Client::Widget::Table; 654package CFClient::UI::Table;
482 655
483our @ISA = Crossfire::Client::Widget::Bin::; 656our @ISA = CFClient::UI::Base::;
657
658use List::Util qw(max sum);
484 659
485use SDL::OpenGL; 660use SDL::OpenGL;
661
662sub new {
663 my $class = shift;
664
665 $class->SUPER::new (
666 col_expand => [],
667 @_
668 )
669}
486 670
487sub add { 671sub add {
488 my ($self, $x, $y, $chld) = @_; 672 my ($self, $x, $y, $chld) = @_;
489 my $old_chld = $self->{children}[$y][$x];
490 673
491 $self->{children}[$y][$x] = $chld; 674 $self->{children}[$y][$x] = $chld;
492 $chld->set_parent ($self); 675 $chld->set_parent ($self);
676
677 $self->{w} = $self->{h} = -1;
493 $self->update; 678 $self->update;
494} 679}
495 680
496sub max_row_height { 681sub get_wh {
497 my ($self, $row) = @_; 682 my ($self) = @_;
498 683
499 my $hs = 0; 684 my (@w, @h);
500 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 685
686 for my $y (0 .. $#{$self->{children}}) {
501 my $c = $self->{children}->[$row]->[$xi]; 687 my $row = $self->{children}[$y]
502 if ($c) { 688 or next;
689
690 for my $x (0 .. $#$row) {
691 my $widget = $row->[$x]
692 or next;
503 my ($w, $h) = $c->size_request; 693 my ($w, $h) = $widget->size_request;
504 if ($hs < $h) { $hs = $h } 694
695 $w[$x] = max $w[$x], $w;
696 $h[$y] = max $h[$y], $h;
505 } 697 }
506 } 698 }
507 return $hs;
508}
509 699
510sub max_col_width { 700 (\@w, \@h)
701}
702
703sub size_request {
511 my ($self, $col) = @_; 704 my ($self) = @_;
512 705
706 my ($ws, $hs) = $self->get_wh;
707
708 (
709 (sum @$ws),
710 (sum @$hs),
711 )
712}
713
714sub size_allocate {
715 my ($self, $x, $y, $w, $h) = @_;
716
717 $self->_size_allocate ($x, $y, $w, $h) or return;
718
719 my ($ws, $hs) = $self->get_wh;
720
721 my $req_w = sum @$ws;
722 my $req_h = sum @$hs;
723
724 # TODO: nicer code && do row_expand
725 my @col_expand = @{$self->{col_expand}};
726 @col_expand = (1) x @$ws unless @col_expand;
727 my $col_expand = (sum @col_expand) || 1;
728
729 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
732
733 my $y;
734
735 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r]
737 or next;
738
513 my $ws = 0; 739 my $x = 0;
514 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 740 my $row_h = $hs->[$r];
515 my $c = ($self->{children}->[$yi] || [])->[$col]; 741
516 if ($c) { 742 for my $c (0 .. $#$row) {
517 my ($w, $h) = $c->size_request; 743 my $col_w = $ws->[$c];
518 if ($ws < $w) { $ws = $w } 744
745 if (my $widget = $row->[$c]) {
746 $widget->size_allocate ($x, $y, $col_w, $row_h);
747 }
748
749 $x += $col_w;
519 } 750 }
751
752 $y += $row_h;
520 } 753 }
521 return $ws; 754
522} 755}
756
757sub find_widget {
758 my ($self, $x, $y) = @_;
759
760 $x -= $self->{x};
761 $y -= $self->{y};
762
763 my $res;
764
765 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
766 $res = $_->find_widget ($x, $y)
767 and return $res;
768 }
769
770 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
771}
772
773sub _draw {
774 my ($self) = @_;
775
776 for (grep $_, @{$self->{children}}) {
777 $_->draw for grep $_, @$_;
778 }
779}
780
781#############################################################################
782
783package CFClient::UI::HBox;
784
785# TODO: wrap into common Box base class
786
787our @ISA = CFClient::UI::Container::;
523 788
524sub size_request { 789sub size_request {
525 my ($self) = @_; 790 my ($self) = @_;
526 791
792 my @alloc = map [$_->size_request], @{$self->{children}};
793
794 (
795 (List::Util::sum map $_->[0], @alloc),
796 (List::Util::max map $_->[1], @alloc),
797 )
798}
799
800sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804
527 my ($hs, $ws) = (0, 0); 805 ($h, $w) = ($w, $h);
528 806
529 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 807 my $children = $self->{children};
530 $hs += $self->max_row_height ($yi);
531 }
532 808
533 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 809 my @h = map +($_->size_request)[0], @$children;
534 my $wm = 0; 810
535 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 811 my $req_h = List::Util::sum @h;
536 $wm += $self->max_col_width ($xi) 812
813 if ($req_h > $h) {
814 # ah well, not enough space
815 $_ *= $h / $req_h for @h;
816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1;
819
820 for (0 .. $#$children) {
821 my $child = $children->[$_];
822
823 my $alloc_h = $h[$_];
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h;
537 } 826 }
538 if ($ws < $wm) { $ws = $wm }
539 } 827 }
540
541 return ($ws, $hs);
542}
543
544sub _draw {
545 my ($self) = @_;
546 828
547 my $y = 0; 829 my $y = 0;
548 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 830 for (0 .. $#$children) {
831 my $child = $children->[$_];
549 my $x = 0; 832 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w);
550 834
551 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 835 $y += $h;
552
553 my $c = $self->{children}->[$yi]->[$xi];
554 if ($c) {
555 $c->move ($x, $y, 0); #TODO: Move to size_request
556 $c->draw if $c;
557 }
558
559 $x += $self->max_col_width ($xi);
560 }
561
562 $y += $self->max_row_height ($yi);
563 } 836 }
564} 837}
565 838
566############################################################################# 839#############################################################################
567 840
568package Crossfire::Client::Widget::VBox; 841package CFClient::UI::VBox;
569 842
843# TODO: wrap into common Box base class
844
570our @ISA = Crossfire::Client::Widget::Container::; 845our @ISA = CFClient::UI::Container::;
571
572use SDL::OpenGL;
573 846
574sub size_request { 847sub size_request {
575 my ($self) = @_; 848 my ($self) = @_;
576 849
577 my @alloc = map [$_->size_request], @{$self->{children}}; 850 my @alloc = map [$_->size_request], @{$self->{children}};
… …
581 (List::Util::sum map $_->[1], @alloc), 854 (List::Util::sum map $_->[1], @alloc),
582 ) 855 )
583} 856}
584 857
585sub size_allocate { 858sub size_allocate {
586 my ($self, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
587 860
588 $self->w ($w); 861 $self->_size_allocate ($x, $y, $w, $h);
589 $self->h ($h);
590 862
591 my $exp; 863 my $children = $self->{children};
592 my @oth; 864
593 # find expand widget 865 my @h = map +($_->size_request)[1], @$children;
594 for (@{$self->{children}}) { 866
595 if ($_->{expand}) { 867 my $req_h = List::Util::sum @h;
868
869 if ($req_h > $h) {
870 # ah well, not enough space
871 $_ *= $h / $req_h for @h;
872 } else {
873 my $exp = List::Util::sum map $_->{expand}, @$children;
596 $exp = $_; 874 $exp ||= 1;
597 last; 875
876 for (0 .. $#$children) {
877 my $child = $children->[$_];
878
879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
598 } 880 }
599 push @oth, $_;
600 }
601
602 my ($ow, $oh);
603
604 # get sizes of other widgets
605 for (@oth) {
606 my ($w, $h) = $_->size_request;
607 $oh += $h;
608 if ($ow < $w) { $ow = $w }
609 } 881 }
610 882
611 my $y = 0; 883 my $y = 0;
612 for (@{$self->{children}}) { 884 for (0 .. $#$children) {
613 $_->move (0, $y); 885 my $child = $children->[$_];
614 886 my $h = $h[$_];
615 if ($_ == $exp) {
616 $_->size_allocate ($w, $h - $oh);
617 $y += $h - $oh;
618 } else {
619 my ($cw, $h) = $_->size_request;
620 $_->size_allocate ($w, $h); 887 $child->size_allocate (0, $y, $w, $h);
888
621 $y += $h; 889 $y += $h;
622 }
623 } 890 }
624} 891}
625 892
626############################################################################# 893#############################################################################
627 894
628package Crossfire::Client::Widget::Label; 895package CFClient::UI::Label;
629 896
630our @ISA = Crossfire::Client::Widget::; 897our @ISA = CFClient::UI::Base::;
631 898
632use SDL::OpenGL; 899use SDL::OpenGL;
633 900
634sub new { 901sub new {
635 my ($class, $x, $y, $z, $height, $text) = @_; 902 my ($class, %arg) = @_;
636 903
637 # TODO: color, and make height, xyz etc. optional 904 my $self = $class->SUPER::new (
638 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 905 fg => [1, 1, 1],
906 height => $::FONTSIZE,
907 text => "",
908 align => -1,
909 padding => 2,
910 layout => new CFClient::Layout,
911 %arg
912 );
639 913
640 $self->set_text ($text); 914 $self->set_text ($self->{text});
641 915
642 $self 916 $self
917}
918
919sub escape_text {
920 local $_ = $_[1];
921
922 s/&/&amp;/g;
923 s/>/&gt;/g;
924 s/</&lt;/g;
925
926 $_[1]
643} 927}
644 928
645sub set_text { 929sub set_text {
646 my ($self, $text) = @_; 930 my ($self, $text) = @_;
647 931
648 $self->{text} = $text; 932 $self->{text} = $text;
649 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 933 $self->{layout}->set_markup ($text);
650 934
935 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
651 $self->update; 937 $self->update;
652} 938}
653 939
654sub get_text { 940sub get_text {
655 my ($self, $text) = @_; 941 my ($self, $text) = @_;
… …
658} 944}
659 945
660sub size_request { 946sub size_request {
661 my ($self) = @_; 947 my ($self) = @_;
662 948
949 $self->{layout}->set_width;
950 $self->{layout}->set_height ($self->{height});
951 my ($w, $h) = $self->{layout}->size;
952
663 ( 953 (
664 $self->{texture}{width}, 954 $w + $self->{padding} * 2,
665 $self->{texture}{height}, 955 $h + $self->{padding} * 2,
666 ) 956 )
667} 957}
668 958
959sub size_allocate {
960 my ($self, $x, $y, $w, $h) = @_;
961
962 $self->_size_allocate ($x, $y, $w, $h) or return;
963
964 delete $self->{texture};
965}
966
967sub update {
968 my ($self) = @_;
969
970 delete $self->{texture};
971 $self->SUPER::update;
972}
973
669sub _draw { 974sub _draw {
670 my ($self) = @_; 975 my ($self) = @_;
671 976
977 my $tex = $self->{texture} ||= do {
978 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
980 new_from_layout CFClient::Texture $self->{layout}
981 };
982
983 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987
988 glColor @{$self->{fg}};
989
990 my $x =
991 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5;
994
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
996 $tex->draw_quad (0, 0);
997
998 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND;
1000}
1001
1002#############################################################################
1003
1004package CFClient::UI::Entry;
1005
1006our @ISA = CFClient::UI::Label::;
1007
1008use SDL;
1009use SDL::OpenGL;
1010
1011sub new {
1012 my $class = shift;
1013
1014 $class->SUPER::new (
1015 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0],
1019 can_hover => 1,
1020 can_focus => 1,
1021 @_
1022 )
1023}
1024
1025sub _set_text {
1026 my ($self, $text) = @_;
1027
1028 $self->{last_activity} = $::NOW;
1029
1030 $self->{text} = $text;
1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1033
1034 $text =~ s/./*/g if $self->{hidden};
1035
1036 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1037
1038 $text = substr $text, 0, $self->{cursor};
1039 utf8::encode $text;
1040
1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042}
1043
1044sub size_request {
1045 my ($self) = @_;
1046
1047 my ($w, $h) = $self->SUPER::size_request;
1048
1049 ($w + 1, $h) # add 1 for cursor
1050}
1051
1052sub size_allocate {
1053 my ($self, $x, $y, $w, $h) = @_;
1054
1055 $self->SUPER::size_allocate ($x, $y, $w, $h);
1056
1057 $self->_set_text ($self->{text});
1058}
1059
1060sub set_text {
1061 my ($self, $text) = @_;
1062
1063 $self->{cursor} = length $text;
1064 $self->_set_text ($text);
1065 $self->update;
1066}
1067
1068sub key_down {
1069 my ($self, $ev) = @_;
1070
1071 my $mod = $ev->key_mod;
1072 my $sym = $ev->key_sym;
1073
1074 my $uni = $ev->key_unicode;
1075
1076 my $text = $self->get_text;
1077
1078 if ($sym == SDLK_BACKSPACE) {
1079 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1080 } elsif ($sym == SDLK_DELETE) {
1081 substr $text, $self->{cursor}, 1, "";
1082 } elsif ($sym == SDLK_LEFT) {
1083 --$self->{cursor} if $self->{cursor};
1084 } elsif ($sym == SDLK_RIGHT) {
1085 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) {
1087 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) {
1089 $self->{cursor} = length $text;
1090 } elsif ($uni) {
1091 substr $text, $self->{cursor}++, 0, chr $uni;
1092 }
1093
1094 $self->_set_text ($text);
1095 $self->update;
1096}
1097
1098sub focus_in {
1099 my ($self) = @_;
1100
1101 $self->{last_activity} = $::NOW;
1102
1103 $self->SUPER::focus_in;
1104}
1105
1106sub button_down {
1107 my ($self, $ev, $x, $y) = @_;
1108
1109 $self->SUPER::button_down ($ev, $x, $y);
1110
1111 my $idx = $self->{layout}->xy_to_index ($x, $y);
1112
1113 # byte-index to char-index
672 my $tex = $self->{texture}; 1114 my $text = $self->{text};
1115 utf8::encode $text;
1116 $self->{cursor} = length substr $text, 0, $idx;
1117
1118 $self->_set_text ($self->{text});
1119 $self->update;
1120}
1121
1122sub mouse_motion {
1123 my ($self, $ev, $x, $y) = @_;
1124# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1125}
1126
1127sub _draw {
1128 my ($self) = @_;
1129
1130 local $self->{fg} = $self->{fg};
1131
1132 if ($FOCUS == $self) {
1133 glColor @{$self->{active_bg}};
1134 $self->{fg} = $self->{active_fg};
1135 } else {
1136 glColor @{$self->{bg}};
1137 }
1138
1139 glEnable GL_BLEND;
1140 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1141 glBegin GL_QUADS;
1142 glVertex 0 , 0;
1143 glVertex 0 , $self->{h};
1144 glVertex $self->{w}, $self->{h};
1145 glVertex $self->{w}, 0;
1146 glEnd;
1147 glDisable GL_BLEND;
1148
1149 $self->SUPER::_draw;
1150
1151 #TODO: force update every cursor change :(
1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1153 glColor @{$self->{fg}};
1154 glBegin GL_LINES;
1155 glVertex $self->{cur_x}, $self->{cur_y};
1156 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1157 glEnd;
1158 }
1159}
1160
1161#############################################################################
1162
1163package CFClient::UI::Button;
1164
1165our @ISA = CFClient::UI::Label::;
1166
1167use SDL;
1168use SDL::OpenGL;
1169
1170my @tex =
1171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1172 qw(b1_button_active.png);
1173
1174sub new {
1175 my $class = shift;
1176
1177 $class->SUPER::new (
1178 padding => 4,
1179 fg => [1, 1, 1],
1180 bg => [1, 1, 1, 0.2],
1181 active_fg => [1, 1, 0],
1182 can_hover => 1,
1183 @_
1184 )
1185}
1186
1187sub button_up {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if ($x >= 0 && $x < $self->{w}
1191 && $y >= 0 && $y < $self->{h}) {
1192 $self->emit ("activate");
1193 }
1194}
1195
1196sub _draw {
1197 my ($self) = @_;
1198
1199 local $self->{fg} = $self->{fg};
1200 my $tex = $tex[0];
673 1201
674 glEnable GL_BLEND; 1202 glEnable GL_BLEND;
675 glEnable GL_TEXTURE_2D; 1203 glEnable GL_TEXTURE_2D;
676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1205
1206 if ($GRAB == $self) {
1207 $self->{fg} = $self->{active_fg};
1208 }
1209
678 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1210 glBindTexture GL_TEXTURE_2D, $tex->{name};
1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
679 1212
680 glColor 1, 0, 0, 1; # TODO color 1213 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
681 1214
682 glBegin GL_QUADS; 1215 glDisable GL_TEXTURE_2D;
683 glTexCoord 0, 0; glVertex 0 , 0;
684 glTexCoord 0, 1; glVertex 0 , $tex->{height};
685 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
686 glTexCoord 1, 0; glVertex $tex->{width}, 0;
687 glEnd;
688
689 glDisable GL_BLEND; 1216 glDisable GL_BLEND;
690 glDisable GL_TEXTURE_2D;
691}
692 1217
693############################################################################# 1218 $self->SUPER::_draw;
1219}
694 1220
695package Crossfire::Client::Widget::TextEntry; 1221#############################################################################
696 1222
697our @ISA = Crossfire::Client::Widget::Label::; 1223package CFClient::UI::CheckBox;
1224
1225our @ISA = CFClient::UI::DrawBG::;
698 1226
699use SDL; 1227use SDL;
700use SDL::OpenGL; 1228use SDL::OpenGL;
701 1229
702sub key_down { 1230sub new {
1231 my $class = shift;
1232
1233 $class->SUPER::new (
1234 padding => 2,
1235 fg => [1, 1, 1],
1236 active_fg => [1, 1, 0],
1237 state => 0,
1238 can_hover => 1,
1239 @_
1240 )
1241}
1242
1243sub size_request {
703 my ($self, $ev) = @_; 1244 my ($self) = @_;
704 1245
705 my $mod = $ev->key_mod; 1246 ($self->{padding} * 2 + 6) x 2
706 my $sym = $ev->key_sym; 1247}
707 1248
708 $ev->set_unicode (1); 1249sub size_allocate {
709 my $uni = $ev->key_unicode; 1250 my ($self, $x, $y, $w, $h) = @_;
710 1251
711 my $text = $self->get_text; 1252 $self->_size_allocate ($x, $y, $w, $h);
1253}
712 1254
713 if ($sym == SDLK_BACKSPACE) { 1255sub button_down {
714 substr $text, -1, 1, ''; 1256 my ($self, $ev, $x, $y) = @_;
715 1257
716 } elsif ($uni) { 1258 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
717 $text .= chr $uni; 1259 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1260 $self->{state} = !$self->{state};
1261 $self->emit (changed => $self->{state});
1262 }
1263}
1264
1265sub _draw {
1266 my ($self) = @_;
1267
1268 $self->SUPER::_draw;
1269
1270 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1271
1272 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
718 } 1273
719 $self->set_text ($text); 1274 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
720}
721 1275
722############################################################################# 1276 glBegin GL_LINE_LOOP;
1277 glVertex 0 , 0;
1278 glVertex 0 , $s;
1279 glVertex $s, $s;
1280 glVertex $s, 0;
1281 glEnd;
723 1282
1283 if ($self->{state}) {
1284 glBegin GL_LINES;
1285 glVertex 0 , 0;
1286 glVertex $s, $s;
1287 glVertex $s, 0;
1288 glVertex 0 , $s;
1289 glEnd;
1290 }
1291}
1292
1293#############################################################################
1294
1295package CFClient::UI::Slider;
1296
1297use strict;
1298
1299use SDL::OpenGL;
1300
1301our @ISA = CFClient::UI::DrawBG::;
1302
1303sub new {
1304 my $class = shift;
1305
1306 # range [value, low, high, page]
1307
1308 # TODO: 0-width page
1309 # TODO: req_w/h are wrong with vertical
1310 # TODO: calculations are off
1311 my $self = $class->SUPER::new (
1312 fg => [1, 1, 1],
1313 active_fg => [0, 0, 0],
1314 range => [0, 0, 100, 10],
1315 req_w => 40,
1316 req_h => 13,
1317 vertical => 0,
1318 can_hover => 1,
1319 @_
1320 );
1321
1322 $self
1323}
1324
1325sub size_request {
1326 my ($self) = @_;
1327
1328 my $w = $self->{req_w};
1329 my $h = $self->{req_h};
1330
1331 $self->{vertical} ? ($h, $w) : ($w, $h)
1332}
1333
1334sub button_down {
1335 my ($self, $ev, $x, $y) = @_;
1336
1337 $self->SUPER::button_down ($ev, $x, $y);
1338 $self->mouse_motion ($ev, $x, $y);
1339}
1340
1341sub mouse_motion {
1342 my ($self, $ev, $x, $y) = @_;
1343
1344 if ($GRAB == $self) {
1345 my ($value, $lo, $hi, $page) = @{$self->{range}};
1346
1347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1348
1349 $x = $x * ($hi - $lo) / $w + $lo;
1350 $x = $lo if $x < $lo;
1351 $x = $hi - $page if $x > $hi - $page;
1352 $self->{range}[0] = $x;
1353
1354 $self->emit (changed => $x);
1355 $self->update;
1356 }
1357}
1358
1359sub _draw {
1360 my ($self) = @_;
1361
1362 $self->SUPER::_draw ();
1363
1364 my ($w, $h) = @$self{qw(w h)};
1365
1366 if ($self->{vertical}) {
1367 # draw a vertical slider like a rotated horizontal slider
1368
1369 glRotate 90, 0, 0, 1;
1370 glTranslate 0, -$self->{w}, 0;
1371
1372 ($w, $h) = ($h, $w);
1373 }
1374
1375 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1376 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1377
1378 my ($value, $lo, $hi, $page) = @{$self->{range}};
1379
1380 $page = int $page * $w / ($hi - $lo);
1381 $value = int +($value - $lo) * $w / ($hi - $lo);
1382
1383 $w -= $page;
1384 $page &= ~1;
1385 glTranslate $page * 0.5, 0, 0;
1386 $page ||= 2;
1387
1388 glColor @$fg;
1389 glBegin GL_LINES;
1390 glVertex 0, 0; glVertex 0, $h;
1391 glVertex $w - 1, 0; glVertex $w - 1, $h;
1392 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1393 glEnd;
1394
1395 my $knob_a = $value - $page * 0.5;
1396 my $knob_b = $value + $page * 0.5;
1397
1398 glBegin GL_QUADS;
1399 glColor @$fg;
1400 glVertex $knob_a, 0;
1401 glVertex $knob_a, $h;
1402 glVertex $knob_b, $h;
1403 glVertex $knob_b, 0;
1404
1405 if ($knob_a < $knob_b - 2) {
1406 glColor @$bg;
1407 glVertex $knob_a + 1, 1;
1408 glVertex $knob_a + 1, $h - 1;
1409 glVertex $knob_b - 1, $h - 1;
1410 glVertex $knob_b - 1, 1;
1411 }
1412 glEnd;
1413}
1414
1415#############################################################################
1416
1417package CFClient::UI::TextView;
1418
1419our @ISA = CFClient::UI::HBox::;
1420
1421use SDL::OpenGL;
1422
1423sub new {
1424 my $class = shift;
1425
1426 my $self = $class->SUPER::new (
1427 par => [],
1428 @_,
1429 children => [
1430 (new CFClient::UI::Empty expand => 1),
1431 (new CFClient::UI::Slider vertical => 1),
1432 ],
1433 );
1434
1435 $self
1436}
1437
1438sub add_paragraph {
1439 my ($self, $color, $text) = @_;
1440
1441 push @{$self->{par}}, [$color, $text];
1442 my $count = scalar @{$self->{par}};
1443 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1444 $self->{children}[1]->update;
1445}
1446
1447sub _draw {
1448 my ($self) = @_;
1449
1450 my $par = $self->{par};
1451
1452 my $bottom = (scalar @$par) - 1;
1453
1454 my $w = $self->{children}[0]{w};
1455 my $y = $self->{h};
1456
1457 glEnable GL_BLEND;
1458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1459 glEnable GL_TEXTURE_2D;
1460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1461
1462 # TODO: everything!
1463 while ($y > 0 && $bottom >= 0) {
1464 my $par = $par->[$bottom--];
1465
1466 my $layout = new CFClient::Layout;
1467
1468 $layout->set_height ($::FONTSIZE);
1469 $layout->set_width ($w);
1470 $layout->set_text ($par->[1]);
1471 my $tex = new_from_layout CFClient::Texture $layout;
1472 $y -= $tex->{h};
1473
1474 glColor @{ $par->[0] };
1475 $tex->draw_quad (0, $y);
1476 }
1477
1478 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND;
1480}
1481
1482#############################################################################
1483
724package Crossfire::Client::Widget::MapWidget; 1484package CFClient::UI::MapWidget;
725 1485
726use strict; 1486use strict;
727 1487
728use List::Util qw(min max); 1488use List::Util qw(min max);
729 1489
730use SDL; 1490use SDL;
731use SDL::OpenGL; 1491use SDL::OpenGL;
732use SDL::OpenGL::Constants;
733 1492
734our @ISA = Crossfire::Client::Widget::; 1493our @ISA = CFClient::UI::Base::;
1494
1495sub new {
1496 my $class = shift;
1497
1498 $class->SUPER::new (
1499 z => -1,
1500 can_focus => 1,
1501 list => (glGenLists 1),
1502 @_
1503 )
1504}
735 1505
736sub key_down { 1506sub key_down {
737 print "MAPKEYDOWN\n"; 1507 print "MAPKEYDOWN\n";
738} 1508}
739 1509
740sub key_up { 1510sub key_up {
741} 1511}
742 1512
743sub size_request { 1513sub size_request {
744 1514 (
1515 1 + 32 * int $::WIDTH / 32,
1516 1 + 32 * int $::HEIGHT / 32,
1517 )
745} 1518}
746 1519
747sub size_allocate { 1520sub update {
748} 1521 my ($self) = @_;
749 1522
1523 $self->{need_update} = 1;
1524 $self->SUPER::update;
1525}
1526
750sub _draw { 1527sub draw {
751 my ($self) = @_; 1528 my ($self) = @_;
752 1529
753 my $mx = $::CONN->{mapx}; 1530 $self->{need_update}++;#d#
754 my $my = $::CONN->{mapy}; 1531 if (delete $self->{need_update}) {
1532 glNewList $self->{list}, GL_COMPILE;
755 1533
756 my $map = $::CONN->{map};
757
758 my ($xofs, $yofs);
759
760 my $sw = 1 + int $::WIDTH / 32; 1534 my $sw = int $::WIDTH / 32;
761 my $sh = 1 + int $::HEIGHT / 32; 1535 my $sh = int $::HEIGHT / 32;
762 1536
763 if ($::CONN->{mapw} > $sw) { 1537 if ($::MAP) {
764 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1538 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
765 } else {
766 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
767 }
768 1539
769 if ($::CONN->{maph} > $sh) { 1540 if ($::CFG->{fow_enable}) {
770 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1541 if ($::CFG->{fow_smooth}) { # smooth fog of war
771 } else { 1542 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
772 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1543 glConvolutionFilter2D
773 } 1544 GL_CONVOLUTION_2D,
774 1545 GL_ALPHA,
775 glEnable GL_TEXTURE_2D; 1546 3, 3,
776 glEnable GL_BLEND; 1547 GL_ALPHA, GL_FLOAT,
777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1548 pack "f*",
778 1549 0.1, 0.1, 0.1,
779 my $sw4 = ($sw + 3) & ~3; 1550 0.1, 0.2, 0.1,
780 my $lighting = "\x00" x ($sw4 * $sh); 1551 0.1, 0.1, 0.1,
781 1552 ;
782 for my $x (0 .. $sw - 1) { 1553 glEnable GL_CONVOLUTION_2D;
783 for my $y (0 .. $sh - 1) {
784
785 my $cell = $map->[$x + $xofs][$y + $yofs]
786 or next;
787
788 my $darkness = $cell->[0] * (1 / 255);
789 if ($darkness < 0) {
790 $darkness = 0.15;
791 } 1554 }
792 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
793 1555
794 for my $num (grep $_, @$cell[1,2,3]) { 1556 my $tex = new CFClient::Texture
795 my $tex = $::CONN->{face}[$num]{texture} || next; 1557 w => $w,
1558 h => $h,
1559 data => $data,
1560 internalformat => GL_ALPHA,
1561 format => GL_ALPHA;
796 1562
797 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1563 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
798 1564
799 my $w = $tex->{width}; 1565 glEnable GL_BLEND;
800 my $h = $tex->{height}; 1566 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
801 1568
802 my $px = ($x + 1) * 32 - $w; 1569 glColor +($::CFG->{fow_intensity}) x 3, 1;
803 my $py = ($y + 1) * 32 - $h; 1570 $tex->draw_quad (0, 0, $w * 32, $h * 32);
804 1571
805 glBegin GL_QUADS; 1572 glDisable GL_TEXTURE_2D;
806 glTexCoord 0, 0; glVertex $px , $py; 1573 glDisable GL_BLEND;
807 glTexCoord 0, 1; glVertex $px , $py + $h;
808 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
809 glTexCoord 1, 0; glVertex $px + $w, $py;
810 glEnd;
811 } 1574 }
812 } 1575 }
813 }
814 1576
815# if (1) { # higher quality darkness 1577 glEndList;
816# $lighting =~ s/(.)/$1$1$1/gs;
817# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
818#
819# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
820#
821# $lighting = $pb->get_pixels;
822# $lighting =~ s/(.)../$1/gs;
823# } 1578 }
824 1579
825 $lighting = new Crossfire::Client::Texture 1580 glCallList $self->{list};
826 width => $sw4,
827 height => $sh,
828 data => $lighting,
829 internalformat => GL_ALPHA4,
830 format => GL_ALPHA;
831 1581
832 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1582 if ($FOCUS != $self) {
833 glColor 0, 0, 0, 0.75; 1583 glColor 64/255, 64/255, 64/255;
834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1584 glLogicOp GL_AND;
835 glBindTexture GL_TEXTURE_2D, $lighting->{name}; 1585 glEnable GL_COLOR_LOGIC_OP;
836 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
837 glBegin GL_QUADS; 1586 glBegin GL_QUADS;
838 glTexCoord 0, 0; glVertex 0 , 0; 1587 glVertex 0, 0;
839 glTexCoord 0, 1; glVertex 0 , $sh * 32; 1588 glVertex 0, $::HEIGHT;
840 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32; 1589 glVertex $::WIDTH, $::HEIGHT;
841 glTexCoord 1, 0; glVertex $sw4 * 32, 0; 1590 glVertex $::WIDTH, 0;
842 glEnd; 1591 glEnd;
843 1592 glDisable GL_COLOR_LOGIC_OP;
844 glDisable GL_TEXTURE_2D; 1593 }
845 glDisable GL_BLEND;
846} 1594}
847 1595
848my %DIR = ( 1596my %DIR = (
849 SDLK_KP8, [1, "north"], 1597 SDLK_KP8, [1, "north"],
850 SDLK_KP9, [2, "northeast"], 1598 SDLK_KP9, [2, "northeast"],
… …
866 1614
867 my $mod = $ev->key_mod; 1615 my $mod = $ev->key_mod;
868 my $sym = $ev->key_sym; 1616 my $sym = $ev->key_sym;
869 1617
870 if ($sym == SDLK_KP5) { 1618 if ($sym == SDLK_KP5) {
871 $::CONN->send ("command stay fire"); 1619 $::CONN->user_send ("command stay fire");
1620 } elsif ($sym == SDLK_a) {
1621 $::CONN->user_send ("command apply");
872 } elsif (exists $DIR{$sym}) { 1622 } elsif (exists $DIR{$sym}) {
873 if ($mod & KMOD_SHIFT) { 1623 if ($mod & KMOD_SHIFT) {
874 $self->{shft}++; 1624 $self->{shft}++;
875 $::CONN->send ("command fire $DIR{$sym}[0]"); 1625 $::CONN->user_send ("command fire $DIR{$sym}[0]");
876 } elsif ($mod & KMOD_CTRL) { 1626 } elsif ($mod & KMOD_CTRL) {
877 $self->{ctrl}++; 1627 $self->{ctrl}++;
878 $::CONN->send ("command run $DIR{$sym}[0]"); 1628 $::CONN->user_send ("command run $DIR{$sym}[0]");
879 } else { 1629 } else {
880 $::CONN->send ("command $DIR{$sym}[1]"); 1630 $::CONN->user_send ("command $DIR{$sym}[1]");
881 } 1631 }
882 } 1632 }
883} 1633}
884 1634
885sub key_up { 1635sub key_up {
… …
887 1637
888 my $mod = $ev->key_mod; 1638 my $mod = $ev->key_mod;
889 my $sym = $ev->key_sym; 1639 my $sym = $ev->key_sym;
890 1640
891 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1641 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
892 $::CONN->send ("command fire_stop"); 1642 $::CONN->user_send ("command fire_stop");
893 } 1643 }
894 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1644 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
895 $::CONN->send ("command run_stop"); 1645 $::CONN->user_send ("command run_stop");
896 } 1646 }
897} 1647}
898 1648
899############################################################################# 1649#############################################################################
900 1650
901package Crossfire::Client::Widget::Animator; 1651package CFClient::UI::Animator;
902 1652
903use SDL::OpenGL; 1653use SDL::OpenGL;
904 1654
905our @ISA = Crossfire::Client::Widget::Bin::; 1655our @ISA = CFClient::UI::Bin::;
906 1656
907sub moveto { 1657sub moveto {
908 my ($self, $x, $y) = @_; 1658 my ($self, $x, $y) = @_;
909 1659
910 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1660 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
911 $self->{speed} = 0.2; 1661 $self->{speed} = 0.001;
912 $self->{time} = 1; 1662 $self->{time} = 1;
913 1663
914 ::animation_start $self; 1664 ::animation_start $self;
915} 1665}
916 1666
… …
931 1681
932sub _draw { 1682sub _draw {
933 my ($self) = @_; 1683 my ($self) = @_;
934 1684
935 glPushMatrix; 1685 glPushMatrix;
936 glRotate $self->{time} * 10000, 0, 1, 0; 1686 glRotate $self->{time} * 1000, 0, 1, 0;
937 $self->{children}[0]->draw; 1687 $self->{children}[0]->draw;
938 glPopMatrix; 1688 glPopMatrix;
939} 1689}
940 1690
9411; 1691#############################################################################
942 1692
1693package CFClient::UI::Flopper;
1694
1695our @ISA = CFClient::UI::Button::;
1696
1697sub new {
1698 my $class = shift;
1699
1700 my $self = $class->SUPER::new (
1701 state => 0,
1702 connect_activate => \&toggle_flopper,
1703 @_
1704 );
1705
1706 if ($self->{state}) {
1707 $self->{state} = 0;
1708 $self->toggle_flopper;
1709 }
1710
1711 $self
1712}
1713
1714sub toggle_flopper {
1715 my ($self) = @_;
1716
1717 # TODO: use animation
1718 if ($self->{state} = !$self->{state}) {
1719 $CFClient::UI::TOPLEVEL->add ($self->{other});
1720 $self->{other}->move (
1721 ($::WIDTH - $self->{other}{w}) * 0.5,
1722 ($::HEIGHT - $self->{other}{h}) * 0.5,
1723 );
1724 } else {
1725 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1726 }
1727}
1728
1729#############################################################################
1730
1731package CFClient::UI::Toplevel;
1732
1733our @ISA = CFClient::UI::Container::;
1734
1735sub size_request {
1736 ($::WIDTH, $::HEIGHT)
1737}
1738
1739sub size_allocate {
1740 my ($self, $x, $y, $w, $h) = @_;
1741
1742 $self->_size_allocate ($x, $y, $w, $h);
1743
1744 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1745 for @{$self->{children}};
1746}
1747
1748sub translate {
1749 my ($self, $x, $y) = @_;
1750
1751 ($x, $y)
1752}
1753
1754sub update {
1755 my ($self) = @_;
1756
1757 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1758 ::refresh ();
1759}
1760
1761sub add {
1762 my ($self, $widget) = @_;
1763
1764 $self->SUPER::add ($widget);
1765
1766 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1767}
1768
1769sub draw {
1770 my ($self) = @_;
1771
1772 $self->_draw;
1773}
1774
1775#############################################################################
1776
1777package CFClient::UI;
1778
1779$TOPLEVEL = new CFClient::UI::Toplevel;
1780
17811
1782

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines