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

Diff Legend

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