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

Diff Legend

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