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

Diff Legend

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