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.244 by root, Sat May 27 21:06:09 2006 UTC

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

Diff Legend

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