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.117 by root, Sat Apr 15 22:55:59 2006 UTC vs.
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
18
19sub check_tooltip {
20 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) {
25 $TOOLTIP->{owner} = $widget;
26
27 my $tip = $widget->{tooltip};
28
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
31 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 }
43
44 return;
45 }
46 }
47 }
48
49 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner};
51}
14 52
15# class methods for events 53# class methods for events
16sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
18} 57}
19 58
20sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
22} 62}
23 63
24sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
25 my ($ev) = @_; 65 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
27 67
28 if (!$BUTTON_STATE) { 68 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 69 my $widget = $ROOT->find_widget ($x, $y);
30 70
31 $GRAB = $widget; 71 $GRAB = $widget;
32 $GRAB->update if $GRAB; 72 $GRAB->update if $GRAB;
33 }
34 73
74 check_tooltip;
75 }
76
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 78
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
38} 83}
39 84
40sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
41 my ($ev) = @_; 86 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
43 88
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 90
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 92
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
49 97
50 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 100 $grab->update if $grab;
53 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
102
103 check_tooltip;
54 } 104 }
55} 105}
56 106
57sub feed_sdl_motion_event { 107sub feed_sdl_motion_event {
58 my ($ev) = @_; 108 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 109 my ($x, $y) = ($ev->{x}, $ev->{y});
60 110
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 111 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 112
63 if ($widget != $HOVER) { 113 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 114 my $hover = $HOVER; $HOVER = $widget;
65 115
66 $hover->update if $hover && $hover->{can_hover}; 116 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 118
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 check_tooltip;
120 }
121
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
71} 126}
72 127
73# convert position array to integers 128# convert position array to integers
74sub harmonize { 129sub harmonize {
75 my ($vals) = @_; 130 my ($vals) = @_;
… …
81 $rem += $_ - $i; 136 $rem += $_ - $i;
82 $_ = $i; 137 $_ = $i;
83 } 138 }
84} 139}
85 140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
158 }
159}
160
86############################################################################# 161#############################################################################
87 162
88package CFClient::UI::Base; 163package CFClient::UI::Base;
89 164
90use strict; 165use strict;
91 166
92use SDL::OpenGL; 167use CFClient::OpenGL;
93 168
94sub new { 169sub new {
95 my $class = shift; 170 my $class = shift;
96 171
97 my $self = bless { 172 my $self = bless {
98 x => 0, 173 x => 0,
99 y => 0, 174 y => 0,
100 z => 0, 175 z => 0,
101 w => -1, 176 can_events => 1,
102 h => -1,
103 @_ 177 @_
104 }, $class; 178 }, $class;
105 179
106 for (keys %$self) { 180 for (keys %$self) {
107 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
109 } 183 }
110 } 184 }
111 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
112 $self 188 $self
189}
190
191sub destroy {
192 my ($self) = @_;
193
194 $self->hide;
195 %$self = ();
196}
197
198sub show {
199 my ($self) = @_;
200
201 return if $self->{parent};
202
203 $CFClient::UI::ROOT->add ($self);
204}
205
206sub hide {
207 my ($self) = @_;
208
209 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self;
211
212 $self->{parent}->remove ($self)
213 if $self->{parent};
113} 214}
114 215
115sub move { 216sub move {
116 my ($self, $x, $y, $z) = @_; 217 my ($self, $x, $y, $z) = @_;
218
117 $self->{x} = int $x; 219 $self->{x} = int $x;
118 $self->{y} = int $y; 220 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 221 $self->{z} = $z if defined $z;
120}
121 222
122sub needs_redraw { 223 $self->update;
123 0 224}
225
226sub set_size {
227 my ($self, $w, $h) = @_;
228
229 $self->{user_w} = $w;
230 $self->{user_h} = $h;
231
232 $self->check_size;
124} 233}
125 234
126sub size_request { 235sub size_request {
127 require Carp; 236 require Carp;
128 Carp::confess "size_request is abtract"; 237 Carp::confess "size_request is abstract";
129} 238}
130 239
131sub _size_allocate { 240sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 241 my ($self, $x, $y, $w, $h) = @_;
133 242
243 if ($self->{aspect}) {
244 my $w2 = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect};
246
247 # use alignment to adjust x, y
248
249 $x += int +($w - $w2) * 0.5;
250 $y += int +($h - $h2) * 0.5;
251
252 ($w, $h) = ($w2, $h2);
253 }
254
255 if ($self->{x} != $x || $self->{y} != $y) {
134 $self->{x} = $x; 256 $self->{x} = $x;
135 $self->{y} = $y; 257 $self->{y} = $y;
258 $self->update;
259 }
136 260
137 return unless $self->{w} != $w || $self->{h} != $h; 261 if ($self->{w} != $w || $self->{h} != $h) {
138 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
139 $self->{w} = $w;
140 $self->{h} = $h;
141
142 1 263 }
143} 264}
144 265
145sub size_allocate { 266sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_; 267 # nothing to be done
147
148 $self->_size_allocate ($x, $y, $w, $h);
149} 268}
150 269
151# return top left coordinates 270sub reconfigure {
152sub _topleft { 271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children {
278}
279
280sub set_max_size {
153 my ($self, $x, $y) = @_; 281 my ($self, $w, $h) = @_;
154 282
155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h;
156} 285}
157 286
158# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
159sub coord2local { 288sub coord2local {
160 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
161 290
162 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
163 ($x - $X, $y - $Y)
164} 292}
165 293
166# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
167sub coord2global { 295sub coord2global {
168 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
169 297
170 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
171 ($x + $X, $y + $Y)
172} 299}
173 300
174sub focus_in { 301sub focus_in {
175 my ($self) = @_; 302 my ($self) = @_;
176 303
177 return if $FOCUS == $self; 304 return if $FOCUS == $self;
178 return unless $self->{can_focus}; 305 return unless $self->{can_focus};
179 306
180 my $focus = $FOCUS; $FOCUS = $self; 307 my $focus = $FOCUS; $FOCUS = $self;
308
309 $self->emit (focus_in => $focus);
310
181 $focus->update if $focus; 311 $focus->update if $focus;
182 $FOCUS->update; 312 $FOCUS->update;
183} 313}
184 314
185sub focus_out { 315sub focus_out {
186 my ($self) = @_; 316 my ($self) = @_;
187 317
188 return unless $FOCUS == $self; 318 return unless $FOCUS == $self;
189 319
190 my $focus = $FOCUS; undef $FOCUS; 320 my $focus = $FOCUS; undef $FOCUS;
321
322 $self->emit (focus_out => $focus);
323
191 $focus->update if $focus; #? 324 $focus->update if $focus; #?
192} 325}
193 326
194sub mouse_motion { } 327sub mouse_motion { }
195sub button_up { } 328sub button_up { }
… …
219 glPopMatrix; 352 glPopMatrix;
220 353
221 if ($self == $HOVER && $self->{can_hover}) { 354 if ($self == $HOVER && $self->{can_hover}) {
222 my ($x, $y) = @$self{qw(x y)}; 355 my ($x, $y) = @$self{qw(x y)};
223 356
224 glColor 0, 0, 1, 0.2; 357 glColor 1, 0.8, 0.5, 0.2;
225 glEnable GL_BLEND; 358 glEnable GL_BLEND;
226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 359 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
227 glBegin GL_QUADS; 360 glBegin GL_QUADS;
228 glVertex $x , $y; 361 glVertex $x , $y;
229 glVertex $x + $self->{w}, $y; 362 glVertex $x + $self->{w}, $y;
230 glVertex $x + $self->{w}, $y + $self->{h}; 363 glVertex $x + $self->{w}, $y + $self->{h};
231 glVertex $x , $y + $self->{h}; 364 glVertex $x , $y + $self->{h};
232 glEnd; 365 glEnd;
233 glDisable GL_BLEND; 366 glDisable GL_BLEND;
234 } 367 }
368
369 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix;
371 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0;
375 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h};
378 glEnd;
379 glPopMatrix;
380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 }
235} 382}
236 383
237sub _draw { 384sub _draw {
238 my ($self) = @_; 385 my ($self) = @_;
239 386
240 warn "no draw defined for $self\n"; 387 warn "no draw defined for $self\n";
241} 388}
242 389
243sub find_widget { 390sub find_widget {
244 my ($self, $x, $y) = @_; 391 my ($self, $x, $y) = @_;
392
393 return () unless $self->{can_events};
245 394
246 return $self 395 return $self
247 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 396 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
248 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 397 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
249 398
… …
252 401
253sub set_parent { 402sub set_parent {
254 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
255 404
256 Scalar::Util::weaken ($self->{parent} = $parent); 405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
410}
411
412sub check_size {
413 my ($self, $forced) = @_;
414
415 $self->{force_alloc} = 1 if $forced;
416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
257} 417}
258 418
259sub update { 419sub update {
260 my ($self) = @_; 420 my ($self) = @_;
261 421
… …
264} 424}
265 425
266sub connect { 426sub connect {
267 my ($self, $signal, $cb) = @_; 427 my ($self, $signal, $cb) = @_;
268 428
269 push @{ $self->{cb}{$signal} }, $cb; 429 push @{ $self->{signal_cb}{$signal} }, $cb;
270} 430}
271 431
272sub emit { 432sub emit {
273 my ($self, $signal, @args) = @_; 433 my ($self, $signal, @args) = @_;
274 434
275 $_->($self, @args) 435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
276 for @{$self->{cb}{$signal} || []};
277} 436}
278 437
279sub DESTROY { 438sub DESTROY {
280 my ($self) = @_; 439 my ($self) = @_;
281 440
441 delete $WIDGET{$self+0};
282 #$self->deactivate; 442 #$self->deactivate;
283} 443}
284 444
285############################################################################# 445#############################################################################
286 446
287package CFClient::UI::DrawBG; 447package CFClient::UI::DrawBG;
288 448
289our @ISA = CFClient::UI::Base::; 449our @ISA = CFClient::UI::Base::;
290 450
291use strict; 451use strict;
292use SDL::OpenGL; 452use CFClient::OpenGL;
293 453
294sub new { 454sub new {
295 my $class = shift; 455 my $class = shift;
296 456
297 # range [value, low, high, page] 457 # range [value, low, high, page]
… …
326 486
327package CFClient::UI::Empty; 487package CFClient::UI::Empty;
328 488
329our @ISA = CFClient::UI::Base::; 489our @ISA = CFClient::UI::Base::;
330 490
491sub new {
492 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg);
494}
495
331sub size_request { 496sub size_request {
332 (0, 0) 497 (0, 0)
333} 498}
334 499
335sub draw { } 500sub draw { }
… …
343sub new { 508sub new {
344 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
345 510
346 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
347 512
348 my $self = $class->SUPER::new (children => [], %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
349 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
350 519
351 $self 520 $self
352} 521}
353 522
354sub add { 523sub add {
355 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
356 525
357 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
358 528
359 use sort 'stable'; 529 use sort 'stable';
360 530
361 $self->{children} = [ 531 $self->{children} = [
362 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
363 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
364 ]; 534 ];
365 535
366 $self->{w} = $self->{h} = -1; 536 $self->check_size (1);
367 $self->update; 537 $self->update;
368} 538}
369 539
540sub children {
541 @{ $_[0]{children} }
542}
543
370sub remove { 544sub remove {
371 my ($self, $widget) = @_; 545 my ($self, $child) = @_;
372 546
547 delete $child->{parent};
548 $child->hide;
549
373 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
374 551
375 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 552 $self->check_size;
553 $self->update;
554}
555
556sub clear {
557 my ($self) = @_;
558
559 my $children = delete $self->{children};
560 $self->{children} = [];
561
562 for (@$children) {
563 delete $_->{parent};
564 $_->hide;
565 }
566
567 $self->check_size;
568 $self->update;
376} 569}
377 570
378sub find_widget { 571sub find_widget {
379 my ($self, $x, $y) = @_; 572 my ($self, $x, $y) = @_;
380 573
… …
410 603
411 $class->SUPER::new (children => [$child], %arg) 604 $class->SUPER::new (children => [$child], %arg)
412} 605}
413 606
414sub add { 607sub add {
415 my ($self, $widget) = @_; 608 my ($self, $child) = @_;
416 609
417 $self->{children} = []; 610 $self->{children} = [];
418 611
419 $self->SUPER::add ($widget); 612 $self->SUPER::add ($child);
420} 613}
421 614
422sub remove { 615sub remove {
423 my ($self, $widget) = @_; 616 my ($self, $widget) = @_;
424 617
… …
433sub size_request { 626sub size_request {
434 $_[0]{children}[0]->size_request 627 $_[0]{children}[0]->size_request
435} 628}
436 629
437sub size_allocate { 630sub size_allocate {
438 my ($self, $x, $y, $w, $h) = @_; 631 my ($self, $w, $h) = @_;
439 632
440 $self->_size_allocate ($x, $y, $w, $h) or return;
441
442 $self->{children}[0]->size_allocate (0, 0, $w, $h); 633 $self->{children}[0]->configure (0, 0, $w, $h);
443} 634}
444 635
445############################################################################# 636#############################################################################
446 637
447package CFClient::UI::Window; 638package CFClient::UI::Window;
448 639
449our @ISA = CFClient::UI::Bin::; 640our @ISA = CFClient::UI::Bin::;
450 641
451use SDL::OpenGL; 642use CFClient::OpenGL;
452 643
453sub new { 644sub new {
454 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
455 646
456 my $self = $class->SUPER::new (%arg); 647 my $self = $class->SUPER::new (%arg);
457} 648}
458 649
459sub update { 650sub update {
460 my ($self) = @_; 651 my ($self) = @_;
461 652
462 # we want to do this delayed... 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
463 $self->render_chld;
464 $self->SUPER::update; 654 $self->SUPER::update;
465} 655}
466 656
657sub size_allocate {
658 my ($self, $w, $h) = @_;
659
660 $self->SUPER::size_allocate ($w, $h);
661 $self->update;
662}
663
664sub _render {
665 $_[0]{children}[0]->draw;
666}
667
467sub render_chld { 668sub render_child {
468 my ($self) = @_; 669 my ($self) = @_;
469 670
470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
471 glClearColor 0, 0, 0, 1; 672 glClearColor 0, 0, 0, 0;
472 glClear GL_COLOR_BUFFER_BIT; 673 glClear GL_COLOR_BUFFER_BIT;
473 $self->child->draw; 674
675 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
474 }; 683 };
475}
476
477sub size_allocate {
478 my ($self, $x, $y, $w, $h) = @_;
479
480 $self->_size_allocate ($x, $y, $w, $h) or return;
481
482 $self->child->size_allocate (0, 0, $w, $h);
483
484 $self->render_chld;
485} 684}
486 685
487sub _draw { 686sub _draw {
488 my ($self) = @_; 687 my ($self) = @_;
489 688
490 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
491 690
492 my $tex = $self->{texture} 691 my $tex = $self->{texture}
493 or return; 692 or return;
494 693
495 glEnable GL_BLEND;
496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
497 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
498 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;
499 697
500 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
501 699
502 glDisable GL_BLEND;
503 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
504} 701}
505 702
506############################################################################# 703#############################################################################
507 704
508package CFClient::UI::Frame; 705package CFClient::UI::ViewPort;
509 706
510our @ISA = CFClient::UI::Bin::; 707our @ISA = CFClient::UI::Window::;
511
512use SDL::OpenGL;
513 708
514sub size_request { 709sub size_request {
515 my ($self) = @_; 710 my ($self) = @_;
516 my $chld = $self->child
517 or return (0, 0);
518 711
519 $chld->move (2, 2); 712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
520 714
521 map { $_ + 4 } $chld->size_request; 715 @$self{qw(child_w child_h)}
522} 716}
523 717
524sub size_allocate { 718sub size_allocate {
525 my ($self, $x, $y, $w, $h) = @_; 719 my ($self, $w, $h) = @_;
720
721 $self->update;
722}
723
724sub set_offset {
725 my ($self, $x, $y) = @_;
726
727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
729
730 $self->update;
731}
732
733# hmm, this does not work for topleft of $self... but we should not ask for that
734sub coord2local {
735 my ($self, $x, $y) = @_;
736
737 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
738}
739
740sub coord2global {
741 my ($self, $x, $y) = @_;
742
743 $x = List::Util::min $self->{w}, $x - $self->{view_x};
744 $y = List::Util::min $self->{h}, $y - $self->{view_y};
745
746 $self->SUPER::coord2global ($x, $y)
747}
748
749sub find_widget {
750 my ($self, $x, $y) = @_;
751
752 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
753 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
754 ) {
755 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
756 } else {
757 $self->CFClient::UI::Base::find_widget ($x, $y)
526 758 }
527 $self->_size_allocate ($x, $y, $w, $h) or return;
528
529 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
530} 759}
531 760
532sub _draw { 761sub _render {
533 my ($self) = @_; 762 my ($self) = @_;
534 763
535 my $chld = $self->child; 764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
536 765
537 my ($w, $h) = $chld->size_request; 766 $self->SUPER::_render;
538
539 glBegin GL_QUADS;
540 glColor 0, 0, 0;
541 glVertex 0 , 0;
542 glVertex 0 , $h + 4;
543 glVertex $w + 4 , $h + 4;
544 glVertex $w + 4 , 0;
545 glEnd;
546
547 $chld->draw;
548} 767}
549 768
550############################################################################# 769#############################################################################
551 770
552package CFClient::UI::FancyFrame; 771package CFClient::UI::ScrolledWindow;
553 772
554our @ISA = CFClient::UI::Bin::; 773our @ISA = CFClient::UI::HBox::;
555
556use SDL::OpenGL;
557
558my @tex =
559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
560 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
561 774
562sub new { 775sub new {
563 my $class = shift; 776 my $class = shift;
564 777
778 my $self;
779
780 my $slider = new CFClient::UI::Slider
781 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 },
786 ;
787
788 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort),
790 slider => $slider,
791 @_,
792 );
793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
798 $self
799}
800
801#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll
803
804#############################################################################
805
806package CFClient::UI::Frame;
807
808our @ISA = CFClient::UI::Bin::;
809
810use CFClient::OpenGL;
811
812sub new {
813 my $class = shift;
814
815 $class->SUPER::new (
816 bg => undef,
817 @_,
818 )
819}
820
821sub _draw {
822 my ($self) = @_;
823
824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
826
827 glEnable GL_BLEND;
828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
829 glColor @{ $self->{bg} };
830
831 glBegin GL_QUADS;
832 glVertex 0 , 0;
833 glVertex 0 , $h;
834 glVertex $w, $h;
835 glVertex $w, 0;
836 glEnd;
837
838 glDisable GL_BLEND;
839 }
840
841 $self->SUPER::_draw;
842}
843
844#############################################################################
845
846package CFClient::UI::FancyFrame;
847
848our @ISA = CFClient::UI::Bin::;
849
850use CFClient::OpenGL;
851
852my @tex =
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
854 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
855
856sub new {
857 my $class = shift;
858
565 # TODO: user_x, user_y, overwrite moveto? 859 # TODO: user_x, user_y, overwrite moveto?
566 860
567 $class->SUPER::new ( 861 my $self = $class->SUPER::new (
568 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
569 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
570 border => int $::FONTSIZE * 0.8, 864 border => 0.6,
865 toplevel => 1,
866 can_events => 1,
571 @_ 867 @_
868 );
869
870 $self->{title} &&= new CFClient::UI::Label
871 align => 0,
872 valign => 1,
873 text => $self->{title},
874 fontsize => $self->{border};
875
876 $self
877}
878
879sub border {
880 int $_[0]{border} * $::FONTSIZE
881}
882
883sub size_request {
884 my ($self) = @_;
885
886 my ($w, $h) = $self->SUPER::size_request;
887
888 (
889 $w + $self->border * 2,
890 $h + $self->border * 2,
572 ) 891 )
573} 892}
574 893
575sub size_request {
576 my ($self) = @_;
577
578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
580 my ($w, $h) = $self->SUPER::size_request;
581
582 (
583 $w + $self->{border} * 2,
584 $h + $self->{border} * 2,
585 )
586}
587
588sub size_allocate { 894sub size_allocate {
589 my ($self, $x, $y, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
590 896
591 $self->_size_allocate ($x, $y, $w, $h) or return;
592
593 $h -= List::Util::max 0, $self->{border} * 2; 897 $h -= List::Util::max 0, $self->border * 2;
594 $w -= List::Util::max 0, $self->{border} * 2; 898 $w -= List::Util::max 0, $self->border * 2;
595 899
900 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901 if $self->{title};
902
596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 903 $self->child->configure ($self->border, $self->border, $w, $h);
597} 904}
598 905
599sub button_down { 906sub button_down {
600 my ($self, $ev, $x, $y) = @_; 907 my ($self, $ev, $x, $y) = @_;
601 908
602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 909 my ($w, $h) = @$self{qw(w h)};
603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 910 my $border = $self->border;
604 911
912 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
913 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
914
915 if ($lr & $td) {
916 my ($wx, $wy) = ($self->{x}, $self->{y});
605 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
606 my ($bw, $bh) = ($self->{w}, $self->{h}); 918 my ($bw, $bh) = ($self->{w}, $self->{h});
919
920 my $mx = $x < $border;
921 my $my = $y < $border;
607 922
608 $self->{motion} = sub { 923 $self->{motion} = sub {
609 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
610 925
611 ($x, $y) = ($ev->motion_x, $ev->motion_y); 926 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy;
612 928
613 $self->{user_w} = $bw + $x - $ox; 929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
614 $self->{user_h} = $bh + $y - $oy; 930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
615 $self->update; 931 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size;
616 }; 933 };
617 934
618 } elsif ($x >= 0 && $x < $self->{w} 935 } elsif ($lr ^ $td) {
619 && $y >= 0 && $y < $self->{border}) {
620
621 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 936 my ($ox, $oy) = ($ev->{x}, $ev->{y});
622 my ($bx, $by) = ($self->{x}, $self->{y}); 937 my ($bx, $by) = ($self->{x}, $self->{y});
623 938
624 $self->{motion} = sub { 939 $self->{motion} = sub {
625 my ($ev, $x, $y) = @_; 940 my ($ev, $x, $y) = @_;
626 941
627 ($x, $y) = ($ev->motion_x, $ev->motion_y); 942 ($x, $y) = ($ev->{x}, $ev->{y});
628 943
629 $self->move ($bx + $x - $ox, $by + $y - $oy); 944 $self->move ($bx + $x - $ox, $by + $y - $oy);
630 $self->update; 945 $self->update;
631 }; 946 };
632 } 947 }
… …
648 my ($self) = @_; 963 my ($self) = @_;
649 964
650 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
652 967
653 glEnable GL_BLEND;
654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
655 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
657 970
971 my $border = $self->border;
972
658 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
659 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
663 978
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
664 my $bg = $tex[0]; 980 my $bg = $tex[0];
665 981
666 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
667 my $rep_x = $cw / $bg->{w}; 983 my $rep_x = $cw / $bg->{w};
668 my $rep_y = $ch / $bg->{h}; 984 my $rep_y = $ch / $bg->{h};
669 985
670 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
671 987
672 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
676 993
677 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
678 glDisable GL_BLEND; 995
996 $self->{title}->draw if $self->{title};
679 997
680 $self->child->draw; 998 $self->child->draw;
681} 999}
682 1000
683############################################################################# 1001#############################################################################
… …
686 1004
687our @ISA = CFClient::UI::Base::; 1005our @ISA = CFClient::UI::Base::;
688 1006
689use List::Util qw(max sum); 1007use List::Util qw(max sum);
690 1008
691use SDL::OpenGL; 1009use CFClient::OpenGL;
692 1010
693sub new { 1011sub new {
694 my $class = shift; 1012 my $class = shift;
695 1013
696 $class->SUPER::new ( 1014 $class->SUPER::new (
… …
703 my ($self, $x, $y, $child) = @_; 1021 my ($self, $x, $y, $child) = @_;
704 1022
705 $child->set_parent ($self); 1023 $child->set_parent ($self);
706 $self->{children}[$y][$x] = $child; 1024 $self->{children}[$y][$x] = $child;
707 1025
708 $self->{w} = $self->{h} = -1; 1026 $child->check_size;
709 $self->update; 1027}
1028
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
710} 1031}
711 1032
712# TODO: move to container class maybe? send childs a signal on removal? 1033# TODO: move to container class maybe? send childs a signal on removal?
713sub clear { 1034sub clear {
714 my ($self) = @_; 1035 my ($self) = @_;
715 1036
1037 my @children = $self->children;
716 delete $self->{children}; 1038 delete $self->{children};
1039
1040 for (@children) {
1041 delete $_->{parent};
1042 $_->hide;
1043 }
1044
717 $self->update; 1045 $self->update;
718} 1046}
719 1047
720sub get_wh { 1048sub get_wh {
721 my ($self) = @_; 1049 my ($self) = @_;
… …
727 or next; 1055 or next;
728 1056
729 for my $x (0 .. $#$row) { 1057 for my $x (0 .. $#$row) {
730 my $widget = $row->[$x] 1058 my $widget = $row->[$x]
731 or next; 1059 or next;
732 my ($w, $h) = $widget->size_request; 1060 my ($w, $h) = @$widget{qw(req_w req_h)};
733 1061
734 $w[$x] = max $w[$x], $w; 1062 $w[$x] = max $w[$x], $w;
735 $h[$y] = max $h[$y], $h; 1063 $h[$y] = max $h[$y], $h;
736 } 1064 }
737 } 1065 }
… …
749 (sum @$hs), 1077 (sum @$hs),
750 ) 1078 )
751} 1079}
752 1080
753sub size_allocate { 1081sub size_allocate {
754 my ($self, $x, $y, $w, $h) = @_; 1082 my ($self, $w, $h) = @_;
755
756 $self->_size_allocate ($x, $y, $w, $h) or return;
757 1083
758 my ($ws, $hs) = $self->get_wh; 1084 my ($ws, $hs) = $self->get_wh;
759 1085
760 my $req_w = sum @$ws; 1086 my $req_w = sum @$ws;
761 my $req_h = sum @$hs; 1087 my $req_h = sum @$hs;
… …
783 1109
784 for my $c (0 .. $#$row) { 1110 for my $c (0 .. $#$row) {
785 my $col_w = $ws->[$c]; 1111 my $col_w = $ws->[$c];
786 1112
787 if (my $widget = $row->[$c]) { 1113 if (my $widget = $row->[$c]) {
788 $widget->size_allocate ($x, $y, $col_w, $row_h); 1114 $widget->configure ($x, $y, $col_w, $row_h);
789 } 1115 }
790 1116
791 $x += $col_w; 1117 $x += $col_w;
792 } 1118 }
793 1119
… …
838 (List::Util::max map $_->[1], @alloc), 1164 (List::Util::max map $_->[1], @alloc),
839 ) 1165 )
840} 1166}
841 1167
842sub size_allocate { 1168sub size_allocate {
843 my ($self, $x, $y, $w, $h) = @_; 1169 my ($self, $w, $h) = @_;
844
845 $self->_size_allocate ($x, $y, $w, $h);
846 1170
847 ($h, $w) = ($w, $h); 1171 ($h, $w) = ($w, $h);
848 1172
849 my $children = $self->{children}; 1173 my $children = $self->{children};
850 1174
851 my @h = map +($_->size_request)[0], @$children; 1175 my @h = map $_->{req_w}, @$children;
852 1176
853 my $req_h = List::Util::sum @h; 1177 my $req_h = List::Util::sum @h;
854 1178
855 if ($req_h > $h) { 1179 if ($req_h > $h) {
856 # ah well, not enough space 1180 # ah well, not enough space
… …
872 1196
873 my $y = 0; 1197 my $y = 0;
874 for (0 .. $#$children) { 1198 for (0 .. $#$children) {
875 my $child = $children->[$_]; 1199 my $child = $children->[$_];
876 my $h = $h[$_]; 1200 my $h = $h[$_];
877 $child->size_allocate ($y, 0, $h, $w); 1201 $child->configure ($y, 0, $h, $w);
878 1202
879 $y += $h; 1203 $y += $h;
880 } 1204 }
1205
1206 1
881} 1207}
882 1208
883############################################################################# 1209#############################################################################
884 1210
885package CFClient::UI::VBox; 1211package CFClient::UI::VBox;
… …
898 (List::Util::sum map $_->[1], @alloc), 1224 (List::Util::sum map $_->[1], @alloc),
899 ) 1225 )
900} 1226}
901 1227
902sub size_allocate { 1228sub size_allocate {
903 my ($self, $x, $y, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
904 1230
905 $self->_size_allocate ($x, $y, $w, $h); 1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
906 1232
907 my $children = $self->{children}; 1233 my $children = $self->{children};
908 1234
909 my @h = map +($_->size_request)[1], @$children; 1235 my @h = map $_->{req_h}, @$children;
910 1236
911 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
912 1238
913 if ($req_h > $h) { 1239 if ($req_h > $h) {
914 # ah well, not enough space 1240 # ah well, not enough space
… …
928 1254
929 my $y = 0; 1255 my $y = 0;
930 for (0 .. $#$children) { 1256 for (0 .. $#$children) {
931 my $child = $children->[$_]; 1257 my $child = $children->[$_];
932 my $h = $h[$_]; 1258 my $h = $h[$_];
933 $child->size_allocate (0, $y, $w, $h); 1259 $child->configure (0, $y, $w, $h);
934 1260
935 $y += $h; 1261 $y += $h;
936 } 1262 }
1263
1264 1
937} 1265}
938 1266
939############################################################################# 1267#############################################################################
940 1268
941package CFClient::UI::Label; 1269package CFClient::UI::Label;
942 1270
943our @ISA = CFClient::UI::Base::; 1271our @ISA = CFClient::UI::Base::;
944 1272
945use SDL::OpenGL; 1273use CFClient::OpenGL;
946 1274
947sub new { 1275sub new {
948 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
949 1277
950 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
951 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
952 fontsize => $::FONTSIZE, 1280 #font => default_font
953 text => "", 1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1284 fontsize => 1,
954 align => -1, 1285 align => -1,
955 valign => -1, 1286 valign => -1,
956 padding => 2, 1287 padding => 2,
957 layout => new CFClient::Layout, 1288 can_events => 0,
958 %arg 1289 %arg
959 ); 1290 );
960 1291
1292 if (exists $self->{template}) {
1293 my $layout = new CFClient::Layout;
1294 $layout->set_text (delete $self->{template});
1295 $self->{template} = $layout;
1296 }
1297
1298 if (exists $self->{markup}) {
1299 $self->set_markup (delete $self->{markup});
1300 } else {
961 $self->set_text ($self->{text}); 1301 $self->set_text (delete $self->{text});
1302 }
962 1303
963 $self 1304 $self
964} 1305}
965 1306
966sub escape_text { 1307sub escape {
967 local $_ = $_[1]; 1308 local $_ = $_[1];
968 1309
969 s/&/&amp;/g; 1310 s/&/&amp;/g;
970 s/>/&gt;/g; 1311 s/>/&gt;/g;
971 s/</&lt;/g; 1312 s/</&lt;/g;
972 1313
973 $_[1] 1314 $_[1]
974} 1315}
975 1316
1317sub update {
1318 my ($self) = @_;
1319
1320 delete $self->{texture};
1321 $self->SUPER::update;
1322}
1323
976sub set_text { 1324sub set_text {
977 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
978 1326
1327 return if $self->{text} eq "T$text";
979 $self->{text} = $text; 1328 $self->{text} = "T$text";
1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
980 $self->{layout}->set_markup ($text); 1331 $self->{layout}->set_text ($text);
981 1332
982 delete $self->{texture};
983# $self->{w} = $self->{h} = -1;
984 $self->update; 1333 $self->update;
1334 $self->check_size;
985} 1335}
986 1336
987sub get_text { 1337sub set_markup {
988 my ($self, $text) = @_; 1338 my ($self, $markup) = @_;
989 1339
990 $self->{text} 1340 return if $self->{text} eq "M$markup";
1341 $self->{text} = "M$markup";
1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1346 $self->{layout}->set_markup ($markup);
1347
1348 $self->update;
1349 $self->check_size;
991} 1350}
992 1351
993sub size_request { 1352sub size_request {
994 my ($self) = @_; 1353 my ($self) = @_;
995 1354
996 $self->{layout}->set_width; 1355 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1);
997 $self->{layout}->set_height ($self->{fontsize}); 1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358
998 my ($w, $h) = $self->{layout}->size; 1359 my ($w, $h) = $self->{layout}->size;
1360
1361 if (exists $self->{template}) {
1362 $self->{template}->set_font ($self->{font}) if $self->{font};
1363 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1364
1365 my ($w2, $h2) = $self->{template}->size;
1366
1367 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2;
1369 }
999 1370
1000 ( 1371 (
1001 $w + $self->{padding} * 2, 1372 $w + $self->{padding} * 2,
1002 $h + $self->{padding} * 2, 1373 $h + $self->{padding} * 2,
1003 ) 1374 )
1004} 1375}
1005 1376
1006sub size_allocate { 1377sub size_allocate {
1007 my ($self, $x, $y, $w, $h) = @_; 1378 my ($self, $w, $h) = @_;
1008
1009 $self->_size_allocate ($x, $y, $w, $h) or return;
1010 1379
1011 delete $self->{texture}; 1380 delete $self->{texture};
1012} 1381}
1013 1382
1014sub update { 1383sub set_fontsize {
1015 my ($self) = @_; 1384 my ($self, $fontsize) = @_;
1016 1385
1386 $self->{fontsize} = $fontsize;
1017 delete $self->{texture}; 1387 delete $self->{texture};
1388
1018 $self->SUPER::update; 1389 $self->update;
1390 $self->check_size;
1019} 1391}
1020 1392
1021sub _draw { 1393sub _draw {
1022 my ($self) = @_; 1394 my ($self) = @_;
1023 1395
1024 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1025 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1026 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1401
1027 new_from_layout CFClient::Texture $self->{layout} 1402 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5);
1407
1408 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5);
1411
1412 $tex
1028 }; 1413 };
1029 1414
1030 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1032 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1034 1417
1418 if ($tex->{format} == GL_ALPHA) {
1035 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1036 1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1037 my $x = 1421 } else {
1038 $self->{align} < 0 ? $self->{padding} 1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1423 }
1040 : ($self->{w} - $tex->{w}) * 0.5;
1041
1042 my $y =
1043 $self->{valign} < 0 ? $self->{padding}
1044 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045 : ($self->{h} - $tex->{h}) * 0.5;
1046
1047 $tex->draw_quad (int $x, int $y);
1048 1424
1049 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1050 glDisable GL_BLEND;
1051} 1426}
1052 1427
1053############################################################################# 1428#############################################################################
1054 1429
1055package CFClient::UI::Entry; 1430package CFClient::UI::EntryBase;
1056 1431
1057our @ISA = CFClient::UI::Label::; 1432our @ISA = CFClient::UI::Label::;
1058 1433
1059use SDL; 1434use CFClient::OpenGL;
1060use SDL::OpenGL;
1061 1435
1062sub new { 1436sub new {
1063 my $class = shift; 1437 my $class = shift;
1064 1438
1065 $class->SUPER::new ( 1439 $class->SUPER::new (
1066 fg => [1, 1, 1], 1440 fg => [1, 1, 1],
1067 bg => [0, 0, 0, 0.2], 1441 bg => [0, 0, 0, 0.2],
1068 active_bg => [1, 1, 1, 0.5], 1442 active_bg => [1, 1, 1, 0.5],
1069 active_fg => [0, 0, 0], 1443 active_fg => [0, 0, 0],
1070 can_hover => 1, 1444 can_hover => 1,
1071 can_focus => 1, 1445 can_focus => 1,
1072 valign => 0, 1446 valign => 0,
1447 can_events => 1,
1073 @_ 1448 @_
1074 ) 1449 )
1075} 1450}
1076 1451
1077sub _set_text { 1452sub _set_text {
1078 my ($self, $text) = @_; 1453 my ($self, $text) = @_;
1079 1454
1080 my $old_text = $self->{text}; 1455 delete $self->{cur_h};
1456
1457 return if $self->{text} eq $text;
1458
1459 delete $self->{texture};
1081 1460
1082 $self->{last_activity} = $::NOW; 1461 $self->{last_activity} = $::NOW;
1083
1084 $self->{text} = $text; 1462 $self->{text} = $text;
1085 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1087 1463
1088 $text =~ s/./*/g if $self->{hidden}; 1464 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text ");
1089 1466
1090 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1467 $self->emit (changed => $self->{text});
1091
1092 $text = substr $text, 0, $self->{cursor};
1093 utf8::encode $text;
1094
1095 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1096
1097 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1098 if $old_text ne $self->{text};
1099}
1100
1101sub size_request {
1102 my ($self) = @_;
1103
1104 my ($w, $h) = $self->SUPER::size_request;
1105
1106 ($w + 1, $h) # add 1 for cursor
1107}
1108
1109sub size_allocate {
1110 my ($self, $x, $y, $w, $h) = @_;
1111
1112 $self->SUPER::size_allocate ($x, $y, $w, $h);
1113
1114 $self->_set_text ($self->{text});
1115} 1468}
1116 1469
1117sub set_text { 1470sub set_text {
1118 my ($self, $text) = @_; 1471 my ($self, $text) = @_;
1119 1472
1120 $self->{cursor} = length $text; 1473 $self->{cursor} = length $text;
1121 $self->_set_text ($text); 1474 $self->_set_text ($text);
1122 $self->update; 1475 $self->update;
1476 $self->check_size;
1477}
1478
1479sub get_text {
1480 $_[0]{text}
1481}
1482
1483sub size_request {
1484 my ($self) = @_;
1485
1486 my ($w, $h) = $self->SUPER::size_request;
1487
1488 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1123} 1495}
1124 1496
1125sub key_down { 1497sub key_down {
1126 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1127 1499
1128 my $mod = $ev->key_mod; 1500 my $mod = $ev->{mod};
1129 my $sym = $ev->key_sym; 1501 my $sym = $ev->{sym};
1130
1131 my $uni = $ev->key_unicode; 1502 my $uni = $ev->{unicode};
1132 1503
1133 my $text = $self->get_text; 1504 my $text = $self->get_text;
1134 1505
1135 if ($sym == SDLK_BACKSPACE) { 1506 if ($uni == 8) {
1136 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1137 } elsif ($sym == SDLK_DELETE) { 1508 } elsif ($uni == 127) {
1138 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1139 } elsif ($sym == SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1140 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1141 } elsif ($sym == SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1142 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1143 } elsif ($sym == SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1144 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1145 } elsif ($sym == SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1146 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1147 } elsif ($sym == SDLK_ESCAPE) { 1518 } elsif ($uni == 27) {
1148 $self->emit ('escape'); 1519 $self->emit ('escape');
1149 } elsif ($uni) { 1520 } elsif ($uni) {
1150 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1151 } 1522 }
1152 1523
1153 $self->_set_text ($text); 1524 $self->_set_text ($text);
1154 $self->update; 1525 $self->update;
1526 $self->check_size;
1155} 1527}
1156 1528
1157sub focus_in { 1529sub focus_in {
1158 my ($self) = @_; 1530 my ($self) = @_;
1159 1531
… …
1207 1579
1208 $self->SUPER::_draw; 1580 $self->SUPER::_draw;
1209 1581
1210 #TODO: force update every cursor change :( 1582 #TODO: force update every cursor change :(
1211 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1583 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1584
1585 unless (exists $self->{cur_h}) {
1586 my $text = substr $self->{text}, 0, $self->{cursor};
1587 utf8::encode $text;
1588
1589 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1590 }
1591
1212 glColor @{$self->{fg}}; 1592 glColor @{$self->{fg}};
1213 glBegin GL_LINES; 1593 glBegin GL_LINES;
1214 glVertex $self->{cur_x}, $self->{cur_y};
1215 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1594 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1595 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1216 glEnd; 1596 glEnd;
1217 } 1597 }
1218} 1598}
1219 1599
1220package CFClient::UI::LineEntry; 1600package CFClient::UI::Entry;
1221 1601
1222our @ISA = CFClient::UI::Entry::; 1602our @ISA = CFClient::UI::EntryBase::;
1223 1603
1224use SDL; 1604use CFClient::OpenGL;
1225use SDL::OpenGL;
1226 1605
1227sub key_down { 1606sub key_down {
1228 my ($self, $ev) = @_; 1607 my ($self, $ev) = @_;
1229 1608
1230 my $sym = $ev->key_sym; 1609 my $sym = $ev->{sym};
1231 1610
1232 if ($sym == SDLK_RETURN) { 1611 if ($sym == 13) {
1612 unshift @{$self->{history}},
1613 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = '';
1233 $self->emit (activate => $self->get_text); 1616 $self->emit (activate => $txt);
1234 $self->update; 1617 $self->update;
1618
1619 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text;
1622 }
1623 if (@{$self->{history} || []} > 0) {
1624 $self->{history_pointer}++;
1625 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1626 $self->{history_pointer} = @{$self->{history} || []} - 1;
1627 }
1628 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1629 }
1630
1631 } elsif ($sym == CFClient::SDLK_DOWN) {
1632 $self->{history_pointer}--;
1633 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1634
1635 if ($self->{history_pointer} >= 0) {
1636 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1637 } else {
1638 $self->set_text ($self->{history_saveback});
1639 }
1235 1640
1236 } else { 1641 } else {
1237 $self->SUPER::key_down ($ev); 1642 $self->SUPER::key_down ($ev);
1238 } 1643 }
1239 1644
… …
1243 1648
1244package CFClient::UI::Button; 1649package CFClient::UI::Button;
1245 1650
1246our @ISA = CFClient::UI::Label::; 1651our @ISA = CFClient::UI::Label::;
1247 1652
1248use SDL; 1653use CFClient::OpenGL;
1249use SDL::OpenGL;
1250 1654
1251my @tex = 1655my @tex =
1252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1656 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1253 qw(b1_button_active.png); 1657 qw(b1_button_active.png);
1254 1658
1255sub new { 1659sub new {
1256 my $class = shift; 1660 my $class = shift;
1257 1661
1258 $class->SUPER::new ( 1662 $class->SUPER::new (
1259 padding => 4, 1663 padding => 4,
1260 fg => [1, 1, 1], 1664 fg => [1, 1, 1],
1261 bg => [1, 1, 1, 0.2], 1665 bg => [1, 1, 1, 0.2],
1262 active_fg => [1, 1, 0], 1666 active_fg => [0, 0, 1],
1263 can_hover => 1, 1667 can_hover => 1,
1668 align => 0,
1669 valign => 0,
1670 can_events => 1,
1264 @_ 1671 @_
1265 ) 1672 )
1266} 1673}
1267 1674
1268sub button_up { 1675sub button_up {
… …
1276 1683
1277sub _draw { 1684sub _draw {
1278 my ($self) = @_; 1685 my ($self) = @_;
1279 1686
1280 local $self->{fg} = $self->{fg}; 1687 local $self->{fg} = $self->{fg};
1281 my $tex = $tex[0];
1282
1283 glEnable GL_BLEND;
1284 glEnable GL_TEXTURE_2D;
1285 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1286 1688
1287 if ($GRAB == $self) { 1689 if ($GRAB == $self) {
1288 $self->{fg} = $self->{active_fg}; 1690 $self->{fg} = $self->{active_fg};
1289 } 1691 }
1290 1692
1291 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1693 glEnable GL_TEXTURE_2D;
1292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 glColor 0, 0, 0, 1;
1293 1696
1294 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1697 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1295 1698
1296 glDisable GL_TEXTURE_2D; 1699 glDisable GL_TEXTURE_2D;
1297 glDisable GL_BLEND;
1298 1700
1299 $self->SUPER::_draw; 1701 $self->SUPER::_draw;
1300} 1702}
1301 1703
1302############################################################################# 1704#############################################################################
… …
1304package CFClient::UI::CheckBox; 1706package CFClient::UI::CheckBox;
1305 1707
1306our @ISA = CFClient::UI::DrawBG::; 1708our @ISA = CFClient::UI::DrawBG::;
1307 1709
1308my @tex = 1710my @tex =
1309 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1711 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1310 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1712 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1311 1713
1312use SDL; 1714use CFClient::OpenGL;
1313use SDL::OpenGL;
1314 1715
1315sub new { 1716sub new {
1316 my $class = shift; 1717 my $class = shift;
1317 1718
1318 $class->SUPER::new ( 1719 $class->SUPER::new (
… …
1329 my ($self) = @_; 1730 my ($self) = @_;
1330 1731
1331 ($self->{padding} * 2 + 6) x 2 1732 ($self->{padding} * 2 + 6) x 2
1332} 1733}
1333 1734
1334sub size_allocate {
1335 my ($self, $x, $y, $w, $h) = @_;
1336
1337 $self->_size_allocate ($x, $y, $w, $h);
1338}
1339
1340sub button_down { 1735sub button_down {
1341 my ($self, $ev, $x, $y) = @_; 1736 my ($self, $ev, $x, $y) = @_;
1342 1737
1343 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1344 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1356 1751
1357 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1358 1753
1359 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1360 1755
1756 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1758 glEnable GL_TEXTURE_2D;
1759 $tex->draw_quad_alpha (0, 0, $s, $s);
1760 glDisable GL_TEXTURE_2D;
1761}
1762
1763#############################################################################
1764
1765package CFClient::UI::Image;
1766
1767our @ISA = CFClient::UI::Base::;
1768
1769use CFClient::OpenGL;
1770use Carp qw/confess/;
1771
1772our %loaded_images;
1773
1774sub new {
1775 my $class = shift;
1776
1777 my $self = $class->SUPER::new (can_events => 0, @_);
1778
1779 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1780
1781 $loaded_images{$self->{image}} ||=
1782 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1783
1784 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1785
1786 Scalar::Util::weaken $loaded_images{$self->{image}};
1787
1788 $self->{aspect} = $tex->{w} / $tex->{h};
1789
1790 $self
1791}
1792
1793sub size_request {
1794 my ($self) = @_;
1795
1796 ($self->{tex}->{w}, $self->{tex}->{h})
1797}
1798
1799sub _draw {
1800 my ($self) = @_;
1801
1802 my $tex = $self->{tex};
1803
1804 my ($w, $h) = ($self->{w}, $self->{h});
1805
1806 if ($self->{rot90}) {
1807 glRotate 90, 0, 0, 1;
1808 glTranslate 0, -$self->{w}, 0;
1809
1810 ($w, $h) = ($h, $w);
1811 }
1812
1813 glEnable GL_TEXTURE_2D;
1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1815
1816 $tex->draw_quad_alpha (0, 0, $w, $h);
1817
1818 glDisable GL_TEXTURE_2D;
1819}
1820
1821#############################################################################
1822
1823package CFClient::UI::VGauge;
1824
1825our @ISA = CFClient::UI::Base::;
1826
1827use List::Util qw(min max);
1828
1829use CFClient::OpenGL;
1830
1831my %tex = (
1832 food => [
1833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1834 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1835 ],
1836 grace => [
1837 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1838 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1839 ],
1840 hp => [
1841 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1842 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1843 ],
1844 mana => [
1845 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1846 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1847 ],
1848);
1849
1850# eg. VGauge->new (gauge => 'food'), default gauge: food
1851sub new {
1852 my $class = shift;
1853
1854 my $self = $class->SUPER::new (
1855 type => 'food',
1856 @_
1857 );
1858
1859 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1860
1861 $self
1862}
1863
1864sub size_request {
1865 my ($self) = @_;
1866
1867 #my $tex = $tex{$self->{type}}[0];
1868 #@$tex{qw(w h)}
1869 (0, 0)
1870}
1871
1872sub set_max {
1873 my ($self, $max) = @_;
1874
1875 return if $self->{max_val} == $max;
1876
1877 $self->{max_val} = $max;
1878 $self->update;
1879}
1880
1881sub set_value {
1882 my ($self, $val, $max) = @_;
1883
1884 $self->set_max ($max)
1885 if defined $max;
1886
1887 return if $self->{val} == $val;
1888
1889 $self->{val} = $val;
1890 $self->update;
1891}
1892
1893sub _draw {
1894 my ($self) = @_;
1895
1896 my $tex = $tex{$self->{type}};
1897 my ($t1, $t2, $t3) = @$tex;
1898
1899 my ($w, $h) = ($self->{w}, $self->{h});
1900
1901 if ($self->{vertical}) {
1902 glRotate 90, 0, 0, 1;
1903 glTranslate 0, -$self->{w}, 0;
1904
1905 ($w, $h) = ($h, $w);
1906 }
1907
1908 my $ycut = $self->{val} / ($self->{max_val} || 1);
1909
1910 my $ycut1 = max 0, min 1, $ycut;
1911 my $ycut2 = max 0, min 1, $ycut - 1;
1912
1913 my $h1 = $self->{h} * (1 - $ycut1);
1914 my $h2 = $self->{h} * (1 - $ycut2);
1915
1361 glEnable GL_BLEND; 1916 glEnable GL_BLEND;
1917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1362 glEnable GL_TEXTURE_2D; 1918 glEnable GL_TEXTURE_2D;
1363 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1364 1920
1365 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1921 glBindTexture GL_TEXTURE_2D, $t1->{name};
1922 glBegin GL_QUADS;
1923 glTexCoord 0 , 0; glVertex 0 , 0;
1924 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1925 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1926 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1927 glEnd;
1366 1928
1367 $tex->draw_quad (0, 0, $s, $s); 1929 my $ycut1 = List::Util::min 1, $ycut;
1930 glBindTexture GL_TEXTURE_2D, $t2->{name};
1931 glBegin GL_QUADS;
1932 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1933 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1934 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1935 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1936 glEnd;
1368 1937
1938 if ($t3) {
1939 glBindTexture GL_TEXTURE_2D, $t3->{name};
1940 glBegin GL_QUADS;
1941 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1942 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1943 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1944 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1945 glEnd;
1946 }
1947
1948 glDisable GL_BLEND;
1369 glDisable GL_TEXTURE_2D; 1949 glDisable GL_TEXTURE_2D;
1370 glDisable GL_BLEND; 1950}
1951
1952#############################################################################
1953
1954package CFClient::UI::Gauge;
1955
1956our @ISA = CFClient::UI::VBox::;
1957
1958sub new {
1959 my ($class, %arg) = @_;
1960
1961 my $self = $class->SUPER::new (
1962 tooltip => $arg{type},
1963 can_hover => 1,
1964 can_events => 1,
1965 %arg,
1966 );
1967
1968 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1969 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1970 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1971
1972 $self
1973}
1974
1975sub set_fontsize {
1976 my ($self, $fsize) = @_;
1977
1978 $self->{value}->set_fontsize ($fsize);
1979 $self->{max} ->set_fontsize ($fsize);
1980}
1981
1982sub set_max {
1983 my ($self, $max) = @_;
1984
1985 $self->{gauge}->set_max ($max);
1986 $self->{max}->set_text ($max);
1987}
1988
1989sub set_value {
1990 my ($self, $val, $max) = @_;
1991
1992 $self->set_max ($max)
1993 if defined $max;
1994
1995 $self->{gauge}->set_value ($val, $max);
1996 $self->{value}->set_text ($val);
1371} 1997}
1372 1998
1373############################################################################# 1999#############################################################################
1374 2000
1375package CFClient::UI::Slider; 2001package CFClient::UI::Slider;
1376 2002
1377use strict; 2003use strict;
1378 2004
1379use SDL::OpenGL; 2005use CFClient::OpenGL;
1380 2006
1381our @ISA = CFClient::UI::DrawBG::; 2007our @ISA = CFClient::UI::DrawBG::;
1382 2008
1383my @tex = 2009my @tex =
1384 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1385 qw(s1_slider.png s1_slider_bg.png); 2011 qw(s1_slider.png s1_slider_bg.png);
1386 2012
1387sub new { 2013sub new {
1388 my $class = shift; 2014 my $class = shift;
1389 2015
1390 # range [value, low, high, page] 2016 # range [value, low, high, page, unit]
1391 2017
1392 # TODO: 0-width page 2018 # TODO: 0-width page
1393 # TODO: req_w/h are wrong with vertical 2019 # TODO: req_w/h are wrong with vertical
1394 # TODO: calculations are off 2020 # TODO: calculations are off
1395 my $self = $class->SUPER::new ( 2021 my $self = $class->SUPER::new (
1396 fg => [1, 1, 1], 2022 fg => [1, 1, 1],
1397 active_fg => [0, 0, 0], 2023 active_fg => [0, 0, 0],
1398 range => [0, 0, 100, 10], 2024 range => [0, 0, 100, 10],
1399 req_w => 40, 2025 req_w => $::WIDTH / 80,
1400 req_h => 13, 2026 req_h => $::WIDTH / 80,
1401 vertical => 0, 2027 vertical => 0,
1402 can_hover => 1, 2028 can_hover => 1,
1403 inner_pad => 5, 2029 inner_pad => .05,
1404 @_ 2030 @_
1405 ); 2031 );
1406 2032
2033 $self->set_value ($self->{range}[0]);
2034 $self->update;
2035
1407 $self 2036 $self
2037}
2038
2039sub set_value {
2040 my ($self, $value) = @_;
2041
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043
2044 $hi = $lo + 1 if $hi <= $lo;
2045
2046 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi;
2048
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit;
2051
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055
2056 if ($value != $old_value) {
2057 $self->emit (changed => $value);
2058 $self->update;
2059 }
1408} 2060}
1409 2061
1410sub size_request { 2062sub size_request {
1411 my ($self) = @_; 2063 my ($self) = @_;
1412 2064
… …
1425 2077
1426sub mouse_motion { 2078sub mouse_motion {
1427 my ($self, $ev, $x, $y) = @_; 2079 my ($self, $ev, $x, $y) = @_;
1428 2080
1429 if ($GRAB == $self) { 2081 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083
2084 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2087
2088 $self->set_value ($x * ($hi - $lo) + $lo);
2089 }
2090}
2091
2092sub update {
2093 my ($self) = @_;
2094
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]);
2097
1430 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2098 my ($value, $lo, $hi, $page) = @{$self->{range}};
1431 2099
1432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2100 my $inner_w = 1 - 2 * $self->{inner_pad};
1433 2101
1434 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1435 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1436 2103
1437 $x -= $inner_pad_px; # substract the padding 2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1438 $x = $x * ($hi - $lo) / $inner_w + $lo; 2105 $value = $self->{scale} * ($value - $lo);
1439 $x = $lo if $x < $lo;
1440 $x = $hi - $page if $x > $hi - $page;
1441 $self->{range}[0] = $x;
1442 2106
1443 $self->emit (changed => $x); 2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
1444 $self->update; 2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value;
2113 $self->{knob_w} = $page;
1445 } 2114 });
1446}
1447 2115
1448# the inner_* stuff is for generating a padding for the slider handle, 2116 $self->SUPER::update;
1449# so that the handle doesn't leave the texture. This calculation isn't 100%
1450# correct propably, but it does the job for now
1451sub _calc_inner_pad_px {
1452 my ($self, $w) = @_;
1453 ($w / 100) * $self->{inner_pad} # % to pixels
1454} 2117}
1455 2118
1456sub _draw { 2119sub _draw {
1457 my ($self) = @_; 2120 my ($self) = @_;
1458 2121
1459 $self->SUPER::_draw (); 2122 $self->SUPER::_draw ();
1460 2123
1461 my ($w, $h) = @$self{qw(w h)}; 2124 glScale $self->{w}, $self->{h};
1462 2125
1463 if ($self->{vertical}) { 2126 if ($self->{vertical}) {
1464 # draw a vertical slider like a rotated horizontal slider 2127 # draw a vertical slider like a rotated horizontal slider
1465 2128
1466 glRotate 90, 0, 0, 1; 2129 glRotate 90, 0, 0, 1;
1467 glTranslate 0, -$self->{w}, 0; 2130 glTranslate 0, 1, 0;
1468
1469 ($w, $h) = ($h, $w);
1470 } 2131 }
1471 2132
1472 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1473 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1474 2135
1475 my ($value, $lo, $hi, $page) = @{$self->{range}};
1476
1477 $hi = $value + 1 if $lo == $hi;
1478
1479 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1480 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1481
1482 $page = int $page * $inner_w / ($hi - $lo);
1483 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1484
1485 $w -= $page;
1486 $page &= ~1;
1487 glTranslate $page * 0.5, 0, 0;
1488 $page ||= 2;
1489
1490 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1491 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1492
1493 glEnable GL_BLEND;
1494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1495 glEnable GL_TEXTURE_2D; 2136 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1497 2138
1498 # draw background 2139 # draw background
1499 $tex[1]->draw_quad (0, 0, $w, $h); 2140 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1500 2141
1501 # draw handle 2142 # draw handle
1502 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1503 2144
1504 glDisable GL_BLEND;
1505 glDisable GL_TEXTURE_2D; 2145 glDisable GL_TEXTURE_2D;
1506} 2146}
1507 2147
1508############################################################################# 2148#############################################################################
1509 2149
1510package CFClient::UI::TextView; 2150package CFClient::UI::TextView;
1511 2151
1512our @ISA = CFClient::UI::HBox::; 2152our @ISA = CFClient::UI::HBox::;
1513 2153
1514use SDL::OpenGL; 2154use CFClient::OpenGL;
1515 2155
1516sub new { 2156sub new {
1517 my $class = shift; 2157 my $class = shift;
1518 2158
1519 my $self = $class->SUPER::new ( 2159 my $self = $class->SUPER::new (
1520 req_w => $::WIDTH / 6, 2160 fontsize => 1,
1521 req_h => $::HEIGHT / 6, 2161 can_events => 0,
1522 fontsize => $::FONTSIZE, 2162 #font => default_font
1523 @_, 2163 @_,
1524 2164
1525 layout => (new CFClient::Layout), 2165 layout => (new CFClient::Layout 1),
1526 par => [], 2166 par => [],
1527 height => 0, 2167 height => 0,
1528 children => [ 2168 children => [
1529 (new CFClient::UI::Empty expand => 1), 2169 (new CFClient::UI::Empty expand => 1),
1530 (new CFClient::UI::Slider vertical => 1), 2170 (new CFClient::UI::Slider vertical => 1),
1531 ], 2171 ],
1532 ); 2172 );
1533 2173
1534 $self->{children}[1]->connect (changed => sub { 2174 $self->{children}[1]->connect (changed => sub { $self->update });
1535 $self->update;
1536 });
1537 2175
1538 $self 2176 $self
1539} 2177}
1540 2178
1541sub set_fontsize { 2179sub set_fontsize {
… …
1548sub text_height { 2186sub text_height {
1549 my ($self, $text) = @_; 2187 my ($self, $text) = @_;
1550 2188
1551 my $layout = $self->{layout}; 2189 my $layout = $self->{layout};
1552 2190
1553 $layout->set_height ($self->{fontsize}); 2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1554 $layout->set_width ($self->{w}); 2192 $layout->set_width ($self->{children}[0]{w});
1555 $layout->set_text ($text); 2193 $layout->set_markup ($text);
1556 2194
1557 ($layout->size)[1] 2195 ($layout->size)[1]
1558} 2196}
1559 2197
1560sub reflow { 2198sub reflow {
… …
1562 2200
1563 $self->{need_reflow}++; 2201 $self->{need_reflow}++;
1564 $self->update; 2202 $self->update;
1565} 2203}
1566 2204
1567sub size_request {
1568 my ($self) = @_;
1569
1570 ($self->{req_w}, $self->{req_h})
1571}
1572
1573sub size_allocate { 2205sub size_allocate {
1574 my ($self, $x, $y, $w, $h) = @_; 2206 my ($self, $w, $h) = @_;
1575 2207
1576 $self->SUPER::size_allocate ($x, $y, $w, $h); 2208 $self->SUPER::size_allocate ($w, $h);
1577 2209
2210 $self->{layout}->set_font ($self->{font}) if $self->{font};
1578 $self->{layout}->set_height ($self->{fontsize}); 2211 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 $self->{layout}->set_width ($self->{w}); 2212 $self->{layout}->set_width ($self->{children}[0]{w});
1580 2213
1581 $self->reflow; 2214 $self->reflow;
1582} 2215}
1583 2216
1584sub add_paragraph { 2217sub add_paragraph {
… …
1603 2236
1604 return unless $self->{h} > 0; 2237 return unless $self->{h} > 0;
1605 2238
1606 delete $self->{texture}; 2239 delete $self->{texture};
1607 2240
1608 $ROOT->on_refresh ($self, sub { 2241 $ROOT->on_post_alloc ($self, sub {
1609 if (delete $self->{need_reflow}) { 2242 if (delete $self->{need_reflow}) {
1610 my $height = 0; 2243 my $height = 0;
1611 2244
1612 $height += $_->[0] = $self->text_height ($_->[2]) 2245 $height += $_->[0] = $self->text_height ($_->[2])
1613 for @{$self->{par}}; 2246 for @{$self->{par}};
… …
1617 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1618 2251
1619 delete $self->{texture}; 2252 delete $self->{texture};
1620 } 2253 }
1621 2254
1622 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1623 glClearColor 0, 0, 0, 1; 2256 glClearColor 0, 0, 0, 0;
1624 glClear GL_COLOR_BUFFER_BIT; 2257 glClear GL_COLOR_BUFFER_BIT;
1625 2258
1626 glEnable GL_BLEND;
1627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1628 glEnable GL_TEXTURE_2D; 2259 glEnable GL_TEXTURE_2D;
1629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1630 2261
1631 my $top = int $self->{children}[1]{range}[0]; 2262 my $top = int $self->{children}[1]{range}[0];
1632 2263
… …
1635 2266
1636 my $y = 0; 2267 my $y = 0;
1637 2268
1638 my $layout = $self->{layout}; 2269 my $layout = $self->{layout};
1639 2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272
1640 for my $par (@{$self->{par}}) { 2273 for my $par (@{$self->{par}}) {
1641 my $h = $par->[0]; 2274 my $h = $par->[0];
1642 2275
1643 if ($y0 < $y + $h && $y < $y1) { 2276 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] });
1644 $layout->set_text ($par->[2]); 2278 $layout->set_markup ($par->[2]);
1645 2279
1646 glColor @{ $par->[1] };
1647 my ($W, $H) = $layout->size; 2280 my ($W, $H) = $layout->size;
1648 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1649 } 2282 }
1650 2283
1651 $y += $h; 2284 $y += $h;
1652 } 2285 }
1653 2286
1654 glDisable GL_TEXTURE_2D; 2287 glDisable GL_TEXTURE_2D;
1655 glDisable GL_BLEND;
1656 }; 2288 };
1657 }); 2289 });
1658} 2290}
1659 2291
1660sub _draw { 2292sub _draw {
1661 my ($self) = @_; 2293 my ($self) = @_;
1662 2294
1663 if ($self->{texture}) {
1664 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
1665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1666 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2297 glColor 1, 1, 1, 1;
2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1667 glDisable GL_TEXTURE_2D; 2299 glDisable GL_TEXTURE_2D;
1668 }
1669 2300
1670 $self->{children}[1]->draw; 2301 $self->{children}[1]->draw;
1671 2302
1672} 2303}
1673 2304
1674############################################################################# 2305#############################################################################
1675 2306
1676package CFClient::UI::MapWidget;
1677
1678use strict;
1679
1680use List::Util qw(min max);
1681
1682use SDL;
1683use SDL::OpenGL;
1684
1685our @ISA = CFClient::UI::Base::;
1686
1687sub new {
1688 my $class = shift;
1689
1690 $class->SUPER::new (
1691 z => -1,
1692 can_focus => 1,
1693 list => (glGenLists 1),
1694 @_
1695 )
1696}
1697
1698sub key_down {
1699 print "MAPKEYDOWN\n";
1700}
1701
1702sub key_up {
1703}
1704
1705sub button_down {
1706 my ($self, $ev, $x, $y) = @_;
1707
1708 $self->focus_in;
1709
1710 if ($ev->button == 2) {
1711 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1712 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1713
1714 $self->{motion} = sub {
1715 my ($ev, $x, $y) = @_;
1716
1717 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1718
1719 $::CFG->{map_shift_x} = $bw + $x - $ox;
1720 $::CFG->{map_shift_y} = $bh + $y - $oy;
1721
1722 $self->update;
1723 };
1724 }
1725}
1726
1727sub button_up {
1728 my ($self, $ev, $x, $y) = @_;
1729
1730 delete $self->{motion};
1731}
1732
1733sub mouse_motion {
1734 my ($self, $ev, $x, $y) = @_;
1735
1736 $self->{motion}->($ev, $x, $y) if $self->{motion};
1737}
1738
1739sub size_request {
1740 (
1741 1 + 32 * int $::WIDTH / 32,
1742 1 + 32 * int $::HEIGHT / 32,
1743 )
1744}
1745
1746sub update {
1747 my ($self) = @_;
1748
1749 $self->{need_update} = 1;
1750 $self->SUPER::update;
1751}
1752
1753sub draw {
1754 my ($self) = @_;
1755
1756 if (delete $self->{need_update}) {
1757 glNewList $self->{list}, GL_COMPILE;
1758
1759 if ($::MAP) {
1760 my $sw = int $::WIDTH / 32;
1761 my $sh = int $::HEIGHT / 32;
1762
1763 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1764 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1765
1766 glTranslate $sx0 - 32, $sy0 - 32, 0;
1767
1768 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1769
1770 if ($::CFG->{fow_enable}) {
1771 if ($::CFG->{fow_smooth}) { # smooth fog of war
1772 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1773 glConvolutionFilter2D
1774 GL_CONVOLUTION_2D,
1775 GL_ALPHA,
1776 3, 3,
1777 GL_ALPHA, GL_FLOAT,
1778 pack "f*",
1779 0.1, 0.1, 0.1,
1780 0.1, 0.2, 0.1,
1781 0.1, 0.1, 0.1,
1782 ;
1783 glEnable GL_CONVOLUTION_2D;
1784 }
1785
1786 my $tex = new CFClient::Texture
1787 w => $w,
1788 h => $h,
1789 data => $data,
1790 internalformat => GL_ALPHA,
1791 format => GL_ALPHA;
1792
1793 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1794
1795 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797 glEnable GL_TEXTURE_2D;
1798 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1799
1800 glColor +($::CFG->{fow_intensity}) x 3, 1;
1801 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1802
1803 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805 }
1806
1807 # HACK BEGIN
1808 {
1809 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1810 my ($w, $h) = (250, 250);
1811
1812 glEnable GL_BLEND;
1813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1814 glEnable GL_TEXTURE_2D;
1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1816
1817 CFClient::Texture->new (
1818 w => $w,
1819 h => $h,
1820 data => $::MAP->mapmap ($w, $h),
1821 type => GL_UNSIGNED_INT_8_8_8_8_REV
1822 )->draw_quad (100, 100);
1823
1824 glDisable GL_TEXTURE_2D;
1825 glDisable GL_BLEND;
1826 }
1827 # HACK END
1828 }
1829
1830 glEndList;
1831 }
1832
1833 glPushMatrix;
1834 glCallList $self->{list};
1835 glPopMatrix;
1836
1837 if ($FOCUS != $self) {
1838 glColor 64/255, 64/255, 64/255;
1839 glLogicOp GL_AND;
1840 glEnable GL_COLOR_LOGIC_OP;
1841 glBegin GL_QUADS;
1842 glVertex 0, 0;
1843 glVertex 0, $::HEIGHT;
1844 glVertex $::WIDTH, $::HEIGHT;
1845 glVertex $::WIDTH, 0;
1846 glEnd;
1847 glDisable GL_COLOR_LOGIC_OP;
1848 }
1849}
1850
1851my %DIR = (
1852 SDLK_KP8, [1, "north"],
1853 SDLK_KP9, [2, "northeast"],
1854 SDLK_KP6, [3, "east"],
1855 SDLK_KP3, [4, "southeast"],
1856 SDLK_KP2, [5, "south"],
1857 SDLK_KP1, [6, "southwest"],
1858 SDLK_KP4, [7, "west"],
1859 SDLK_KP7, [8, "northwest"],
1860
1861 SDLK_UP, [1, "north"],
1862 SDLK_RIGHT, [3, "east"],
1863 SDLK_DOWN, [5, "south"],
1864 SDLK_LEFT, [7, "west"],
1865);
1866
1867sub key_down {
1868 my ($self, $ev) = @_;
1869
1870 my $mod = $ev->key_mod;
1871 my $sym = $ev->key_sym;
1872
1873 if ($sym == SDLK_KP5) {
1874 $::CONN->user_send ("command stay fire");
1875 } elsif ($sym == SDLK_a) {
1876 $::CONN->user_send ("command apply");
1877 } elsif ($sym == SDLK_QUOTE) {
1878 $self->emit ('activate_console');
1879 } elsif ($sym == SDLK_SLASH) {
1880 $self->emit ('activate_console' => '/');
1881 } elsif (exists $DIR{$sym}) {
1882 if ($mod & KMOD_SHIFT) {
1883 $self->{shft}++;
1884 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1885 } elsif ($mod & KMOD_CTRL) {
1886 $self->{ctrl}++;
1887 $::CONN->user_send ("command run $DIR{$sym}[0]");
1888 } else {
1889 $::CONN->user_send ("command $DIR{$sym}[1]");
1890 }
1891 }
1892}
1893
1894sub key_up {
1895 my ($self, $ev) = @_;
1896
1897 my $mod = $ev->key_mod;
1898 my $sym = $ev->key_sym;
1899
1900 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1901 $::CONN->user_send ("command fire_stop");
1902 }
1903 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1904 $::CONN->user_send ("command run_stop");
1905 }
1906}
1907
1908#############################################################################
1909
1910package CFClient::UI::Animator; 2307package CFClient::UI::Animator;
1911 2308
1912use SDL::OpenGL; 2309use CFClient::OpenGL;
1913 2310
1914our @ISA = CFClient::UI::Bin::; 2311our @ISA = CFClient::UI::Bin::;
1915 2312
1916sub moveto { 2313sub moveto {
1917 my ($self, $x, $y) = @_; 2314 my ($self, $x, $y) = @_;
… …
1955 2352
1956sub new { 2353sub new {
1957 my $class = shift; 2354 my $class = shift;
1958 2355
1959 my $self = $class->SUPER::new ( 2356 my $self = $class->SUPER::new (
1960 state => 0, 2357 state => 0,
1961 connect_activate => \&toggle_flopper, 2358 connect_activate => \&toggle_flopper,
1962 @_ 2359 @_
1963 ); 2360 );
1964 2361
1965 if ($self->{state}) { 2362 if ($self->{state}) {
… …
1986 $self->emit (changed => $self->{state}); 2383 $self->emit (changed => $self->{state});
1987} 2384}
1988 2385
1989############################################################################# 2386#############################################################################
1990 2387
2388package CFClient::UI::Tooltip;
2389
2390our @ISA = CFClient::UI::Bin::;
2391
2392use CFClient::OpenGL;
2393
2394sub new {
2395 my $class = shift;
2396
2397 $class->SUPER::new (
2398 @_,
2399 can_events => 0,
2400 )
2401}
2402
2403sub set_tooltip_from {
2404 my ($self, $widget) = @_;
2405
2406 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip},
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8,
2410 fg => [0, 0, 0, 1],
2411 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 );
2413}
2414
2415sub size_request {
2416 my ($self) = @_;
2417
2418 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2419
2420 ($w + 4, $h + 4)
2421}
2422
2423sub size_allocate {
2424 my ($self, $w, $h) = @_;
2425
2426 $self->SUPER::size_allocate ($w - 4, $h - 4);
2427}
2428
2429sub _draw {
2430 my ($self) = @_;
2431
2432 glTranslate 0.375, 0.375;
2433
2434 my ($w, $h) = @$self{qw(w h)};
2435
2436 glColor 1, 0.8, 0.4;
2437 glBegin GL_QUADS;
2438 glVertex 0 , 0;
2439 glVertex 0 , $h;
2440 glVertex $w, $h;
2441 glVertex $w, 0;
2442 glEnd;
2443
2444 glColor 0, 0, 0;
2445 glBegin GL_LINE_LOOP;
2446 glVertex 0 , 0;
2447 glVertex 0 , $h;
2448 glVertex $w, $h;
2449 glVertex $w, 0;
2450 glEnd;
2451
2452 glTranslate 2 - 0.375, 2 - 0.375;
2453 $self->SUPER::_draw;
2454}
2455
2456#############################################################################
2457
2458package CFClient::UI::Face;
2459
2460our @ISA = CFClient::UI::Base::;
2461
2462use CFClient::OpenGL;
2463
2464sub new {
2465 my $class = shift;
2466
2467 $class->SUPER::new (
2468 aspect => 1,
2469 @_,
2470 )
2471}
2472
2473sub size_request {
2474 (32, 8)
2475}
2476
2477sub _draw {
2478 my ($self) = @_;
2479
2480 return unless $::CONN;#d# manage and cache textures differently
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2482
2483 # TODO animation
2484 if ($tex) {
2485 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D;
2490 }
2491}
2492
2493#############################################################################
2494
2495package CFClient::UI::InventoryItem;
2496
2497our @ISA = CFClient::UI::HBox::;
2498
2499sub new {
2500 my $class = shift;
2501
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new (
2526 can_hover => 1,
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_,
2585 );
2586
2587 $self
2588}
2589
2590sub set_items {
2591 my ($self, $items) = @_;
2592
2593 $self->{scrolled}->clear;
2594 return unless $items;
2595
2596 my @items = sort {
2597 ($a->{type} <=> $b->{type})
2598 or ($a->{name} cmp $b->{name})
2599 } @$items;
2600
2601 $self->{real_items} = \@items;
2602
2603 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2609 }
2610
2611 $self->{scrolled}->add (@items);
2612
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614}
2615
2616sub size_request {
2617 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h});
2619}
2620
2621#############################################################################
2622
2623package CFClient::UI::Menu;
2624
2625our @ISA = CFClient::UI::FancyFrame::;
2626
2627use CFClient::OpenGL;
2628
2629sub new {
2630 my $class = shift;
2631
2632 my $self = $class->SUPER::new (
2633 items => [],
2634 z => 100,
2635 @_,
2636 );
2637
2638 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2639
2640 for my $item (@{ $self->{items} }) {
2641 my ($widget, $cb) = @$item;
2642
2643 # handle various types of items, only text for now
2644 if (!ref $widget) {
2645 $widget = new CFClient::UI::Label
2646 can_hover => 1,
2647 can_events => 1,
2648 text => $widget;
2649 }
2650
2651 $self->{item}{$widget} = $item;
2652
2653 $self->{vbox}->add ($widget);
2654 }
2655
2656 $self
2657}
2658
2659# popup given the event (must be a mouse button down event currently)
2660sub popup {
2661 my ($self, $ev) = @_;
2662
2663 $self->emit ("popdown");
2664
2665 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self;
2667 $self->{button} = $ev->{button};
2668
2669 $self->show;
2670 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2671}
2672
2673sub mouse_motion {
2674 my ($self, $ev, $x, $y) = @_;
2675
2676 # TODO: should use vbox->find_widget or so
2677 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2678 $self->{hover} = $self->{item}{$HOVER};
2679}
2680
2681sub button_up {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB;
2686 $self->hide;
2687
2688 $self->emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover};
2690 }
2691}
2692
2693#############################################################################
2694
2695package CFClient::UI::Statusbox;
2696
2697our @ISA = CFClient::UI::VBox::;
2698
2699sub reorder {
2700 my ($self) = @_;
2701 my $NOW = time;
2702
2703 while (my ($k, $v) = each %{ $self->{item} }) {
2704 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2705 }
2706
2707 my @widgets;
2708
2709 my @items = sort {
2710 $a->{pri} <=> $b->{pri}
2711 or $b->{id} <=> $a->{id}
2712 } values %{ $self->{item} };
2713
2714 my $count = 10 + 1;
2715 for my $item (@items) {
2716 last unless --$count;
2717
2718 push @widgets, $item->{label} ||= do {
2719 # TODO: doesn't handle markup well (read as: at all)
2720 my $short = $item->{count} > 1
2721 ? "<b>$item->{count} ×</b> $item->{text}"
2722 : $item->{text};
2723
2724 for ($short) {
2725 s/^\s+//;
2726 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 }
2730
2731 new CFClient::UI::Label
2732 markup => $short,
2733 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize},
2737 fg => $item->{fg},
2738 can_events => 1,
2739 can_hover => 1
2740 };
2741 }
2742
2743 $self->clear;
2744 $self->SUPER::add (reverse @widgets);
2745}
2746
2747sub add {
2748 my ($self, $text, %arg) = @_;
2749
2750 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//;
2752
2753 my $timeout = time + ((delete $arg{timeout}) || 60);
2754
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756
2757 if (my $item = $self->{item}{$group}) {
2758 if ($item->{text} eq $text) {
2759 $item->{count}++;
2760 } else {
2761 $item->{count} = 1;
2762 $item->{text} = $item->{tooltip} = $text;
2763 }
2764 $item->{id} = ++$self->{id};
2765 $item->{timeout} = $timeout;
2766 delete $item->{label};
2767 } else {
2768 $self->{item}{$group} = {
2769 id => ++$self->{id},
2770 text => $text,
2771 timeout => $timeout,
2772 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0,
2776 count => 1,
2777 %arg,
2778 };
2779 }
2780
2781 $self->reorder;
2782}
2783
2784#############################################################################
2785
1991package CFClient::UI::Root; 2786package CFClient::UI::Root;
1992 2787
1993our @ISA = CFClient::UI::Container::; 2788our @ISA = CFClient::UI::Container::;
1994 2789
1995use SDL::OpenGL; 2790use CFClient::OpenGL;
2791
2792sub new {
2793 my $class = shift;
2794
2795 $class->SUPER::new (
2796 @_,
2797 )
2798}
2799
2800sub configure {
2801 my ($self, $x, $y, $w, $h) = @_;
2802
2803 $self->{w} = $w;
2804 $self->{h} = $h;
2805}
2806
2807sub check_size {
2808 my ($self) = @_;
2809
2810 $self->size_allocate ($self->{w}, $self->{h})
2811 if $self->{w};
2812}
1996 2813
1997sub size_request { 2814sub size_request {
1998 ($::WIDTH, $::HEIGHT) 2815 my ($self) = @_;
2816
2817 ($self->{w}, $self->{h})
1999} 2818}
2000 2819
2001sub size_allocate { 2820sub size_allocate {
2002 my ($self, $x, $y, $w, $h) = @_; 2821 my ($self, $w, $h) = @_;
2003 2822
2004 $self->_size_allocate ($x, $y, $w, $h); 2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2005 2825
2006 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2007 for @{$self->{children}}; 2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2008}
2009 2828
2010sub _topleft { 2829 for my $child ($self->children) {
2830 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2831
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2833 if exists $child->{req_x};
2834
2835 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2836 if exists $child->{req_y};
2837
2838 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2839 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840
2841 $child->configure ($X, $Y, $W, $H);
2842 }
2843}
2844
2845sub coord2local {
2011 my ($self, $x, $y) = @_; 2846 my ($self, $x, $y) = @_;
2012 2847
2013 ($x, $y) 2848 ($x, $y)
2014} 2849}
2015 2850
2851sub coord2global {
2852 my ($self, $x, $y) = @_;
2853
2854 ($x, $y)
2855}
2856
2016sub update { 2857sub update {
2017 my ($self) = @_; 2858 my ($self) = @_;
2018 2859
2019 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2860 $self->check_size;
2020 ::refresh (); 2861 $::WANT_REFRESH++;
2021} 2862}
2022 2863
2023sub add { 2864sub add {
2024 my ($self, $widget) = @_; 2865 my ($self, @children) = @_;
2025 2866
2867 for my $child (@children) {
2868 $child->{toplevel} = 1;
2869
2870 # integerise window positions
2871 $child->{x} = int $child->{x};
2872 $child->{y} = int $child->{y};
2873 }
2874
2026 $self->SUPER::add ($widget); 2875 $self->SUPER::add (@children);
2027
2028 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2029} 2876}
2030 2877
2031sub on_refresh { 2878sub on_refresh {
2032 my ($self, $id, $cb) = @_; 2879 my ($self, $id, $cb) = @_;
2033 2880
2034 $self->{refresh_hook}{$id} = $cb; 2881 $self->{refresh_hook}{$id} = $cb;
2035} 2882}
2036 2883
2884sub on_post_alloc {
2885 my ($self, $id, $cb) = @_;
2886
2887 $self->{post_alloc_hook}{$id} = $cb;
2888}
2889
2037sub draw { 2890sub draw {
2038 my ($self) = @_; 2891 my ($self) = @_;
2039 2892
2040 while (my $rcb = delete $self->{refresh_hook}) { 2893 while ($self->{refresh_hook}) {
2041 $_->() for values %$rcb; 2894 $_->()
2895 for values %{delete $self->{refresh_hook}};
2896 }
2897
2898 if ($self->{check_size}) {
2899 my @queue = ([], []);
2900
2901 for (;;) {
2902 if ($self->{check_size}) {
2903 # heuristic: check containers last
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2905 for values %{delete $self->{check_size}}
2906 }
2907
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2909
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2911 ? @$widget{qw(user_w user_h)}
2912 : $widget->size_request;
2913
2914 if (delete $widget->{force_alloc}
2915 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2916 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2917
2918 $widget->{req_w} = $w;
2919 $widget->{req_h} = $h;
2920
2921 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2922
2923 $widget->{parent}->check_size
2924 if $widget->{parent};
2925 }
2926 }
2927 }
2928
2929 while ($self->{size_alloc}) {
2930 for (values %{delete $self->{size_alloc}}) {
2931 my ($widget, $w, $h) = @$_;
2932
2933 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0;
2935
2936 $widget->{w} = $w;
2937 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h);
2939 $widget->emit (size_allocate => $w, $h);
2940 }
2941 }
2942
2943 while ($self->{post_alloc_hook}) {
2944 $_->()
2945 for values %{delete $self->{post_alloc_hook}};
2042 } 2946 }
2043 2947
2044 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2948 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2045 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2046 glClear GL_COLOR_BUFFER_BIT; 2950 glClear GL_COLOR_BUFFER_BIT;
… …
2057############################################################################# 2961#############################################################################
2058 2962
2059package CFClient::UI; 2963package CFClient::UI;
2060 2964
2061$ROOT = new CFClient::UI::Root; 2965$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip;
2062 2967
20631 29681
2064 2969

Diff Legend

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