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.64 by root, Tue Apr 11 13:38:22 2006 UTC vs.
Revision 1.175 by root, Tue Apr 25 11:48:31 2006 UTC

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

Diff Legend

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