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

Diff Legend

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