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

Diff Legend

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