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.89 by root, Wed Apr 12 21:20:42 2006 UTC vs.
Revision 1.167 by elmex, Mon Apr 24 08:44:23 2006 UTC

7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
14 41
15# class methods for events 42# class methods for events
16sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
18} 46}
19 47
20sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
22} 51}
23 52
24sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
25 my ($ev) = @_; 54 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
27 56
28 if (!$BUTTON_STATE) { 57 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 58 my $widget = $ROOT->find_widget ($x, $y);
30 59
31 $GRAB = $widget; 60 $GRAB = $widget;
32 $GRAB->update if $GRAB; 61 $GRAB->update if $GRAB;
33 }
34 62
63 check_tooltip;
64 }
65
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 67
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
38} 72}
39 73
40sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
41 my ($ev) = @_; 75 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
43 77
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 79
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 81
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
49 86
50 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 89 $grab->update if $grab;
53 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
54 } 93 }
55} 94}
56 95
57sub feed_sdl_motion_event { 96sub feed_sdl_motion_event {
58 my ($ev) = @_; 97 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
60 99
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 100 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 101
63 if ($widget != $HOVER) { 102 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 103 my $hover = $HOVER; $HOVER = $widget;
65 104
66 $hover->update if $hover; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 107
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 108 check_tooltip;
109 }
110
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
115}
116
117# convert position array to integers
118sub harmonize {
119 my ($vals) = @_;
120
121 my $rem = 0;
122
123 for (@$vals) {
124 my $i = int $_ + $rem;
125 $rem += $_ - $i;
126 $_ = $i;
127 }
71} 128}
72 129
73############################################################################# 130#############################################################################
74 131
75package CFClient::UI::Base; 132package CFClient::UI::Base;
76 133
77use strict; 134use strict;
78 135
79use SDL::OpenGL; 136use CFClient::OpenGL;
80 137
81sub new { 138sub new {
82 my $class = shift; 139 my $class = shift;
83 140
84 my $self = bless { 141 my $self = bless {
85 x => 0, 142 x => 0,
86 y => 0, 143 y => 0,
87 z => 0, 144 z => 0,
88 w => -1, 145 can_events => 1,
89 h => -1,
90 @_ 146 @_
91 }, $class; 147 }, $class;
92 148
93 for (keys %$self) { 149 for (keys %$self) {
94 if (/^connect_(.*)$/) { 150 if (/^connect_(.*)$/) {
97 } 153 }
98 154
99 $self 155 $self
100} 156}
101 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
165sub show {
166 my ($self) = @_;
167
168 return if $self->{parent};
169
170 $CFClient::UI::ROOT->add ($self);
171}
172
173sub hide {
174 my ($self) = @_;
175
176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
178
179 $self->{parent}->remove ($self)
180 if $self->{parent};
181}
182
102sub move { 183sub move {
103 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
185
104 $self->{x} = $x; 186 $self->{x} = int $x;
105 $self->{y} = $y; 187 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
107}
108 189
109sub needs_redraw { 190 $self->update;
110 0 191}
192
193sub set_size {
194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
111} 200}
112 201
113sub size_request { 202sub size_request {
114 require Carp; 203 require Carp;
115 Carp::confess "size_request is abtract"; 204 Carp::confess "size_request is abstract";
116} 205}
117 206
118sub _size_allocate { 207sub configure {
119 my ($self, $x, $y, $w, $h) = @_; 208 my ($self, $x, $y, $w, $h) = @_;
120 209
210 if ($self->{aspect}) {
211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
213
214 # use alignment to adjust x, y
215
216 $x += int +($w - $w2) * 0.5;
217 $y += int +($h - $h2) * 0.5;
218
219 ($w, $h) = ($w2, $h2);
220 }
221
222 if ($self->{x} != $x || $self->{y} != $y) {
121 $self->{x} = $x; 223 $self->{x} = $x;
122 $self->{y} = $y; 224 $self->{y} = $y;
225 $self->update;
226 }
123 227
124 return unless $self->{w} != $w || $self->{h} != $h; 228 if ($self->{w} != $w || $self->{h} != $h) {
125
126 $self->{w} = $w; 229 $self->{w} = $w;
127 $self->{h} = $h; 230 $self->{h} = $h;
128 231
232 $self->size_allocate ($w, $h);
233 $self->update;
129 1 234 }
130} 235}
131 236
132sub size_allocate { 237sub size_allocate {
238 # nothing to be done
239}
240
241sub set_max_size {
133 my ($self, $x, $y, $w, $h) = @_; 242 my ($self, $w, $h) = @_;
134 243
135 $self->_size_allocate ($x, $y, $w, $h); 244 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h;
246}
247
248# return top left coordinates
249sub _topleft {
250 my ($self, $x, $y) = @_;
251
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136} 253}
137 254
138# translate global coordinates to local coordinate system 255# translate global coordinates to local coordinate system
139sub translate { 256sub coord2local {
140 my ($self, $x, $y) = @_; 257 my ($self, $x, $y) = @_;
141 258
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 259 my ($X, $Y) = $self->_topleft;
260 ($x - $X, $y - $Y)
261}
262
263# translate local coordinates to global coordinate system
264sub coord2global {
265 my ($self, $x, $y) = @_;
266
267 my ($X, $Y) = $self->_topleft;
268 ($x + $X, $y + $Y)
143} 269}
144 270
145sub focus_in { 271sub focus_in {
146 my ($self) = @_; 272 my ($self) = @_;
147 273
148 return if $FOCUS == $self; 274 return if $FOCUS == $self;
275 return unless $self->{can_focus};
149 276
150 my $focus = $FOCUS; $FOCUS = $self; 277 my $focus = $FOCUS; $FOCUS = $self;
278
279 $self->emit (focus_in => $focus);
280
151 $focus->update if $focus; 281 $focus->update if $focus;
152 $FOCUS->update; 282 $FOCUS->update;
153} 283}
154 284
155sub focus_out { 285sub focus_out {
156 my ($self) = @_; 286 my ($self) = @_;
157 287
158 return unless $FOCUS == $self; 288 return unless $FOCUS == $self;
159 289
160 my $focus = $FOCUS; undef $FOCUS; 290 my $focus = $FOCUS; undef $FOCUS;
291
292 $self->emit (focus_out => $focus);
293
161 $focus->update if $focus; #? 294 $focus->update if $focus; #?
162} 295}
163 296
164sub mouse_motion { } 297sub mouse_motion { }
165sub button_up { } 298sub button_up { }
186 glPushMatrix; 319 glPushMatrix;
187 glTranslate $self->{x}, $self->{y}, 0; 320 glTranslate $self->{x}, $self->{y}, 0;
188 $self->_draw; 321 $self->_draw;
189 glPopMatrix; 322 glPopMatrix;
190 323
191 if ($self == $HOVER) { 324 if ($self == $HOVER && $self->{can_hover}) {
192 my ($x, $y) = @$self{qw(x y)}; 325 my ($x, $y) = @$self{qw(x y)};
193 326
194 glColor 0, 0, 1, 0.2; 327 glColor 1, 0.8, 0.5, 0.2;
195 glEnable GL_BLEND; 328 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
197 glBegin GL_QUADS; 330 glBegin GL_QUADS;
198 glVertex $x , $y; 331 glVertex $x , $y;
199 glVertex $x + $self->{w}, $y; 332 glVertex $x + $self->{w}, $y;
200 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
201 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
202 glEnd; 335 glEnd;
203 glDisable GL_BLEND; 336 glDisable GL_BLEND;
204 } 337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0;
345 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h};
348 glEnd;
349 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 }
205} 352}
206 353
207sub _draw { 354sub _draw {
208 my ($self) = @_; 355 my ($self) = @_;
209 356
210 warn "no draw defined for $self\n"; 357 warn "no draw defined for $self\n";
211} 358}
212 359
213sub find_widget { 360sub find_widget {
214 my ($self, $x, $y) = @_; 361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
215 364
216 return $self 365 return $self
217 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
218 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
219 368
220 () 369 ()
221} 370}
222 371
223sub set_parent { 372sub set_parent {
224 my ($self, $par) = @_; 373 my ($self, $parent) = @_;
225 374
226 $self->{parent} = $par;
227 Scalar::Util::weaken $self->{parent}; 375 Scalar::Util::weaken ($self->{parent} = $parent);
228} 376}
229 377
230sub get_parent { 378sub check_size {
379 my ($self) = @_;
380
231 $_[0]->{parent} 381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
232} 402}
233 403
234sub update { 404sub update {
235 my ($self) = @_; 405 my ($self) = @_;
236 406
239} 409}
240 410
241sub connect { 411sub connect {
242 my ($self, $signal, $cb) = @_; 412 my ($self, $signal, $cb) = @_;
243 413
244 push @{ $self->{cb}{$signal} }, $cb; 414 push @{ $self->{signal_cb}{$signal} }, $cb;
245} 415}
246 416
247sub emit { 417sub emit {
248 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
249 419
250 $_->($self, @args) 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
251 for @{$self->{cb}{$signal} || []};
252} 421}
253 422
254sub DESTROY { 423sub DESTROY {
255 my ($self) = @_; 424 my ($self) = @_;
256 425
262package CFClient::UI::DrawBG; 431package CFClient::UI::DrawBG;
263 432
264our @ISA = CFClient::UI::Base::; 433our @ISA = CFClient::UI::Base::;
265 434
266use strict; 435use strict;
267use SDL::OpenGL; 436use CFClient::OpenGL;
268 437
269sub new { 438sub new {
270 my $class = shift; 439 my $class = shift;
271 440
272 # range [value, low, high, page] 441 # range [value, low, high, page]
301 470
302package CFClient::UI::Empty; 471package CFClient::UI::Empty;
303 472
304our @ISA = CFClient::UI::Base::; 473our @ISA = CFClient::UI::Base::;
305 474
475sub new {
476 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg);
478}
479
306sub size_request { 480sub size_request {
307 (0, 0) 481 (0, 0)
308} 482}
309 483
310sub draw { } 484sub draw { }
318sub new { 492sub new {
319 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
320 494
321 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
322 496
323 my $self = $class->SUPER::new (children => [], %arg); 497 my $self = $class->SUPER::new (
498 children => [],
499 can_events => 0,
500 %arg,
501 );
324 $self->add ($_) for @$children; 502 $self->add ($_) for @$children;
325 503
326 $self 504 $self
327} 505}
328 506
329sub add { 507sub add {
330 my ($self, $chld) = @_; 508 my ($self, $child) = @_;
331 509
332 $chld->set_parent ($self); 510 $child->set_parent ($self);
511
512 use sort 'stable';
333 513
334 $self->{children} = [ 514 $self->{children} = [
335 sort { $a->{z} <=> $b->{z} } 515 sort { $a->{z} <=> $b->{z} }
336 @{$self->{children}}, $chld 516 @{$self->{children}}, $child
337 ]; 517 ];
338 518
339 $self->{w} = $self->{h} = -1; 519 $child->check_size;
520}
521
522sub remove {
523 my ($self, $child) = @_;
524
525 delete $child->{parent};
526 $child->hide;
527
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529
530 $self->check_size;
340 $self->update; 531 $self->update;
341} 532}
342 533
343sub remove { 534sub clear {
344 my ($self, $widget) = @_; 535 my ($self) = @_;
345 536
346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 537 my $children = delete $self->{children};
538 $self->{children} = [];
347 539
348 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
349} 544}
350 545
351sub find_widget { 546sub find_widget {
352 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
353 548
383 578
384 $class->SUPER::new (children => [$child], %arg) 579 $class->SUPER::new (children => [$child], %arg)
385} 580}
386 581
387sub add { 582sub add {
388 my ($self, $widget) = @_; 583 my ($self, $child) = @_;
389 584
390 $self->{children} = []; 585 $self->{children} = [];
391 586
392 $self->SUPER::add ($widget); 587 $self->SUPER::add ($child);
393} 588}
394 589
395sub remove { 590sub remove {
396 my ($self, $widget) = @_; 591 my ($self, $widget) = @_;
397 592
406sub size_request { 601sub size_request {
407 $_[0]{children}[0]->size_request 602 $_[0]{children}[0]->size_request
408} 603}
409 604
410sub size_allocate { 605sub size_allocate {
411 my ($self, $x, $y, $w, $h) = @_; 606 my ($self, $w, $h) = @_;
412 607
413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
415 $self->{children}[0]->size_allocate (0, 0, $w, $h); 608 $self->{children}[0]->configure (0, 0, $w, $h);
416} 609}
417 610
418############################################################################# 611#############################################################################
419 612
420package CFClient::UI::Window; 613package CFClient::UI::Window;
421 614
422our @ISA = CFClient::UI::Bin::; 615our @ISA = CFClient::UI::Bin::;
423 616
424use SDL::OpenGL; 617use CFClient::OpenGL;
425 618
426sub new { 619sub new {
427 my ($class, %arg) = @_; 620 my ($class, %arg) = @_;
428 621
429 my $self = $class->SUPER::new (%arg); 622 my $self = $class->SUPER::new (%arg);
438} 631}
439 632
440sub render_chld { 633sub render_chld {
441 my ($self) = @_; 634 my ($self) = @_;
442 635
443 $self->{texture} = 636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444 CFClient::Texture->new_from_opengl ( 637 glClearColor 0, 0, 0, 1;
445 $self->{w}, $self->{h}, sub { $self->child->draw } 638 glClear GL_COLOR_BUFFER_BIT;
446 ); 639 $self->child->draw;
640 };
447} 641}
448 642
449sub size_allocate { 643sub size_allocate {
450 my ($self, $x, $y, $w, $h) = @_; 644 my ($self, $w, $h) = @_;
451 645
452 $self->_size_allocate ($x, $y, $w, $h) or return;
453
454 $self->child->size_allocate (0, 0, $w, $h); 646 $self->child->configure (0, 0, $w, $h);
455 647
456 $self->render_chld; 648 $self->render_chld;
457} 649}
458 650
459sub _draw { 651sub _draw {
475 glDisable GL_TEXTURE_2D; 667 glDisable GL_TEXTURE_2D;
476} 668}
477 669
478############################################################################# 670#############################################################################
479 671
672package CFClient::UI::ViewPort;
673
674our @ISA = CFClient::UI::Window::;
675
676sub new { die }
677
678sub size_request {
679 my ($self) = @_;
680
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683
684 @$self{qw(child_w child_h)}
685}
686
687sub _draw {
688 my ($self) = @_;
689
690 $self->{children}[1]->draw;
691}
692
693
694#############################################################################
695
480package CFClient::UI::Frame; 696package CFClient::UI::Frame;
481 697
482our @ISA = CFClient::UI::Bin::; 698our @ISA = CFClient::UI::Bin::;
483 699
484use SDL::OpenGL; 700use CFClient::OpenGL;
485 701
486sub size_request { 702sub new {
487 my ($self) = @_; 703 my $class = shift;
488 my $chld = $self->child
489 or return (0, 0);
490 704
491 $chld->move (2, 2); 705 my $self = $class->SUPER::new (
492 706 bg => [1, 1, 1, 1],
493 map { $_ + 4 } $chld->size_request; 707 border_bg => [1, 1, 1, 1],
494} 708 border => 0.8,
495 709 @_
496sub size_allocate {
497 my ($self, $x, $y, $w, $h) = @_;
498 710 );
499 $self->_size_allocate ($x, $y, $w, $h) or return;
500 711
501 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 712 $self
502} 713}
503 714
504sub _draw { 715sub _draw {
505 my ($self) = @_; 716 my ($self) = @_;
506 717
507 my $chld = $self->child;
508
509 my ($w, $h) = $chld->size_request;
510
511 glBegin GL_QUADS;
512 glColor 0, 0, 0;
513 glVertex 0 , 0;
514 glVertex 0 , $h + 4;
515 glVertex $w + 4 , $h + 4;
516 glVertex $w + 4 , 0;
517 glEnd;
518
519 $chld->draw;
520}
521
522#############################################################################
523
524package CFClient::UI::FancyFrame;
525
526our @ISA = CFClient::UI::Bin::;
527
528use SDL::OpenGL;
529
530my @tex =
531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533
534sub size_request {
535 my ($self) = @_;
536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
539 my ($w, $h) = $self->SUPER::size_request;
540
541 $h += $tex[1]->{h};
542 $h += $tex[4]->{h};
543 $w += $tex[2]->{w};
544 $w += $tex[3]->{w};
545
546 ($w, $h)
547}
548
549sub size_allocate {
550 my ($self, $x, $y, $w, $h) = @_;
551
552 $self->_size_allocate ($x, $y, $w, $h) or return;
553
554 $h -= $tex[1]{h};
555 $h -= $tex[4]{h};
556 $w -= $tex[2]{w};
557 $w -= $tex[3]{w};
558
559 $h = $h < 0 ? 0 : $h;
560 $w = $w < 0 ? 0 : $w;
561
562 my $child = $self->child;
563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
613}
614
615sub _draw {
616 my ($self) = @_;
617
618 my ($w, $h) = ($self->{w}, $self->{h}); 718 my ($w, $h) = ($self->{w}, $self->{h});
619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620 719
621 glEnable GL_BLEND; 720 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623 glEnable GL_TEXTURE_2D; 722 glEnable GL_TEXTURE_2D;
624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
625 724
626 my $top = $tex[1]; 725# glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0;
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732
733
734 $self->child->draw;
735 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D;
737}
738
739#############################################################################
740
741package CFClient::UI::FancyFrame;
742
743our @ISA = CFClient::UI::Bin::;
744
745use CFClient::OpenGL;
746
747my @tex =
748 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750
751sub new {
752 my $class = shift;
753
754 # TODO: user_x, user_y, overwrite moveto?
755
756 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1],
759 border => 0.8,
760 can_events => 1,
761 @_
762 );
763
764 $self->{title} &&= new CFClient::UI::Label
765 align => 0,
766 valign => 1,
767 text => $self->{title},
768 fontsize => 1;
769
770 $self
771}
772
773sub border {
774 int $_[0]{border} * $::FONTSIZE
775}
776
777sub size_request {
778 my ($self) = @_;
779
780 my ($w, $h) = $self->SUPER::size_request;
781
782 (
783 $w + $self->border * 2,
784 $h + $self->border * 2,
785 )
786}
787
788sub size_allocate {
789 my ($self, $w, $h) = @_;
790
791 $h -= List::Util::max 0, $self->border * 2;
792 $w -= List::Util::max 0, $self->border * 2;
793
794 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
795 if $self->{title};
796
797 $self->child->configure ($self->border, $self->border, $w, $h);
798}
799
800sub button_down {
801 my ($self, $ev, $x, $y) = @_;
802
803 my $border = $self->border;
804
805 if ($x < $self->{w} && $x >= $self->{w} - $border
806 && $y < $self->{h} && $y >= $self->{h} - $border) {
807
808 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h});
810
811 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_;
813
814 ($x, $y) = ($ev->{x}, $ev->{y});
815
816 $self->{user_w} = $bw + $x - $ox;
817 $self->{user_h} = $bh + $y - $oy;
818 $self->check_size;
819 };
820
821 } elsif ($x >= 0 && $x < $self->{w}
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y});
826
827 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_;
829
830 ($x, $y) = ($ev->{x}, $ev->{y});
831
832 $self->move ($bx + $x - $ox, $by + $y - $oy);
833 $self->update;
834 };
835 }
836}
837
838sub button_up {
839 my ($self, $ev, $x, $y) = @_;
840
841 delete $self->{motion};
842}
843
844sub mouse_motion {
845 my ($self, $ev, $x, $y) = @_;
846
847 $self->{motion}->($ev, $x, $y) if $self->{motion};
848}
849
850sub _draw {
851 my ($self) = @_;
852
853 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860
861 my $border = $self->border;
862
863 glColor @{ $self->{border_bg} };
627 $top->draw_quad (0, 0, $w, $top->{h}); 864 $tex[1]->draw_quad (0, 0, $w, $border);
628 865 $tex[3]->draw_quad (0, $border, $border, $ch);
629 my $left = $tex[3]; 866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 867 $tex[4]->draw_quad (0, $h - $border, $w, $border);
631
632 my $right = $tex[2];
633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635 my $bottom = $tex[4];
636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637 868
638 my $bg = $tex[0]; 869 my $bg = $tex[0];
639 870
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 871 # TODO: repeat texture not scale
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643 my $rep_x = $cw / $bg->{w}; 872 my $rep_x = $cw / $bg->{w};
644 my $rep_y = $ch / $bg->{h}; 873 my $rep_y = $ch / $bg->{h};
645 874
646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 875 glColor @{ $self->{bg} };
876
877 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch);
647 881
648 glDisable GL_TEXTURE_2D; 882 glDisable GL_TEXTURE_2D;
649 glDisable GL_BLEND; 883 glDisable GL_BLEND;
650 884
885 $self->{title}->draw if $self->{title};
651 $self->child->draw; 886 $self->child->draw;
652
653} 887}
654 888
655############################################################################# 889#############################################################################
656 890
657package CFClient::UI::Table; 891package CFClient::UI::Table;
658 892
659our @ISA = CFClient::UI::Base::; 893our @ISA = CFClient::UI::Base::;
660 894
661use List::Util qw(max sum); 895use List::Util qw(max sum);
662 896
663use SDL::OpenGL; 897use CFClient::OpenGL;
664 898
665sub new { 899sub new {
666 my $class = shift; 900 my $class = shift;
667 901
668 $class->SUPER::new ( 902 $class->SUPER::new (
670 @_ 904 @_
671 ) 905 )
672} 906}
673 907
674sub add { 908sub add {
675 my ($self, $x, $y, $chld) = @_; 909 my ($self, $x, $y, $child) = @_;
676 910
911 $child->set_parent ($self);
677 $self->{children}[$y][$x] = $chld; 912 $self->{children}[$y][$x] = $child;
678 $chld->set_parent ($self);
679 913
680 $self->{w} = $self->{h} = -1; 914 $child->check_size;
915}
916
917# TODO: move to container class maybe? send childs a signal on removal?
918sub clear {
919 my ($self) = @_;
920
921 my $children = delete $self->{children};
922
923 for (grep $_, map @$_, grep $_, @$children) {
924 delete $_->{parent};
925 $_->hide;
926 }
927
681 $self->update; 928 $self->update;
682} 929}
683 930
684sub get_wh { 931sub get_wh {
685 my ($self) = @_; 932 my ($self) = @_;
691 or next; 938 or next;
692 939
693 for my $x (0 .. $#$row) { 940 for my $x (0 .. $#$row) {
694 my $widget = $row->[$x] 941 my $widget = $row->[$x]
695 or next; 942 or next;
696 my ($w, $h) = $widget->size_request; 943 my ($w, $h) = @$widget{qw(req_w req_h)};
697 944
698 $w[$x] = max $w[$x], $w; 945 $w[$x] = max $w[$x], $w;
699 $h[$y] = max $h[$y], $h; 946 $h[$y] = max $h[$y], $h;
700 } 947 }
701 } 948 }
713 (sum @$hs), 960 (sum @$hs),
714 ) 961 )
715} 962}
716 963
717sub size_allocate { 964sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_; 965 my ($self, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721 966
722 my ($ws, $hs) = $self->get_wh; 967 my ($ws, $hs) = $self->get_wh;
723 968
724 my $req_w = sum @$ws; 969 my $req_w = sum @$ws;
725 my $req_h = sum @$hs; 970 my $req_h = sum @$hs;
730 my $col_expand = (sum @col_expand) || 1; 975 my $col_expand = (sum @col_expand) || 1;
731 976
732 # linearly scale sizes 977 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 978 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 979 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
980
981 CFClient::UI::harmonize $ws;
982 CFClient::UI::harmonize $hs;
735 983
736 my $y; 984 my $y;
737 985
738 for my $r (0 .. $#{$self->{children}}) { 986 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r] 987 my $row = $self->{children}[$r]
744 992
745 for my $c (0 .. $#$row) { 993 for my $c (0 .. $#$row) {
746 my $col_w = $ws->[$c]; 994 my $col_w = $ws->[$c];
747 995
748 if (my $widget = $row->[$c]) { 996 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h); 997 $widget->configure ($x, $y, $col_w, $row_h);
750 } 998 }
751 999
752 $x += $col_w; 1000 $x += $col_w;
753 } 1001 }
754 1002
799 (List::Util::max map $_->[1], @alloc), 1047 (List::Util::max map $_->[1], @alloc),
800 ) 1048 )
801} 1049}
802 1050
803sub size_allocate { 1051sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h);
807 1053
808 ($h, $w) = ($w, $h); 1054 ($h, $w) = ($w, $h);
809 1055
810 my $children = $self->{children}; 1056 my $children = $self->{children};
811 1057
812 my @h = map +($_->size_request)[0], @$children; 1058 my @h = map $_->{req_w}, @$children;
813 1059
814 my $req_h = List::Util::sum @h; 1060 my $req_h = List::Util::sum @h;
815 1061
816 if ($req_h > $h) { 1062 if ($req_h > $h) {
817 # ah well, not enough space 1063 # ah well, not enough space
827 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1073 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828 $h[$_] = $alloc_h; 1074 $h[$_] = $alloc_h;
829 } 1075 }
830 } 1076 }
831 1077
1078 CFClient::UI::harmonize \@h;
1079
832 my $y = 0; 1080 my $y = 0;
833 for (0 .. $#$children) { 1081 for (0 .. $#$children) {
834 my $child = $children->[$_]; 1082 my $child = $children->[$_];
835 my $h = $h[$_]; 1083 my $h = $h[$_];
836 $child->size_allocate ($y, 0, $h, $w); 1084 $child->configure ($y, 0, $h, $w);
837 1085
838 $y += $h; 1086 $y += $h;
839 } 1087 }
1088
1089 1
840} 1090}
841 1091
842############################################################################# 1092#############################################################################
843 1093
844package CFClient::UI::VBox; 1094package CFClient::UI::VBox;
857 (List::Util::sum map $_->[1], @alloc), 1107 (List::Util::sum map $_->[1], @alloc),
858 ) 1108 )
859} 1109}
860 1110
861sub size_allocate { 1111sub size_allocate {
862 my ($self, $x, $y, $w, $h) = @_; 1112 my ($self, $w, $h) = @_;
863
864 $self->_size_allocate ($x, $y, $w, $h);
865 1113
866 my $children = $self->{children}; 1114 my $children = $self->{children};
867 1115
868 my @h = map +($_->size_request)[1], @$children; 1116 my @h = map $_->{req_h}, @$children;
869 1117
870 my $req_h = List::Util::sum @h; 1118 my $req_h = List::Util::sum @h;
871 1119
872 if ($req_h > $h) { 1120 if ($req_h > $h) {
873 # ah well, not enough space 1121 # ah well, not enough space
881 1129
882 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1130 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
883 } 1131 }
884 } 1132 }
885 1133
1134 CFClient::UI::harmonize \@h;
1135
886 my $y = 0; 1136 my $y = 0;
887 for (0 .. $#$children) { 1137 for (0 .. $#$children) {
888 my $child = $children->[$_]; 1138 my $child = $children->[$_];
889 my $h = $h[$_]; 1139 my $h = $h[$_];
890 $child->size_allocate (0, $y, $w, $h); 1140 $child->configure (0, $y, $w, $h);
891 1141
892 $y += $h; 1142 $y += $h;
893 } 1143 }
1144
1145 1
894} 1146}
895 1147
896############################################################################# 1148#############################################################################
897 1149
898package CFClient::UI::Label; 1150package CFClient::UI::Label;
899 1151
900our @ISA = CFClient::UI::Base::; 1152our @ISA = CFClient::UI::Base::;
901 1153
902use SDL::OpenGL; 1154use CFClient::OpenGL;
903 1155
904sub new { 1156sub new {
905 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
906 1158
907 my $self = $class->SUPER::new ( 1159 my $self = $class->SUPER::new (
908 fg => [1, 1, 1], 1160 fg => [1, 1, 1],
909 height => $::FONTSIZE, 1161 #font => default_font
1162 fontsize => 1,
910 text => "", 1163 text => "",
911 align => -1, 1164 align => -1,
1165 valign => -1,
912 padding => 2, 1166 padding => 2,
913 layout => new CFClient::Layout, 1167 layout => new CFClient::Layout,
1168 can_events => 0,
914 %arg 1169 %arg
915 ); 1170 );
916 1171
917 $self->set_text ($self->{text}); 1172 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout;
1176 }
1177
1178 $self->set_text (delete $self->{text}) if exists $self->{text};
1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
918 1180
919 $self 1181 $self
920} 1182}
921 1183
922sub escape_text { 1184sub escape {
923 local $_ = $_[1]; 1185 local $_ = $_[1];
924 1186
925 s/&/&amp;/g; 1187 s/&/&amp;/g;
926 s/>/&gt;/g; 1188 s/>/&gt;/g;
927 s/</&lt;/g; 1189 s/</&lt;/g;
930} 1192}
931 1193
932sub set_text { 1194sub set_text {
933 my ($self, $text) = @_; 1195 my ($self, $text) = @_;
934 1196
935 $self->{text} = $text;
936 $self->{layout}->set_markup ($text); 1197 $self->{layout}->set_text ($text);
937 1198
938 delete $self->{texture}; 1199 delete $self->{texture};
939# $self->{w} = $self->{h} = -1; 1200 $self->check_size;
940 $self->update; 1201 $self->update;
941} 1202}
942 1203
943sub get_text { 1204sub set_markup {
944 my ($self, $text) = @_; 1205 my ($self, $markup) = @_;
945 1206
946 $self->{text} 1207 $self->{layout}->set_markup ($markup);
1208
1209 delete $self->{texture};
1210 $self->check_size;
1211 $self->update;
947} 1212}
948 1213
949sub size_request { 1214sub size_request {
950 my ($self) = @_; 1215 my ($self) = @_;
951 1216
952 $self->{layout}->set_width; 1217 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1);
953 $self->{layout}->set_height ($self->{height}); 1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220
954 my ($w, $h) = $self->{layout}->size; 1221 my ($w, $h) = $self->{layout}->size;
1222
1223 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font};
1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1226
1227 my ($w2, $h2) = $self->{template}->size;
1228
1229 $w = List::Util::max $w, $w2;
1230 $h = List::Util::max $h, $h2;
1231 }
955 1232
956 ( 1233 (
957 $w + $self->{padding} * 2, 1234 $w + $self->{padding} * 2,
958 $h + $self->{padding} * 2, 1235 $h + $self->{padding} * 2,
959 ) 1236 )
960} 1237}
961 1238
962sub size_allocate { 1239sub size_allocate {
963 my ($self, $x, $y, $w, $h) = @_; 1240 my ($self, $w, $h) = @_;
964
965 $self->_size_allocate ($x, $y, $w, $h) or return;
966 1241
967 delete $self->{texture}; 1242 delete $self->{texture};
968} 1243}
969 1244
970sub update { 1245sub set_fontsize {
971 my ($self) = @_; 1246 my ($self, $fontsize) = @_;
972 1247
1248 $self->{fontsize} = $fontsize;
973 delete $self->{texture}; 1249 delete $self->{texture};
1250 $self->check_size;
974 $self->SUPER::update; 1251 $self->update;
975} 1252}
976 1253
977sub _draw { 1254sub _draw {
978 my ($self) = @_; 1255 my ($self) = @_;
979 1256
980 my $tex = $self->{texture} ||= do { 1257 my $tex = $self->{texture} ||= do {
1258 $self->{layout}->set_font ($self->{font}) if $self->{font};
981 $self->{layout}->set_width ($self->{w}); 1259 $self->{layout}->set_width ($self->{w});
982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
983 new_from_layout CFClient::Texture $self->{layout} 1261 new_from_layout CFClient::Texture $self->{layout}
984 }; 1262 };
985 1263
986 glEnable GL_BLEND; 1264 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988 glEnable GL_TEXTURE_2D; 1266 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
990 1268
991 glColor @{$self->{fg}}; 1269 glColor @{$self->{fg}};
992 1270
993 my $x = 1271 $self->{ox} = int (
994 $self->{align} < 0 ? $self->{padding} 1272 $self->{align} < 0 ? $self->{padding}
995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996 : ($self->{w} - $tex->{w}) * 0.5; 1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
997 1276
998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0; 1277 $self->{oy} = int (
999 $tex->draw_quad (0, 0); 1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy});
1000 1284
1001 glDisable GL_TEXTURE_2D; 1285 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND; 1286 glDisable GL_BLEND;
1003} 1287}
1004 1288
1005############################################################################# 1289#############################################################################
1006 1290
1007package CFClient::UI::Entry; 1291package CFClient::UI::EntryBase;
1008 1292
1009our @ISA = CFClient::UI::Label::; 1293our @ISA = CFClient::UI::Label::;
1010 1294
1011use SDL; 1295use CFClient::OpenGL;
1012use SDL::OpenGL;
1013 1296
1014sub new { 1297sub new {
1015 my $class = shift; 1298 my $class = shift;
1016 1299
1017 $class->SUPER::new ( 1300 $class->SUPER::new (
1018 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1019 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1020 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1021 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1305 can_hover => 1,
1306 can_focus => 1,
1307 valign => 0,
1308 can_events => 1,
1022 @_ 1309 @_
1023 ) 1310 )
1024} 1311}
1025 1312
1026sub _set_text { 1313sub _set_text {
1027 my ($self, $text) = @_; 1314 my ($self, $text) = @_;
1028 1315
1316 delete $self->{cur_h};
1317
1318 return if $self->{text} eq $text;
1319
1320 delete $self->{texture};
1321
1029 $self->{last_activity} = $::NOW; 1322 $self->{last_activity} = $::NOW;
1030
1031 $self->{text} = $text; 1323 $self->{text} = $text;
1032 $self->{layout}->set_width ($self->{w});
1033 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1034 1324
1035 $text =~ s/./*/g if $self->{hidden}; 1325 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text ");
1036 1327
1037 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1328 $self->emit (changed => $self->{text});
1329}
1038 1330
1039 $text = substr $text, 0, $self->{cursor}; 1331sub get_text {
1040 utf8::encode $text; 1332 $_[0]{text}
1041
1042 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1043} 1333}
1044 1334
1045sub size_request { 1335sub size_request {
1046 my ($self) = @_; 1336 my ($self) = @_;
1047 1337
1049 1339
1050 ($w + 1, $h) # add 1 for cursor 1340 ($w + 1, $h) # add 1 for cursor
1051} 1341}
1052 1342
1053sub size_allocate { 1343sub size_allocate {
1054 my ($self, $x, $y, $w, $h) = @_; 1344 my ($self, $w, $h) = @_;
1055 1345
1056 $self->SUPER::size_allocate ($x, $y, $w, $h); 1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1057
1058 $self->_set_text ($self->{text});
1059} 1347}
1060 1348
1061sub set_text { 1349sub set_text {
1062 my ($self, $text) = @_; 1350 my ($self, $text) = @_;
1063 1351
1067} 1355}
1068 1356
1069sub key_down { 1357sub key_down {
1070 my ($self, $ev) = @_; 1358 my ($self, $ev) = @_;
1071 1359
1072 my $mod = $ev->key_mod; 1360 my $mod = $ev->{mod};
1073 my $sym = $ev->key_sym; 1361 my $sym = $ev->{sym};
1074
1075 my $uni = $ev->key_unicode; 1362 my $uni = $ev->{unicode};
1076 1363
1077 my $text = $self->get_text; 1364 my $text = $self->get_text;
1078 1365
1079 if ($sym == SDLK_BACKSPACE) { 1366 if ($sym == 8) {
1080 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1081 } elsif ($sym == SDLK_DELETE) { 1368 } elsif ($sym == 127) {
1082 substr $text, $self->{cursor}, 1, ""; 1369 substr $text, $self->{cursor}, 1, "";
1083 } elsif ($sym == SDLK_LEFT) { 1370 } elsif ($sym == CFClient::SDLK_LEFT) {
1084 --$self->{cursor} if $self->{cursor}; 1371 --$self->{cursor} if $self->{cursor};
1085 } elsif ($sym == SDLK_RIGHT) { 1372 } elsif ($sym == CFClient::SDLK_RIGHT) {
1086 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1373 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1087 } elsif ($sym == SDLK_HOME) { 1374 } elsif ($sym == CFClient::SDLK_HOME) {
1088 $self->{cursor} = 0; 1375 $self->{cursor} = 0;
1089 } elsif ($sym == SDLK_END) { 1376 } elsif ($sym == CFClient::SDLK_END) {
1090 $self->{cursor} = length $text; 1377 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) {
1379 $self->emit ('escape');
1091 } elsif ($uni) { 1380 } elsif ($uni) {
1092 substr $text, $self->{cursor}++, 0, chr $uni; 1381 substr $text, $self->{cursor}++, 0, chr $uni;
1093 } 1382 }
1094 1383
1095 $self->_set_text ($text); 1384 $self->_set_text ($text);
1149 1438
1150 $self->SUPER::_draw; 1439 $self->SUPER::_draw;
1151 1440
1152 #TODO: force update every cursor change :( 1441 #TODO: force update every cursor change :(
1153 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1442 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1443
1444 unless (exists $self->{cur_h}) {
1445 my $text = substr $self->{text}, 0, $self->{cursor};
1446 utf8::encode $text;
1447
1448 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1449 }
1450
1154 glColor @{$self->{fg}}; 1451 glColor @{$self->{fg}};
1155 glBegin GL_LINES; 1452 glBegin GL_LINES;
1156 glVertex $self->{cur_x}, $self->{cur_y};
1157 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1453 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1454 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1158 glEnd; 1455 glEnd;
1159 } 1456 }
1160} 1457}
1161 1458
1459package CFClient::UI::Entry;
1460
1461our @ISA = CFClient::UI::EntryBase::;
1462
1463use CFClient::OpenGL;
1464
1465sub key_down {
1466 my ($self, $ev) = @_;
1467
1468 my $sym = $ev->{sym};
1469
1470 if ($sym == 13) {
1471 unshift @{$self->{history}},
1472 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1;
1474 $self->emit (activate => $txt);
1475 $self->update;
1476
1477 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text;
1480 }
1481 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1;
1484 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486
1487 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490
1491 if ($self->{history_pointer} >= 0) {
1492 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1493 } else {
1494 $self->set_text ($self->{history_saveback});
1495 }
1496
1497 } else {
1498 $self->SUPER::key_down ($ev);
1499 }
1500
1501}
1502
1162############################################################################# 1503#############################################################################
1163 1504
1164package CFClient::UI::Button; 1505package CFClient::UI::Button;
1165 1506
1166our @ISA = CFClient::UI::Label::; 1507our @ISA = CFClient::UI::Label::;
1167 1508
1168use SDL; 1509use CFClient::OpenGL;
1169use SDL::OpenGL;
1170 1510
1171my @tex = 1511my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1512 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1173 qw(b1_button_active.png); 1513 qw(b1_button_active.png);
1174 1514
1175sub new { 1515sub new {
1176 my $class = shift; 1516 my $class = shift;
1177 1517
1178 $class->SUPER::new ( 1518 $class->SUPER::new (
1179 padding => 4, 1519 padding => 4,
1180 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1521 bg => [1, 1, 1, 0.2],
1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5], 1522 active_fg => [0, 0, 1],
1184# border_fg => [1, 1, 0], 1523 can_hover => 1,
1524 align => 0,
1525 valign => 0,
1526 can_events => 1,
1185 @_ 1527 @_
1186 ) 1528 )
1187} 1529}
1188 1530
1189sub button_up { 1531sub button_up {
1197 1539
1198sub _draw { 1540sub _draw {
1199 my ($self) = @_; 1541 my ($self) = @_;
1200 1542
1201 local $self->{fg} = $self->{fg}; 1543 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
1203
1204 glEnable GL_BLEND;
1205 glEnable GL_TEXTURE_2D;
1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207 1544
1208 if ($GRAB == $self) { 1545 if ($GRAB == $self) {
1209 $self->{fg} = $self->{active_fg}; 1546 $self->{fg} = $self->{active_fg};
1210 } 1547 }
1211 1548
1212 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D;
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1;
1214 1554
1215 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1216 1556
1217 glDisable GL_TEXTURE_2D; 1557 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND; 1558 glDisable GL_BLEND;
1219 1559
1220 $self->SUPER::_draw; 1560 $self->SUPER::_draw;
1224 1564
1225package CFClient::UI::CheckBox; 1565package CFClient::UI::CheckBox;
1226 1566
1227our @ISA = CFClient::UI::DrawBG::; 1567our @ISA = CFClient::UI::DrawBG::;
1228 1568
1229use SDL; 1569my @tex =
1230use SDL::OpenGL; 1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1571 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1572
1573use CFClient::OpenGL;
1231 1574
1232sub new { 1575sub new {
1233 my $class = shift; 1576 my $class = shift;
1234 1577
1235 $class->SUPER::new ( 1578 $class->SUPER::new (
1236 padding => 2, 1579 padding => 2,
1237 fg => [1, 1, 1], 1580 fg => [1, 1, 1],
1238 active_fg => [1, 1, 0], 1581 active_fg => [1, 1, 0],
1239 state => 0, 1582 state => 0,
1583 can_hover => 1,
1240 @_ 1584 @_
1241 ) 1585 )
1242} 1586}
1243 1587
1244sub size_request { 1588sub size_request {
1245 my ($self) = @_; 1589 my ($self) = @_;
1246 1590
1247 ($self->{padding} * 2 + 6) x 2 1591 ($self->{padding} * 2 + 6) x 2
1248}
1249
1250sub size_allocate {
1251 my ($self, $x, $y, $w, $h) = @_;
1252
1253 $self->_size_allocate ($x, $y, $w, $h);
1254} 1592}
1255 1593
1256sub button_down { 1594sub button_down {
1257 my ($self, $ev, $x, $y) = @_; 1595 my ($self, $ev, $x, $y) = @_;
1258 1596
1269 $self->SUPER::_draw; 1607 $self->SUPER::_draw;
1270 1608
1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1609 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272 1610
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1611 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274 1612
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1613 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276 1614
1277 glBegin GL_LINE_LOOP; 1615 glEnable GL_BLEND;
1278 glVertex 0 , 0; 1616 glEnable GL_TEXTURE_2D;
1279 glVertex 0 , $s; 1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283 1618
1284 if ($self->{state}) { 1619 my $tex = $self->{state} ? $tex[1] : $tex[0];
1285 glBegin GL_LINES;
1286 glVertex 0 , 0;
1287 glVertex $s, $s;
1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1290 glEnd;
1291 }
1292}
1293 1620
1294############################################################################# 1621 $tex->draw_quad (0, 0, $s, $s);
1295 1622
1623 glDisable GL_TEXTURE_2D;
1624 glDisable GL_BLEND;
1625}
1626
1627#############################################################################
1628
1296package CFClient::UI::Slider; 1629package CFClient::UI::Image;
1297 1630
1298use strict;
1299
1300use SDL::OpenGL;
1301
1302our @ISA = CFClient::UI::DrawBG::; 1631our @ISA = CFClient::UI::Base::;
1632
1633use CFClient::OpenGL;
1634use Carp qw/confess/;
1635
1636our %loaded_images;
1303 1637
1304sub new { 1638sub new {
1305 my $class = shift; 1639 my $class = shift;
1306 1640
1641 my $self = $class->SUPER::new (can_events => 0, @_);
1642
1643 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1644
1645 $loaded_images{$self->{image}} ||=
1646 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1647
1648 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1649
1650 Scalar::Util::weaken $loaded_images{$self->{image}};
1651
1652 $self->{aspect} = $tex->{w} / $tex->{h};
1653
1654 $self
1655}
1656
1657sub size_request {
1658 my ($self) = @_;
1659
1660 ($self->{tex}->{w}, $self->{tex}->{h})
1661}
1662
1663sub _draw {
1664 my ($self) = @_;
1665
1666 my $tex = $self->{tex};
1667
1668 my ($w, $h) = ($self->{w}, $self->{h});
1669
1670 if ($self->{rot90}) {
1671 glRotate 90, 0, 0, 1;
1672 glTranslate 0, -$self->{w}, 0;
1673
1674 ($w, $h) = ($h, $w);
1675 }
1676
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681
1682 $tex->draw_quad (0, 0, $w, $h);
1683
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D;
1686}
1687
1688#############################################################################
1689
1690package CFClient::UI::VGauge;
1691
1692our @ISA = CFClient::UI::Base::;
1693
1694use List::Util qw(min max);
1695
1696use CFClient::OpenGL;
1697
1698my %tex = (
1699 food => [
1700 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1701 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1702 ],
1703 grace => [
1704 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1705 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1706 ],
1707 hp => [
1708 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1709 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1710 ],
1711 mana => [
1712 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1713 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1714 ],
1715);
1716
1717# eg. VGauge->new (gauge => 'food'), default gauge: food
1718sub new {
1719 my $class = shift;
1720
1721 my $self = $class->SUPER::new (
1722 type => 'food',
1723 @_
1724 );
1725
1726 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1727
1728 $self
1729}
1730
1731sub size_request {
1732 my ($self) = @_;
1733
1734 #my $tex = $tex{$self->{type}}[0];
1735 #@$tex{qw(w h)}
1736 (0, 0)
1737}
1738
1739sub set_max {
1740 my ($self, $max) = @_;
1741
1742 $self->{max_val} = $max;
1743}
1744
1745sub set_value {
1746 my ($self, $val, $max) = @_;
1747
1748 $self->set_max ($max)
1749 if defined $max;
1750
1751 $max = $self->{max_val};
1752 $self->{val} = $val;
1753
1754 $self->update;
1755}
1756
1757sub _draw {
1758 my ($self) = @_;
1759
1760 my $tex = $tex{$self->{type}};
1761 my ($t1, $t2, $t3) = @$tex;
1762
1763 my ($w, $h) = ($self->{w}, $self->{h});
1764
1765 if ($self->{vertical}) {
1766 glRotate 90, 0, 0, 1;
1767 glTranslate 0, -$self->{w}, 0;
1768
1769 ($w, $h) = ($h, $w);
1770 }
1771
1772 my $ycut = $self->{val} / ($self->{max_val} || 1);
1773
1774 my $ycut1 = max 0, min 1, $ycut;
1775 my $ycut2 = max 0, min 1, $ycut - 1;
1776
1777 my $h1 = $self->{h} * (1 - $ycut1);
1778 my $h2 = $self->{h} * (1 - $ycut2);
1779
1780 glEnable GL_BLEND;
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1784
1785 glBindTexture GL_TEXTURE_2D, $t1->{name};
1786 glBegin GL_QUADS;
1787 glTexCoord 0 , 0; glVertex 0 , 0;
1788 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1789 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1790 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1791 glEnd;
1792
1793 my $ycut1 = List::Util::min 1, $ycut;
1794 glBindTexture GL_TEXTURE_2D, $t2->{name};
1795 glBegin GL_QUADS;
1796 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1797 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1798 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1799 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1800 glEnd;
1801
1802 if ($t3) {
1803 glBindTexture GL_TEXTURE_2D, $t3->{name};
1804 glBegin GL_QUADS;
1805 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1806 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1807 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1808 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1809 glEnd;
1810 }
1811
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D;
1814}
1815
1816#############################################################################
1817
1818package CFClient::UI::Gauge;
1819
1820our @ISA = CFClient::UI::VBox::;
1821
1822sub new {
1823 my ($class, %arg) = @_;
1824
1825 my $self = $class->SUPER::new (
1826 tooltip => $arg{type},
1827 can_hover => 1,
1828 %arg,
1829 );
1830
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1833 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1834
1835 $self
1836}
1837
1838sub set_fontsize {
1839 my ($self, $fsize) = @_;
1840
1841 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize);
1843}
1844
1845sub set_value {
1846 my ($self, $val, $max) = @_;
1847
1848 $self->set_max ($max)
1849 if defined $max;
1850
1851 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860}
1861
1862#############################################################################
1863
1864package CFClient::UI::Slider;
1865
1866use strict;
1867
1868use CFClient::OpenGL;
1869
1870our @ISA = CFClient::UI::DrawBG::;
1871
1872my @tex =
1873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1874 qw(s1_slider.png s1_slider_bg.png);
1875
1876sub new {
1877 my $class = shift;
1878
1307 # range [value, low, high, page] 1879 # range [value, low, high, page]
1308 1880
1881 # TODO: 0-width page
1882 # TODO: req_w/h are wrong with vertical
1883 # TODO: calculations are off
1309 my $self = $class->SUPER::new ( 1884 my $self = $class->SUPER::new (
1310 fg => [1, 1, 1], 1885 fg => [1, 1, 1],
1311 active_fg => [0, 0, 0], 1886 active_fg => [0, 0, 0],
1312 range => [0, 0, 100, 10], 1887 range => [0, 0, 100, 10],
1313 req_w => 40, 1888 req_w => 20,
1314 req_h => 10, 1889 req_h => 20,
1315 vertical => 0, 1890 vertical => 0,
1891 can_hover => 1,
1892 inner_pad => 5,
1316 @_ 1893 @_
1317 ); 1894 );
1318 1895
1319 $self 1896 $self
1320} 1897}
1341 if ($GRAB == $self) { 1918 if ($GRAB == $self) {
1342 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1919 my ($value, $lo, $hi, $page) = @{$self->{range}};
1343 1920
1344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1921 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345 1922
1923 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1924 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1925
1926 $x -= $inner_pad_px; # substract the padding
1346 $x = $x * ($hi - $lo) / $w + $lo; 1927 $x = $x * ($hi - $lo) / $inner_w + $lo;
1347 $x = $lo if $x < $lo; 1928 $x = $lo if $x < $lo;
1348 $x = $hi - $page if $x > $hi - $page; 1929 $x = $hi - $page if $x > $hi - $page;
1349 $self->{range}[0] = $x; 1930 $self->{range}[0] = $x;
1350 1931
1351 $self->emit (changed => $x); 1932 $self->emit (changed => $x);
1352 $self->update; 1933 $self->update;
1353 } 1934 }
1935}
1936
1937# the inner_* stuff is for generating a padding for the slider handle,
1938# so that the handle doesn't leave the texture. This calculation isn't 100%
1939# correct propably, but it does the job for now
1940sub _calc_inner_pad_px {
1941 my ($self, $w) = @_;
1942 ($w / 100) * $self->{inner_pad} # % to pixels
1354} 1943}
1355 1944
1356sub _draw { 1945sub _draw {
1357 my ($self) = @_; 1946 my ($self) = @_;
1358 1947
1372 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1961 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1962 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374 1963
1375 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1964 my ($value, $lo, $hi, $page) = @{$self->{range}};
1376 1965
1966 $hi = $value + 1 if $lo == $hi;
1967
1968 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1969 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1970
1377 $page = int $page * $w / ($hi - $lo); 1971 $page = int $page * $inner_w / ($hi - $lo);
1378 $value = int +($value - $lo) * $w / ($hi - $lo); 1972 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1379 1973
1380 $w -= $page; 1974 $w -= $page;
1381 $page &= ~1; 1975 $page &= ~1;
1382 glTranslate $page * 0.5, 0, 0; 1976 glTranslate $page * 0.5, 0, 0;
1383 $page ||= 2; 1977 $page ||= 2;
1384 1978
1385 glColor @$fg;
1386 glBegin GL_LINES;
1387 glVertex 0, 0; glVertex 0, $h;
1388 glVertex $w - 1, 0; glVertex $w - 1, $h;
1389 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390 glEnd;
1391
1392 my $knob_a = $value - $page * 0.5; 1979 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1393 my $knob_b = $value + $page * 0.5; 1980 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1394 1981
1395 glBegin GL_QUADS; 1982 glEnable GL_BLEND;
1396 glColor @$fg; 1983 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1397 glVertex $knob_a, 0; 1984 glEnable GL_TEXTURE_2D;
1398 glVertex $knob_a, $h; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1399 glVertex $knob_b, $h;
1400 glVertex $knob_b, 0;
1401 1986
1402 if ($knob_a < $knob_b - 2) { 1987 # draw background
1403 glColor @$bg; 1988 $tex[1]->draw_quad (0, 0, $w, $h);
1404 glVertex $knob_a + 1, 1;
1405 glVertex $knob_a + 1, $h - 1;
1406 glVertex $knob_b - 1, $h - 1;
1407 glVertex $knob_b - 1, 1;
1408 }
1409 glEnd;
1410}
1411 1989
1412############################################################################# 1990 # draw handle
1991 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1413 1992
1993 glDisable GL_BLEND;
1994 glDisable GL_TEXTURE_2D;
1995}
1996
1997#############################################################################
1998
1414package CFClient::UI::MapWidget; 1999package CFClient::UI::TextView;
1415 2000
1416use strict;
1417
1418use List::Util qw(min max);
1419
1420use SDL;
1421use SDL::OpenGL;
1422
1423our @ISA = CFClient::UI::Base::; 2001our @ISA = CFClient::UI::HBox::;
2002
2003use CFClient::OpenGL;
1424 2004
1425sub new { 2005sub new {
1426 my $class = shift; 2006 my $class = shift;
1427 2007
1428 $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1429 z => -1, 2009 fontsize => 1,
1430 list => (glGenLists 1), 2010 can_events => 0,
2011 #font => default_font
1431 @_ 2012 @_,
2013
2014 layout => (new CFClient::Layout),
2015 par => [],
2016 height => 0,
2017 children => [
2018 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1),
2020 ],
1432 ) 2021 );
1433}
1434 2022
1435sub key_down { 2023 $self->{children}[1]->connect (changed => sub {
1436 print "MAPKEYDOWN\n"; 2024 $self->update;
1437} 2025 });
1438 2026
1439sub key_up { 2027 $self
1440} 2028}
1441 2029
1442sub size_request { 2030sub set_fontsize {
2031 my ($self, $fontsize) = @_;
2032
2033 $self->{fontsize} = $fontsize;
2034 $self->reflow;
2035}
2036
2037sub text_height {
2038 my ($self, $text) = @_;
2039
2040 my $layout = $self->{layout};
2041
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w});
2044 $layout->set_text ($text);
1443 ( 2045
1444 1 + 32 * int $::WIDTH / 32, 2046 ($layout->size)[1]
1445 1 + 32 * int $::HEIGHT / 32, 2047}
1446 ) 2048
2049sub reflow {
2050 my ($self) = @_;
2051
2052 $self->{need_reflow}++;
2053 $self->update;
2054}
2055
2056sub size_allocate {
2057 my ($self, $w, $h) = @_;
2058
2059 $self->SUPER::size_allocate ($w, $h);
2060
2061 $self->{layout}->set_font ($self->{font}) if $self->{font};
2062 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2063 $self->{layout}->set_width ($self->{children}[0]{w});
2064
2065 $self->reflow;
2066}
2067
2068sub add_paragraph {
2069 my ($self, $color, $text) = @_;
2070
2071 #TODO: intelligently "reformat" paragraph
2072
2073 my $height = $self->text_height ($text);
2074
2075 $self->{height} += $height;
2076
2077 push @{$self->{par}}, [$height, $color, $text];
2078
2079 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2080 $self->{children}[1]->update;
1447} 2081}
1448 2082
1449sub update { 2083sub update {
1450 my ($self) = @_; 2084 my ($self) = @_;
1451 2085
1452 $self->{need_update} = 1;
1453 $self->SUPER::update; 2086 $self->SUPER::update;
1454}
1455 2087
1456sub draw { 2088 return unless $self->{h} > 0;
1457 my ($self) = @_;
1458 2089
2090 delete $self->{texture};
2091
2092 $ROOT->on_refresh ($self, sub {
1459 if (delete $self->{need_update}) { 2093 if (delete $self->{need_reflow}) {
1460 glNewList $self->{list}, GL_COMPILE; 2094 my $height = 0;
1461 2095
1462 my $mx = $::CONN->{mapx}; 2096 $height += $_->[0] = $self->text_height ($_->[2])
1463 my $my = $::CONN->{mapy}; 2097 for @{$self->{par}};
1464 2098
1465 my $map = $::CONN->{map}; 2099 $self->{height} = $height;
1466 2100
1467 my ($xofs, $yofs); 2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1468 2102
1469 my $sw = 1 + int $::WIDTH / 32; 2103 delete $self->{texture};
1470 my $sh = 1 + int $::HEIGHT / 32;
1471
1472 if ($::CONN->{mapw} > $sw) {
1473 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
1474 } else {
1475 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1476 } 2104 }
1477 2105
1478 if ($::CONN->{maph} > $sh) { 2106 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1479 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 2107 glClearColor 0, 0, 0, 1;
1480 } else { 2108 glClear GL_COLOR_BUFFER_BIT;
1481 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 2109
2110 glEnable GL_BLEND;
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D;
2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114
2115 my $top = int $self->{children}[1]{range}[0];
2116
2117 my $y0 = $top;
2118 my $y1 = $top + $self->{h};
2119
2120 my $y = 0;
2121
2122 my $layout = $self->{layout};
2123
2124 $layout->set_font ($self->{font}) if $self->{font};
2125
2126 for my $par (@{$self->{par}}) {
2127 my $h = $par->[0];
2128
2129 if ($y0 < $y + $h && $y < $y1) {
2130 $layout->set_text ($par->[2]);
2131
2132 glColor @{ $par->[1] };
2133 my ($W, $H) = $layout->size;
2134 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
2135 }
2136
2137 $y += $h;
2138 }
2139
2140 glDisable GL_TEXTURE_2D;
2141 glDisable GL_BLEND;
1482 } 2142 };
2143 });
2144}
1483 2145
2146sub _draw {
2147 my ($self) = @_;
2148
2149 if ($self->{texture}) {
1484 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1485 glEnable GL_BLEND;
1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488 glColor 1, 1, 1, 1; 2152 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1489
1490 my $sw4 = ($sw + 3) & ~3;
1491 my $darkness = "\x00" x ($sw4 * $sh);
1492
1493 for my $x (0 .. $sw - 1) {
1494 my $row = $map->[$x + $xofs];
1495 for my $y (0 .. $sh - 1) {
1496
1497 my $cell = $row->[$y + $yofs]
1498 or next;
1499
1500 my $dark = $cell->[0];
1501 if ($dark < 0) {
1502 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1503 } else {
1504 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1505 }
1506
1507 for my $num (grep $_, @$cell[1,2,3]) {
1508 my $tex = $::CONN->{face}[$num]{texture} || next;
1509
1510 my ($w, $h) = @$tex{qw(w h)};
1511
1512 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1513 }
1514 }
1515 }
1516
1517# if (1) { # higher quality darkness
1518# $lighting =~ s/(.)/$1$1$1/gs;
1519# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1520#
1521# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1522#
1523# $lighting = $pb->get_pixels;
1524# $lighting =~ s/(.)../$1/gs;
1525# }
1526
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1528
1529 $darkness = new CFClient::Texture
1530 w => $sw4,
1531 h => $sh,
1532 data => $darkness,
1533 internalformat => GL_ALPHA,
1534 format => GL_ALPHA;
1535
1536 glColor 0.45, 0.45, 0.45, 1;
1537 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1538
1539 glDisable GL_TEXTURE_2D; 2153 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541
1542 glEndList;
1543 } 2154 }
1544 2155
1545 glCallList $self->{list}; 2156 $self->{children}[1]->draw;
1546 2157
1547 if ($FOCUS != $self) {
1548 glEnable GL_BLEND;
1549 glColor 0, 0, 1, 0.4;
1550 glBegin GL_QUADS;
1551 glVertex 0, 0;
1552 glVertex 0, $::HEIGHT;
1553 glVertex $::WIDTH, $::HEIGHT;
1554 glVertex $::WIDTH, 0;
1555 glEnd;
1556 glDisable GL_BLEND;
1557 }
1558}
1559
1560my %DIR = (
1561 SDLK_KP8, [1, "north"],
1562 SDLK_KP9, [2, "northeast"],
1563 SDLK_KP6, [3, "east"],
1564 SDLK_KP3, [4, "southeast"],
1565 SDLK_KP2, [5, "south"],
1566 SDLK_KP1, [6, "southwest"],
1567 SDLK_KP4, [7, "west"],
1568 SDLK_KP7, [8, "northwest"],
1569
1570 SDLK_UP, [1, "north"],
1571 SDLK_RIGHT, [3, "east"],
1572 SDLK_DOWN, [5, "south"],
1573 SDLK_LEFT, [7, "west"],
1574);
1575
1576sub key_down {
1577 my ($self, $ev) = @_;
1578
1579 my $mod = $ev->key_mod;
1580 my $sym = $ev->key_sym;
1581
1582 if ($sym == SDLK_KP5) {
1583 $::CONN->user_send ("command stay fire");
1584 } elsif ($sym == SDLK_a) {
1585 $::CONN->user_send ("command apply");
1586 } elsif (exists $DIR{$sym}) {
1587 if ($mod & KMOD_SHIFT) {
1588 $self->{shft}++;
1589 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1590 } elsif ($mod & KMOD_CTRL) {
1591 $self->{ctrl}++;
1592 $::CONN->user_send ("command run $DIR{$sym}[0]");
1593 } else {
1594 $::CONN->user_send ("command $DIR{$sym}[1]");
1595 }
1596 }
1597}
1598
1599sub key_up {
1600 my ($self, $ev) = @_;
1601
1602 my $mod = $ev->key_mod;
1603 my $sym = $ev->key_sym;
1604
1605 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1606 $::CONN->user_send ("command fire_stop");
1607 }
1608 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1609 $::CONN->user_send ("command run_stop");
1610 }
1611} 2158}
1612 2159
1613############################################################################# 2160#############################################################################
1614 2161
1615package CFClient::UI::Animator; 2162package CFClient::UI::Animator;
1616 2163
1617use SDL::OpenGL; 2164use CFClient::OpenGL;
1618 2165
1619our @ISA = CFClient::UI::Bin::; 2166our @ISA = CFClient::UI::Bin::;
1620 2167
1621sub moveto { 2168sub moveto {
1622 my ($self, $x, $y) = @_; 2169 my ($self, $x, $y) = @_;
1652 glPopMatrix; 2199 glPopMatrix;
1653} 2200}
1654 2201
1655############################################################################# 2202#############################################################################
1656 2203
1657package CFClient::UI::Toplevel; 2204package CFClient::UI::Flopper;
2205
2206our @ISA = CFClient::UI::Button::;
2207
2208sub new {
2209 my $class = shift;
2210
2211 my $self = $class->SUPER::new (
2212 state => 0,
2213 connect_activate => \&toggle_flopper,
2214 @_
2215 );
2216
2217 if ($self->{state}) {
2218 $self->{state} = 0;
2219 $self->toggle_flopper;
2220 }
2221
2222 $self
2223}
2224
2225sub toggle_flopper {
2226 my ($self) = @_;
2227
2228 # TODO: use animation
2229 if ($self->{state} = !$self->{state}) {
2230 $CFClient::UI::ROOT->add ($self->{other});
2231 $self->{other}->move ($self->coord2global (0, $self->{h}));
2232 $self->emit ("open");
2233 } else {
2234 $CFClient::UI::ROOT->remove ($self->{other});
2235 $self->emit ("close");
2236 }
2237
2238 $self->emit (changed => $self->{state});
2239}
2240
2241#############################################################################
2242
2243package CFClient::UI::Tooltip;
2244
2245our @ISA = CFClient::UI::Bin::;
2246
2247use CFClient::OpenGL;
2248
2249sub new {
2250 my $class = shift;
2251
2252 $class->SUPER::new (
2253 @_,
2254 can_events => 0,
2255 )
2256}
2257
2258sub set_markup {
2259 my ($self, $text) = @_;
2260
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2262 $self->{label}->set_markup ($text);
2263 $self->add ($self->{label});
2264}
2265
2266sub size_request {
2267 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272
2273 ($w + 4, $h + 4)
2274}
2275
2276sub size_allocate {
2277 my ($self, $w, $h) = @_;
2278
2279 $self->SUPER::size_allocate ($w - 4, $h - 4);
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375;
2287
2288 my ($w, $h) = @$self{qw(w h)};
2289
2290 glColor 1, 0.8, 0.4;
2291 glBegin GL_QUADS;
2292 glVertex 0 , 0;
2293 glVertex 0 , $h;
2294 glVertex $w, $h;
2295 glVertex $w, 0;
2296 glEnd;
2297
2298 glColor 0, 0, 0;
2299 glBegin GL_LINE_LOOP;
2300 glVertex 0 , 0;
2301 glVertex 0 , $h;
2302 glVertex $w, $h;
2303 glVertex $w, 0;
2304 glEnd;
2305
2306 glPopMatrix;
2307
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw;
2310}
2311
2312#############################################################################
2313
2314package CFClient::UI::Face;
2315
2316our @ISA = CFClient::UI::Base::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 aspect => 1,
2325 @_,
2326 )
2327}
2328
2329sub size_request {
2330 (32, 8)
2331}
2332
2333sub draw {
2334 my ($self) = @_;
2335
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337
2338 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 }
2348}
2349
2350#############################################################################
2351
2352package CFClient::UI::Root;
1658 2353
1659our @ISA = CFClient::UI::Container::; 2354our @ISA = CFClient::UI::Container::;
2355
2356use CFClient::OpenGL;
2357
2358sub check_size {
2359 my ($self) = @_;
2360
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2362}
1660 2363
1661sub size_request { 2364sub size_request {
1662 ($::WIDTH, $::HEIGHT) 2365 ($::WIDTH, $::HEIGHT)
1663} 2366}
1664 2367
1665sub size_allocate { 2368sub configure {
1666 my ($self, $x, $y, $w, $h) = @_; 2369 my ($self, $x, $y, $w, $h) = @_;
1667 2370
1668 $self->_size_allocate ($x, $y, $w, $h); 2371 $self->SUPER::configure ($x, $y, $w, $h);
1669 2372
1670 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1671 for @{$self->{children}}; 2373 for my $child (@{$self->{children}}) {
1672} 2374 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1673 2375
1674sub translate { 2376 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2378 $child->configure ($X, $Y, $W,$H);
2379 }
2380}
2381
2382sub _topleft {
1675 my ($self, $x, $y) = @_; 2383 my ($self, $x, $y) = @_;
1676 2384
1677 ($x, $y) 2385 ($x, $y)
1678} 2386}
1679 2387
1680sub update { 2388sub update {
1681 my ($self) = @_; 2389 my ($self) = @_;
1682 2390
1683 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2391 $self->check_size;
1684 ::refresh (); 2392 ::refresh ();
1685} 2393}
1686 2394
1687sub add { 2395sub add {
1688 my ($self, $widget) = @_; 2396 my ($self, $child) = @_;
1689 2397
2398 # integerize window positions
2399 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y};
2401
1690 $self->SUPER::add ($widget); 2402 $self->SUPER::add ($child);
2403}
1691 2404
1692 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2405sub on_refresh {
2406 my ($self, $id, $cb) = @_;
2407
2408 $self->{refresh_hook}{$id} = $cb;
1693} 2409}
1694 2410
1695sub draw { 2411sub draw {
1696 my ($self) = @_; 2412 my ($self) = @_;
1697 2413
2414 while (my $rcb = delete $self->{refresh_hook}) {
2415 $_->() for values %$rcb;
2416 }
2417
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT;
2421
2422 glMatrixMode GL_PROJECTION;
2423 glLoadIdentity;
2424 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2425 glMatrixMode GL_MODELVIEW;
2426 glLoadIdentity;
2427
1698 $self->_draw; 2428 $self->_draw;
1699} 2429}
1700 2430
1701############################################################################# 2431#############################################################################
1702 2432
1703package CFClient::UI; 2433package CFClient::UI;
1704 2434
2435$ROOT = new CFClient::UI::Root;
1705$TOPLEVEL = new CFClient::UI::Toplevel; 2436$TOOLTIP = new CFClient::UI::Tooltip;
1706 2437
17071 24381
1708 2439

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines