ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC

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

Diff Legend

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