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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.214 by root, Wed May 17 22:59:13 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;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
18
19sub check_tooltip {
20 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) {
25 $TOOLTIP->{owner} = $widget;
26
27 my $tip = $widget->{tooltip};
28
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
31 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 }
43
44 return;
45 }
46 }
47 }
48
49 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner};
51}
14 52
15# class methods for events 53# class methods for events
16sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
18} 57}
19 58
20sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
22} 62}
23 63
24sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
25 my ($ev) = @_; 65 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 68 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 69 my $widget = $ROOT->find_widget ($x, $y);
30 70
31 $GRAB = $widget; 71 $GRAB = $widget;
32 $GRAB->update if $GRAB; 72 $GRAB->update if $GRAB;
73
74 check_tooltip;
33 } 75 }
34 76
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 78
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
38} 83}
39 84
40sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
41 my ($ev) = @_; 86 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
43 88
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 90
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 92
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
49 97
50 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 100 $grab->update if $grab;
53 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
102
103 check_tooltip;
54 } 104 }
55} 105}
56 106
57sub feed_sdl_motion_event { 107sub feed_sdl_motion_event {
58 my ($ev) = @_; 108 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 113 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 114 my $hover = $HOVER; $HOVER = $widget;
65 115
66 $hover->update if $hover && $hover->{can_hover}; 116 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 118
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 check_tooltip;
120 }
121
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
71} 126}
72 127
73# convert position array to integers 128# convert position array to integers
74sub harmonize { 129sub harmonize {
75 my ($vals) = @_; 130 my ($vals) = @_;
… …
81 $rem += $_ - $i; 136 $rem += $_ - $i;
82 $_ = $i; 137 $_ = $i;
83 } 138 }
84} 139}
85 140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
161 }
162}
163
86############################################################################# 164#############################################################################
87 165
88package CFClient::UI::Base; 166package CFClient::UI::Base;
89 167
90use strict; 168use strict;
… …
93 171
94sub new { 172sub new {
95 my $class = shift; 173 my $class = shift;
96 174
97 my $self = bless { 175 my $self = bless {
98 x => 0, 176 x => 0,
99 y => 0, 177 y => 0,
100 z => 0, 178 z => 0,
101 can_events => 1, 179 can_events => 1,
102 @_ 180 @_
103 }, $class; 181 }, $class;
104 182
105 for (keys %$self) { 183 for (keys %$self) {
106 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
107 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
108 } 186 }
109 } 187 }
110 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
111 $self 191 $self
112} 192}
113 193
194sub destroy {
195 my ($self) = @_;
196
197 $self->hide;
198 %$self = ();
199}
200
114sub show { 201sub show {
115 my ($self) = @_; 202 my ($self) = @_;
116 203
117 return if $self->{parent}; 204 return if $self->{parent};
118 205
… …
120} 207}
121 208
122sub hide { 209sub hide {
123 my ($self) = @_; 210 my ($self) = @_;
124 211
125 return unless $self->{parent}; 212 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self;
126 214
127 $self->{parent}->remove ($self); 215 $self->{parent}->remove ($self)
216 if $self->{parent};
128} 217}
129 218
130sub move { 219sub move {
131 my ($self, $x, $y, $z) = @_; 220 my ($self, $x, $y, $z) = @_;
132 221
… …
135 $self->{z} = $z if defined $z; 224 $self->{z} = $z if defined $z;
136 225
137 $self->update; 226 $self->update;
138} 227}
139 228
140sub needs_redraw { 229sub set_size {
141 0 230 my ($self, $w, $h) = @_;
231
232 $self->{user_w} = $w;
233 $self->{user_h} = $h;
234
235 $self->check_size;
142} 236}
143 237
144sub size_request { 238sub size_request {
145 require Carp; 239 require Carp;
146 Carp::confess "size_request is abstract"; 240 Carp::confess "size_request is abstract";
… …
166 $self->{y} = $y; 260 $self->{y} = $y;
167 $self->update; 261 $self->update;
168 } 262 }
169 263
170 if ($self->{w} != $w || $self->{h} != $h) { 264 if ($self->{w} != $w || $self->{h} != $h) {
171 $self->{w} = $w; 265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
172 $self->{h} = $h;
173
174 $self->size_allocate ($w, $h);
175 $self->update;
176 } 266 }
177} 267}
178 268
179sub size_allocate { 269sub size_allocate {
180 # nothing to be done 270 # nothing to be done
181} 271}
182 272
183# return top left coordinates 273sub reconfigure {
184sub _topleft { 274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children {
281}
282
283sub set_max_size {
185 my ($self, $x, $y) = @_; 284 my ($self, $w, $h) = @_;
186 285
187 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
287 delete $self->{max_h}; $self->{max_h} = $h if $h;
288}
289
290sub set_tooltip {
291 my ($self, $tooltip) = @_;
292
293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
188} 299}
189 300
190# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
191sub coord2local { 302sub coord2local {
192 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
193 304
194 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
195 ($x - $X, $y - $Y)
196} 306}
197 307
198# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
199sub coord2global { 309sub coord2global {
200 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
201 311
202 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
203 ($x + $X, $y + $Y)
204} 313}
205 314
206sub focus_in { 315sub focus_in {
207 my ($self) = @_; 316 my ($self) = @_;
208 317
… …
268 glVertex $x + $self->{w}, $y + $self->{h}; 377 glVertex $x + $self->{w}, $y + $self->{h};
269 glVertex $x , $y + $self->{h}; 378 glVertex $x , $y + $self->{h};
270 glEnd; 379 glEnd;
271 glDisable GL_BLEND; 380 glDisable GL_BLEND;
272 } 381 }
382
383 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix;
385 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0;
389 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h};
392 glEnd;
393 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 }
273} 396}
274 397
275sub _draw { 398sub _draw {
276 my ($self) = @_; 399 my ($self) = @_;
277 400
… …
292 415
293sub set_parent { 416sub set_parent {
294 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
295 418
296 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
297} 424}
298 425
299sub check_size { 426sub check_size {
300 my ($self) = @_; 427 my ($self, $forced) = @_;
301 428
302 return unless $self->{parent}; 429 $self->{force_alloc} = 1 if $forced;
303 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
304 my ($w, $h) = $self->size_request;
305
306 if ($w != $self->{req_w} || $h != $self->{req_h}) {
307 $self->{req_w} = $w;
308 $self->{req_h} = $h;
309
310 $self->{parent}->check_size;
311 }
312} 431}
313 432
314sub update { 433sub update {
315 my ($self) = @_; 434 my ($self) = @_;
316 435
… …
325} 444}
326 445
327sub emit { 446sub emit {
328 my ($self, $signal, @args) = @_; 447 my ($self, $signal, @args) = @_;
329 448
330 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
331 $cb->($self, @args);
332 }
333} 450}
334 451
335sub DESTROY { 452sub DESTROY {
336 my ($self) = @_; 453 my ($self) = @_;
337 454
455 delete $WIDGET{$self+0};
338 #$self->deactivate; 456 #$self->deactivate;
339} 457}
340 458
341############################################################################# 459#############################################################################
342 460
… …
351 my $class = shift; 469 my $class = shift;
352 470
353 # range [value, low, high, page] 471 # range [value, low, high, page]
354 472
355 $class->SUPER::new ( 473 $class->SUPER::new (
356 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
357 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
358 @_ 476 @_
359 ) 477 )
360} 478}
361 479
362sub _draw { 480sub _draw {
363 my ($self) = @_; 481 my ($self) = @_;
364 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
365 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
366 489
367 glEnable GL_BLEND; 490 glEnable GL_BLEND;
368 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
369 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
370 493
371 glBegin GL_QUADS; 494 glBegin GL_QUADS;
372 glVertex 0 , 0; 495 glVertex 0 , 0;
373 glVertex 0 , $h; 496 glVertex 0 , $h;
374 glVertex $w, $h; 497 glVertex $w, $h;
375 glVertex $w, 0; 498 glVertex $w, 0;
376 glEnd; 499 glEnd;
377 500
378 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
379} 503}
380 504
381############################################################################# 505#############################################################################
382 506
383package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
404sub new { 528sub new {
405 my ($class, %arg) = @_; 529 my ($class, %arg) = @_;
406 530
407 my $children = delete $arg{children} || []; 531 my $children = delete $arg{children} || [];
408 532
409 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 533 my $self = $class->SUPER::new (
534 children => [],
535 can_events => 0,
536 %arg,
537 );
410 $self->add ($_) for @$children; 538 $self->add ($_) for @$children;
411 539
412 $self 540 $self
413} 541}
414 542
415sub add { 543sub add {
416 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
417 545
418 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
419 548
420 use sort 'stable'; 549 use sort 'stable';
421 550
422 $self->{children} = [ 551 $self->{children} = [
423 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
424 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
425 ]; 554 ];
426 555
427 $child->check_size; 556 $self->check_size (1);
557 $self->update;
558}
559
560sub children {
561 @{ $_[0]{children} }
428} 562}
429 563
430sub remove { 564sub remove {
431 my ($self, $child) = @_; 565 my ($self, $child) = @_;
432 566
433 delete $child->{parent}; 567 delete $child->{parent};
568 $child->hide;
434 569
435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
436 571
437 $self->check_size; 572 $self->check_size;
573 $self->update;
574}
575
576sub clear {
577 my ($self) = @_;
578
579 my $children = delete $self->{children};
580 $self->{children} = [];
581
582 for (@$children) {
583 delete $_->{parent};
584 $_->hide;
585 }
586
587 $self->check_size;
588 $self->update;
438} 589}
439 590
440sub find_widget { 591sub find_widget {
441 my ($self, $x, $y) = @_; 592 my ($self, $x, $y) = @_;
442 593
… …
517} 668}
518 669
519sub update { 670sub update {
520 my ($self) = @_; 671 my ($self) = @_;
521 672
522 # we want to do this delayed... 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
523 $self->render_chld;
524 $self->SUPER::update; 674 $self->SUPER::update;
525}
526
527sub render_chld {
528 my ($self) = @_;
529
530 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
531 glClearColor 0, 0, 0, 1;
532 glClear GL_COLOR_BUFFER_BIT;
533 $self->child->draw;
534 };
535} 675}
536 676
537sub size_allocate { 677sub size_allocate {
538 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
539 679
540 $self->child->configure (0, 0, $w, $h); 680 $self->SUPER::size_allocate ($w, $h);
681 $self->update;
682}
541 683
684sub _render {
685 $_[0]{children}[0]->draw;
686}
687
688sub render_child {
689 my ($self) = @_;
690
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT;
694
542 $self->render_chld; 695 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 };
543} 704}
544 705
545sub _draw { 706sub _draw {
546 my ($self) = @_; 707 my ($self) = @_;
547 708
548 my ($w, $h) = ($self->w, $self->h); 709 my ($w, $h) = ($self->w, $self->h);
549 710
550 my $tex = $self->{texture} 711 my $tex = $self->{texture}
551 or return; 712 or return;
552 713
553 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
555 glEnable GL_TEXTURE_2D; 714 glEnable GL_TEXTURE_2D;
556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1;
557 717
558 $tex->draw_quad (0, 0, $w, $h); 718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
559 719
560 glDisable GL_BLEND;
561 glDisable GL_TEXTURE_2D; 720 glDisable GL_TEXTURE_2D;
562} 721}
563 722
564############################################################################# 723#############################################################################
565 724
566package CFClient::UI::ViewPort; 725package CFClient::UI::ViewPort;
567 726
568our @ISA = CFClient::UI::Window::; 727our @ISA = CFClient::UI::Window::;
569 728
570sub new { die }
571
572sub size_request { 729sub size_request {
573 my ($self) = @_; 730 my ($self) = @_;
574 731
575 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
576 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
577 734
578 @$self{qw(child_w child_h)} 735 @$self{qw(child_w child_h)}
579} 736}
580 737
581sub _draw { 738sub size_allocate {
582 my ($self) = @_; 739 my ($self, $w, $h) = @_;
583 740
584 $self->{children}[1]->draw; 741 $self->update;
585} 742}
586 743
744sub set_offset {
745 my ($self, $x, $y) = @_;
587 746
588############################################################################# 747 $self->{view_x} = int $x;
748 $self->{view_y} = int $y;
589 749
750 $self->update;
751}
752
753# hmm, this does not work for topleft of $self... but we should not ask for that
754sub coord2local {
755 my ($self, $x, $y) = @_;
756
757 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
758}
759
760sub coord2global {
761 my ($self, $x, $y) = @_;
762
763 $x = List::Util::min $self->{w}, $x - $self->{view_x};
764 $y = List::Util::min $self->{h}, $y - $self->{view_y};
765
766 $self->SUPER::coord2global ($x, $y)
767}
768
769sub find_widget {
770 my ($self, $x, $y) = @_;
771
772 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
773 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
774 ) {
775 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
776 } else {
777 $self->CFClient::UI::Base::find_widget ($x, $y)
778 }
779}
780
781sub _render {
782 my ($self) = @_;
783
784 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
785
786 $self->SUPER::_render;
787}
788
789#############################################################################
790
590package CFClient::UI::Frame; 791package CFClient::UI::ScrolledWindow;
591 792
592our @ISA = CFClient::UI::Bin::; 793our @ISA = CFClient::UI::HBox::;
593
594use CFClient::OpenGL;
595 794
596sub new { 795sub new {
597 my $class = shift; 796 my $class = shift;
598 797
798 my $self;
799
800 my $slider = new CFClient::UI::Slider
801 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
805 },
806 ;
807
599 my $self = $class->SUPER::new ( 808 $self = $class->SUPER::new (
600 bg => [1, 1, 1, 1], 809 vp => (new CFClient::UI::ViewPort),
601 border_bg => [1, 1, 1, 1], 810 slider => $slider,
602 border => 0.8,
603 @_ 811 @_,
604 ); 812 );
605 813
814 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp});
816 $self->add ($self->{slider});
817
606 $self 818 $self
607} 819}
608 820
609sub set_size { 821#TODO# update range on size_allocate depending on child
610 my ($self, $w, $h) = @_; 822# update viewport offset on scroll
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
614}
615 823
616sub size_request { 824#############################################################################
617 my ($self) = @_;
618 ($self->{req_w}, $self->{req_h})
619}
620 825
621sub size_allocate { 826package CFClient::UI::Frame;
622 my ($self, $w, $h) = @_; 827
623 $self->{w} = $w; 828our @ISA = CFClient::UI::Bin::;
624 $self->{h} = $h; 829
625 $self->child->configure (0, 0, $w, $h); 830use CFClient::OpenGL;
831
832sub new {
833 my $class = shift;
834
835 $class->SUPER::new (
836 bg => undef,
837 @_,
838 )
626} 839}
627 840
628sub _draw { 841sub _draw {
629 my ($self) = @_; 842 my ($self) = @_;
630 843
631 my ($w, $h) = ($self->{w}, $self->{h}); 844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
632 846
633 glEnable GL_BLEND; 847 glEnable GL_BLEND;
634 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
635 glEnable GL_TEXTURE_2D; 849 glColor @{ $self->{bg} };
636 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
637 850
638# glBegin GL_QUADS; 851 glBegin GL_QUADS;
639# glColor 0, 0, 0, 0;
640# glVertex 0 , 0; 852 glVertex 0 , 0;
641# glVertex 0 , $h; 853 glVertex 0 , $h;
642# glVertex $w, $h; 854 glVertex $w, $h;
643# glVertex $w, 0; 855 glVertex $w, 0;
644# glEnd; 856 glEnd;
645 857
646
647 $self->child->draw;
648 glDisable GL_BLEND; 858 glDisable GL_BLEND;
649 glDisable GL_TEXTURE_2D; 859 }
860
861 $self->SUPER::_draw;
650} 862}
651 863
652############################################################################# 864#############################################################################
653 865
654package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
… …
665 my $class = shift; 877 my $class = shift;
666 878
667 # TODO: user_x, user_y, overwrite moveto? 879 # TODO: user_x, user_y, overwrite moveto?
668 880
669 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
672 border => 0.8, 884 border => 0.6,
885 toplevel => 1,
673 can_events => 1, 886 can_events => 1,
674 @_ 887 @_
675 ); 888 );
676 889
677 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
678 align => 0, 891 align => 0,
679 valign => 1, 892 valign => 1,
680 text => $self->{title}, 893 text => $self->{title},
681 fontsize => 1; 894 fontsize => $self->{border};
682 895
683 $self 896 $self
684} 897}
685 898
686sub border { 899sub border {
687 int $_[0]{border} * $::FONTSIZE 900 int $_[0]{border} * $::FONTSIZE
688} 901}
689 902
690sub size_request { 903sub size_request {
691 my ($self) = @_; 904 my ($self) = @_;
692
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
694 905
695 my ($w, $h) = $self->SUPER::size_request; 906 my ($w, $h) = $self->SUPER::size_request;
696 907
697 ( 908 (
698 $w + $self->border * 2, 909 $w + $self->border * 2,
… …
704 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
705 916
706 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
707 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
708 919
709 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
710 if $self->{title}; 921 if $self->{title};
711 922
712 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
713} 924}
714 925
715sub button_down { 926sub button_down {
716 my ($self, $ev, $x, $y) = @_; 927 my ($self, $ev, $x, $y) = @_;
717 928
929 my ($w, $h) = @$self{qw(w h)};
718 my $border = $self->border; 930 my $border = $self->border;
719 931
720 if ($x < $self->{w} && $x >= $self->{w} - $border 932 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
721 && $y < $self->{h} && $y >= $self->{h} - $border) { 933 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
722 934
935 if ($lr & $td) {
936 my ($wx, $wy) = ($self->{x}, $self->{y});
723 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 937 my ($ox, $oy) = ($ev->{x}, $ev->{y});
724 my ($bw, $bh) = ($self->{w}, $self->{h}); 938 my ($bw, $bh) = ($self->{w}, $self->{h});
725 939
940 my $mx = $x < $border;
941 my $my = $y < $border;
942
726 $self->{motion} = sub { 943 $self->{motion} = sub {
727 my ($ev, $x, $y) = @_; 944 my ($ev, $x, $y) = @_;
728 945
729 ($x, $y) = ($ev->{x}, $ev->{y}); 946 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy;
730 948
731 $self->{user_w} = $bw + $x - $ox; 949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
732 $self->{user_h} = $bh + $y - $oy; 950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
733 $self->check_size; 952 $self->check_size;
734 }; 953 };
735 954
736 } elsif ($x >= 0 && $x < $self->{w} 955 } elsif ($lr ^ $td) {
737 && $y >= 0 && $y < $border) {
738
739 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 956 my ($ox, $oy) = ($ev->{x}, $ev->{y});
740 my ($bx, $by) = ($self->{x}, $self->{y}); 957 my ($bx, $by) = ($self->{x}, $self->{y});
741 958
742 $self->{motion} = sub { 959 $self->{motion} = sub {
743 my ($ev, $x, $y) = @_; 960 my ($ev, $x, $y) = @_;
… …
766 my ($self) = @_; 983 my ($self) = @_;
767 984
768 my ($w, $h ) = ($self->{w}, $self->{h}); 985 my ($w, $h ) = ($self->{w}, $self->{h});
769 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
770 987
771 glEnable GL_BLEND;
772 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
773 glEnable GL_TEXTURE_2D; 988 glEnable GL_TEXTURE_2D;
774 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
775 990
776 my $border = $self->border; 991 my $border = $self->border;
777 992
778 glColor @{ $self->{border_bg} }; 993 glColor @{ $self->{border_bg} };
779 $tex[1]->draw_quad (0, 0, $w, $border); 994 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
780 $tex[3]->draw_quad (0, $border, $border, $ch); 995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
781 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
782 $tex[4]->draw_quad (0, $h - $border, $w, $border); 997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
783 998
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
784 my $bg = $tex[0]; 1000 my $bg = $tex[0];
785 1001
786 # TODO: repeat texture not scale 1002 # TODO: repeat texture not scale
787 my $rep_x = $cw / $bg->{w}; 1003 my $rep_x = $cw / $bg->{w};
788 my $rep_y = $ch / $bg->{h}; 1004 my $rep_y = $ch / $bg->{h};
789 1005
790 glColor @{ $self->{bg} }; 1006 glColor @{ $self->{bg} };
791 1007
792 $bg->{s} = $rep_x; 1008 $bg->{s} = $rep_x;
793 $bg->{t} = $rep_y; 1009 $bg->{t} = $rep_y;
794 $bg->{wrap_mode} = 1; 1010 $bg->{wrap_mode} = 1;
795 $bg->draw_quad ($border, $border, $cw, $ch); 1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 }
796 1013
797 glDisable GL_TEXTURE_2D; 1014 glDisable GL_TEXTURE_2D;
798 glDisable GL_BLEND;
799 1015
800 $self->{title}->draw if $self->{title}; 1016 $self->{title}->draw if $self->{title};
1017
801 $self->child->draw; 1018 $self->child->draw;
802} 1019}
803 1020
804############################################################################# 1021#############################################################################
805 1022
… …
827 $self->{children}[$y][$x] = $child; 1044 $self->{children}[$y][$x] = $child;
828 1045
829 $child->check_size; 1046 $child->check_size;
830} 1047}
831 1048
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
832# TODO: move to container class maybe? send childs a signal on removal? 1053# TODO: move to container class maybe? send childs a signal on removal?
833sub clear { 1054sub clear {
834 my ($self) = @_; 1055 my ($self) = @_;
835 1056
1057 my @children = $self->children;
836 delete $self->{children}; 1058 delete $self->{children};
1059
1060 for (@children) {
1061 delete $_->{parent};
1062 $_->hide;
1063 }
1064
837 $self->update; 1065 $self->update;
838} 1066}
839 1067
840sub get_wh { 1068sub get_wh {
841 my ($self) = @_; 1069 my ($self) = @_;
… …
1018} 1246}
1019 1247
1020sub size_allocate { 1248sub size_allocate {
1021 my ($self, $w, $h) = @_; 1249 my ($self, $w, $h) = @_;
1022 1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1023 my $children = $self->{children}; 1253 my $children = $self->{children};
1024 1254
1025 my @h = map $_->{req_h}, @$children; 1255 my @h = map $_->{req_h}, @$children;
1026 1256
1027 my $req_h = List::Util::sum @h; 1257 my $req_h = List::Util::sum @h;
… …
1056 1286
1057############################################################################# 1287#############################################################################
1058 1288
1059package CFClient::UI::Label; 1289package CFClient::UI::Label;
1060 1290
1061our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1062 1292
1063use CFClient::OpenGL; 1293use CFClient::OpenGL;
1064 1294
1065sub new { 1295sub new {
1066 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1067 1297
1068 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1069 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1302 #font => default_font
1303 #text => initial text
1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1307 layout => (new CFClient::Layout),
1070 fontsize => 1, 1308 fontsize => 1,
1071 text => "",
1072 align => -1, 1309 align => -1,
1073 valign => -1, 1310 valign => -1,
1074 padding => 2, 1311 padding => 2,
1075 layout => new CFClient::Layout,
1076 can_events => 0, 1312 can_events => 0,
1077 %arg 1313 %arg
1078 ); 1314 );
1079 1315
1080 if (exists $self->{template}) { 1316 if (exists $self->{template}) {
1081 my $layout = new CFClient::Layout; 1317 my $layout = new CFClient::Layout;
1082 $layout->set_text (delete $self->{template}); 1318 $layout->set_text (delete $self->{template});
1083 $self->{template} = $layout; 1319 $self->{template} = $layout;
1084 } 1320 }
1085 1321
1086 $self->set_text (delete $self->{text}) if exists $self->{text}; 1322 if (exists $self->{markup}) {
1087 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1323 $self->set_markup (delete $self->{markup});
1324 } else {
1325 $self->set_text (delete $self->{text});
1326 }
1088 1327
1089 $self 1328 $self
1090} 1329}
1091 1330
1092sub escape_text { 1331sub escape($) {
1093 local $_ = $_[1]; 1332 local $_ = $_[0];
1094 1333
1095 s/&/&amp;/g; 1334 s/&/&amp;/g;
1096 s/>/&gt;/g; 1335 s/>/&gt;/g;
1097 s/</&lt;/g; 1336 s/</&lt;/g;
1098 1337
1099 $_[1] 1338 $_
1339}
1340
1341sub update {
1342 my ($self) = @_;
1343
1344 delete $self->{texture};
1345 $self->SUPER::update;
1100} 1346}
1101 1347
1102sub set_text { 1348sub set_text {
1103 my ($self, $text) = @_; 1349 my ($self, $text) = @_;
1104 1350
1351 return if $self->{text} eq "T$text";
1352 $self->{text} = "T$text";
1353
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1105 $self->{layout}->set_text ($text); 1355 $self->{layout}->set_text ($text);
1106 1356
1107 delete $self->{texture}; 1357 $self->update;
1108 $self->check_size; 1358 $self->check_size;
1109 $self->update;
1110} 1359}
1111 1360
1112sub set_markup { 1361sub set_markup {
1113 my ($self, $markup) = @_; 1362 my ($self, $markup) = @_;
1114 1363
1364 return if $self->{text} eq "M$markup";
1365 $self->{text} = "M$markup";
1366
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1115 $self->{layout}->set_markup ($markup); 1370 $self->{layout}->set_markup ($markup);
1116 1371
1117 delete $self->{texture}; 1372 $self->update;
1118 $self->check_size; 1373 $self->check_size;
1119 $self->update;
1120} 1374}
1121 1375
1122sub size_request { 1376sub size_request {
1123 my ($self) = @_; 1377 my ($self) = @_;
1124 1378
1125 $self->{layout}->set_width; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1380 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1127 1384
1128 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1129 1386
1130 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
1388 $self->{template}->set_font ($self->{font}) if $self->{font};
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1389 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132 1390
1133 my ($w2, $h2) = $self->{template}->size; 1391 my ($w2, $h2) = $self->{template}->size;
1134 1392
1135 $w = List::Util::max $w, $w2; 1393 $w = List::Util::max $w, $w2;
… …
1150 1408
1151sub set_fontsize { 1409sub set_fontsize {
1152 my ($self, $fontsize) = @_; 1410 my ($self, $fontsize) = @_;
1153 1411
1154 $self->{fontsize} = $fontsize; 1412 $self->{fontsize} = $fontsize;
1413 delete $self->{texture};
1414
1415 $self->update;
1155 $self->check_size; 1416 $self->check_size;
1156} 1417}
1157 1418
1158sub _draw { 1419sub _draw {
1159 my ($self) = @_; 1420 my ($self) = @_;
1160 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1161 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1425 $self->{layout}->set_foreground (@{$self->{fg}});
1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1162 $self->{layout}->set_width ($self->{w}); 1427 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1163 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431
1164 new_from_layout CFClient::Texture $self->{layout} 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1433
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1436 : ($self->{w} - $tex->{w}) * 0.5);
1437
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1440 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1165 }; 1443 };
1166 1444
1167 glEnable GL_BLEND;
1168 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1169 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
1170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1171 1447
1448 if ($tex->{format} == GL_ALPHA) {
1172 glColor @{$self->{fg}}; 1449 glColor @{$self->{fg}};
1173
1174 $self->{ox} = int (
1175 $self->{align} < 0 ? $self->{padding}
1176 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1177 : ($self->{w} - $tex->{w}) * 0.5
1178 );
1179
1180 $self->{oy} = int (
1181 $self->{valign} < 0 ? $self->{padding}
1182 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1183 : ($self->{h} - $tex->{h}) * 0.5
1184 );
1185
1186 $tex->draw_quad ($self->{ox}, $self->{oy}); 1450 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1451 } else {
1452 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1453 }
1187 1454
1188 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
1189 glDisable GL_BLEND;
1190} 1456}
1191 1457
1192############################################################################# 1458#############################################################################
1193 1459
1194package CFClient::UI::EntryBase; 1460package CFClient::UI::EntryBase;
… …
1199 1465
1200sub new { 1466sub new {
1201 my $class = shift; 1467 my $class = shift;
1202 1468
1203 $class->SUPER::new ( 1469 $class->SUPER::new (
1204 fg => [1, 1, 1], 1470 fg => [1, 1, 1],
1205 bg => [0, 0, 0, 0.2], 1471 bg => [0, 0, 0, 0.2],
1206 active_bg => [1, 1, 1, 0.5], 1472 active_bg => [1, 1, 1, 0.5],
1207 active_fg => [0, 0, 0], 1473 active_fg => [0, 0, 0],
1208 can_hover => 1, 1474 can_hover => 1,
1209 can_focus => 1, 1475 can_focus => 1,
1210 valign => 0, 1476 valign => 0,
1211 can_events => 1, 1477 can_events => 1,
1212 @_ 1478 @_
1213 ) 1479 )
1214} 1480}
1215 1481
… …
1229 $self->{layout}->set_text ("$text "); 1495 $self->{layout}->set_text ("$text ");
1230 1496
1231 $self->emit (changed => $self->{text}); 1497 $self->emit (changed => $self->{text});
1232} 1498}
1233 1499
1234sub get_text {
1235 $_[0]{text}
1236}
1237
1238sub size_request {
1239 my ($self) = @_;
1240
1241 my ($w, $h) = $self->SUPER::size_request;
1242
1243 ($w + 1, $h) # add 1 for cursor
1244}
1245
1246sub size_allocate {
1247 my ($self, $w, $h) = @_;
1248
1249 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1250}
1251
1252sub set_text { 1500sub set_text {
1253 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1254 1502
1255 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1256 $self->_set_text ($text); 1504 $self->_set_text ($text);
1257 $self->update; 1505 $self->update;
1506 $self->check_size;
1507}
1508
1509sub get_text {
1510 $_[0]{text}
1511}
1512
1513sub size_request {
1514 my ($self) = @_;
1515
1516 my ($w, $h) = $self->SUPER::size_request;
1517
1518 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1258} 1525}
1259 1526
1260sub key_down { 1527sub key_down {
1261 my ($self, $ev) = @_; 1528 my ($self, $ev) = @_;
1262 1529
… …
1264 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1265 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1266 1533
1267 my $text = $self->get_text; 1534 my $text = $self->get_text;
1268 1535
1269 if ($sym == 8) { 1536 if ($uni == 8) {
1270 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1271 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1272 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1273 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1274 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1275 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1276 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1277 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1278 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1279 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1280 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1281 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1282 $self->emit ('escape'); 1549 $self->emit ('escape');
1283 } elsif ($uni) { 1550 } elsif ($uni) {
1284 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1285 } 1552 }
1286 1553
1287 $self->_set_text ($text); 1554 $self->_set_text ($text);
1288 $self->update; 1555 $self->update;
1556 $self->check_size;
1289} 1557}
1290 1558
1291sub focus_in { 1559sub focus_in {
1292 my ($self) = @_; 1560 my ($self) = @_;
1293 1561
… …
1369 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1370 1638
1371 my $sym = $ev->{sym}; 1639 my $sym = $ev->{sym};
1372 1640
1373 if ($sym == 13) { 1641 if ($sym == 13) {
1642 unshift @{$self->{history}},
1643 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = '';
1374 $self->emit (activate => $self->get_text); 1646 $self->emit (activate => $txt);
1375 $self->update; 1647 $self->update;
1648
1649 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text;
1652 }
1653 if (@{$self->{history} || []} > 0) {
1654 $self->{history_pointer}++;
1655 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1656 $self->{history_pointer} = @{$self->{history} || []} - 1;
1657 }
1658 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1659 }
1660
1661 } elsif ($sym == CFClient::SDLK_DOWN) {
1662 $self->{history_pointer}--;
1663 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1664
1665 if ($self->{history_pointer} >= 0) {
1666 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1667 } else {
1668 $self->set_text ($self->{history_saveback});
1669 }
1376 1670
1377 } else { 1671 } else {
1378 $self->SUPER::key_down ($ev); 1672 $self->SUPER::key_down ($ev);
1379 } 1673 }
1380 1674
… …
1394 1688
1395sub new { 1689sub new {
1396 my $class = shift; 1690 my $class = shift;
1397 1691
1398 $class->SUPER::new ( 1692 $class->SUPER::new (
1399 padding => 4, 1693 padding => 4,
1400 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1401 bg => [1, 1, 1, 0.2],
1402 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1403 can_hover => 1, 1696 can_hover => 1,
1404 align => 0, 1697 align => 0,
1405 valign => 0, 1698 valign => 0,
1406 can_events => 1, 1699 can_events => 1,
1407 @_ 1700 @_
1408 ) 1701 )
1409} 1702}
1410 1703
… …
1424 1717
1425 if ($GRAB == $self) { 1718 if ($GRAB == $self) {
1426 $self->{fg} = $self->{active_fg}; 1719 $self->{fg} = $self->{active_fg};
1427 } 1720 }
1428 1721
1429 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1431 glEnable GL_TEXTURE_2D; 1722 glEnable GL_TEXTURE_2D;
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1433 glColor 0, 0, 0, 1; 1724 glColor 0, 0, 0, 1;
1434 1725
1435 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1726 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1436 1727
1437 glDisable GL_TEXTURE_2D; 1728 glDisable GL_TEXTURE_2D;
1438 glDisable GL_BLEND;
1439 1729
1440 $self->SUPER::_draw; 1730 $self->SUPER::_draw;
1441} 1731}
1442 1732
1443############################################################################# 1733#############################################################################
… …
1457 1747
1458 $class->SUPER::new ( 1748 $class->SUPER::new (
1459 padding => 2, 1749 padding => 2,
1460 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1461 active_fg => [1, 1, 0], 1751 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5],
1462 state => 0, 1754 state => 0,
1463 can_hover => 1, 1755 can_hover => 1,
1464 @_ 1756 @_
1465 ) 1757 )
1466} 1758}
… …
1490 1782
1491 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1492 1784
1493 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1494 1786
1495 glEnable GL_BLEND; 1787 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788
1496 glEnable GL_TEXTURE_2D; 1789 glEnable GL_TEXTURE_2D;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1498
1499 my $tex = $self->{state} ? $tex[1] : $tex[0];
1500
1501 $tex->draw_quad (0, 0, $s, $s); 1790 $tex->draw_quad_alpha (0, 0, $s, $s);
1502
1503 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1504 glDisable GL_BLEND;
1505} 1792}
1506 1793
1507############################################################################# 1794#############################################################################
1508 1795
1509package CFClient::UI::Image; 1796package CFClient::UI::Image;
… …
1552 glTranslate 0, -$self->{w}, 0; 1839 glTranslate 0, -$self->{w}, 0;
1553 1840
1554 ($w, $h) = ($h, $w); 1841 ($w, $h) = ($h, $w);
1555 } 1842 }
1556 1843
1557 glEnable GL_BLEND;
1558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1559 glEnable GL_TEXTURE_2D; 1844 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1845 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 1846
1562 $tex->draw_quad (0, 0, $w, $h); 1847 $tex->draw_quad_alpha (0, 0, $w, $h);
1563 1848
1564 glDisable GL_BLEND;
1565 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1566} 1850}
1567 1851
1568############################################################################# 1852#############################################################################
1569 1853
1570package CFClient::UI::VGauge; 1854package CFClient::UI::VGauge;
1571 1855
1572our @ISA = CFClient::UI::Base::; 1856our @ISA = CFClient::UI::Base::;
1857
1858use List::Util qw(min max);
1573 1859
1574use CFClient::OpenGL; 1860use CFClient::OpenGL;
1575 1861
1576my %tex = ( 1862my %tex = (
1577 food => [ 1863 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1864 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1865 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ], 1866 ],
1581 grace => [ 1867 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1868 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1583 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1869 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1584 ], 1870 ],
1585 hp => [ 1871 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1872 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1873 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ], 1874 ],
1589 mana => [ 1875 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1876 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1591 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1877 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1592 ], 1878 ],
1593); 1879);
1594 1880
1595# eg. VGauge->new (gauge => 'food'), default gauge: food 1881# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new { 1882sub new {
… …
1615} 1901}
1616 1902
1617sub set_max { 1903sub set_max {
1618 my ($self, $max) = @_; 1904 my ($self, $max) = @_;
1619 1905
1906 return if $self->{max_val} == $max;
1907
1620 $self->{max_val} = $max; 1908 $self->{max_val} = $max;
1909 $self->update;
1621} 1910}
1622 1911
1623sub set_value { 1912sub set_value {
1624 my ($self, $val, $max) = @_; 1913 my ($self, $val, $max) = @_;
1625 1914
1626 $self->set_max ($max) 1915 $self->set_max ($max)
1627 if defined $max; 1916 if defined $max;
1628 1917
1629 $max = $self->{max_val}; 1918 return if $self->{val} == $val;
1919
1630 $self->{val} = $val; 1920 $self->{val} = $val;
1631
1632 $self->update; 1921 $self->update;
1633} 1922}
1634 1923
1635sub _draw { 1924sub _draw {
1636 my ($self) = @_; 1925 my ($self) = @_;
1637 1926
1638 my $tex = $tex{$self->{type}}; 1927 my $tex = $tex{$self->{type}};
1928 my ($t1, $t2, $t3) = @$tex;
1639 1929
1640 my ($w, $h) = ($self->{w}, $self->{h}); 1930 my ($w, $h) = ($self->{w}, $self->{h});
1641 1931
1642 if ($self->{vertical}) { 1932 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1; 1933 glRotate 90, 0, 0, 1;
… …
1645 1935
1646 ($w, $h) = ($h, $w); 1936 ($w, $h) = ($h, $w);
1647 } 1937 }
1648 1938
1649 my $ycut = $self->{val} / ($self->{max_val} || 1); 1939 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651 1940
1652 my $t1 = $tex->[0]; 1941 my $ycut1 = max 0, min 1, $ycut;
1653 my $t2 = $tex->[1]; 1942 my $ycut2 = max 0, min 1, $ycut - 1;
1943
1944 my $h1 = $self->{h} * (1 - $ycut1);
1945 my $h2 = $self->{h} * (1 - $ycut2);
1654 1946
1655 glEnable GL_BLEND; 1947 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1948 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 1949 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1950 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 1951
1660 my $h1 = $self->{h} - $ycut * $self->{h};
1661 my $h2 = $ycut * $self->{h};
1662
1663 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1952 glBindTexture GL_TEXTURE_2D, $t1->{name};
1664 glBegin GL_QUADS; 1953 glBegin GL_QUADS;
1665 glTexCoord 0 , 0; glVertex 0 , 0; 1954 glTexCoord 0 , 0; glVertex 0 , 0;
1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1955 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1956 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1668 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1957 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1669 glEnd; 1958 glEnd;
1670 1959
1960 my $ycut1 = List::Util::min 1, $ycut;
1671 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1961 glBindTexture GL_TEXTURE_2D, $t2->{name};
1672 glBegin GL_QUADS; 1962 glBegin GL_QUADS;
1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1963 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1964 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1965 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1966 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1677 glEnd; 1967 glEnd;
1968
1969 if ($t3) {
1970 glBindTexture GL_TEXTURE_2D, $t3->{name};
1971 glBegin GL_QUADS;
1972 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1973 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1974 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1975 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1976 glEnd;
1977 }
1678 1978
1679 glDisable GL_BLEND; 1979 glDisable GL_BLEND;
1680 glDisable GL_TEXTURE_2D; 1980 glDisable GL_TEXTURE_2D;
1681} 1981}
1682 1982
… …
1685package CFClient::UI::Gauge; 1985package CFClient::UI::Gauge;
1686 1986
1687our @ISA = CFClient::UI::VBox::; 1987our @ISA = CFClient::UI::VBox::;
1688 1988
1689sub new { 1989sub new {
1690 my ($class, %arg) = shift; 1990 my ($class, %arg) = @_;
1691 1991
1692 my $self = $class->SUPER::new ( 1992 my $self = $class->SUPER::new (
1693 @_, 1993 tooltip => $arg{type},
1994 can_hover => 1,
1995 can_events => 1,
1996 %arg,
1694 ); 1997 );
1695 1998
1696 $self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 1999 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2000 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1697 $self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 2001 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701 2002
1702 $self 2003 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708} 2004}
1709 2005
1710sub set_fontsize { 2006sub set_fontsize {
1711 my ($self, $fsize) = @_; 2007 my ($self, $fsize) = @_;
1712 2008
1713 $self->{value}->set_fontsize ($fsize); 2009 $self->{value}->set_fontsize ($fsize);
1714 $self->{max} ->set_fontsize ($fsize); 2010 $self->{max} ->set_fontsize ($fsize);
1715} 2011}
1716 2012
2013sub set_max {
2014 my ($self, $max) = @_;
2015
2016 $self->{gauge}->set_max ($max);
2017 $self->{max}->set_text ($max);
2018}
2019
1717sub set_value { 2020sub set_value {
1718 my ($self, $val, $max) = @_; 2021 my ($self, $val, $max) = @_;
1719 2022
1720 $self->set_max ($max) 2023 $self->set_max ($max)
1721 if defined $max; 2024 if defined $max;
1722 2025
1723 $self->{gauge}->set_value ($val, $max); 2026 $self->{gauge}->set_value ($val, $max);
1724 $self->{value}->set_text ($val); 2027 $self->{value}->set_text ($val);
1725}
1726
1727sub set_max {
1728 my ($self, $max) = @_;
1729
1730 $self->{gauge}->set_max ($max);
1731 $self->{max}->set_text ($max);
1732} 2028}
1733 2029
1734############################################################################# 2030#############################################################################
1735 2031
1736package CFClient::UI::Slider; 2032package CFClient::UI::Slider;
… …
1746 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
1747 2043
1748sub new { 2044sub new {
1749 my $class = shift; 2045 my $class = shift;
1750 2046
1751 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
1752 2048
1753 # TODO: 0-width page 2049 # TODO: 0-width page
1754 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
1755 # TODO: calculations are off 2051 # TODO: calculations are off
1756 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
1757 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
1758 active_fg => [0, 0, 0], 2054 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5],
1759 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
1760 req_w => 20, 2058 req_w => $::WIDTH / 80,
1761 req_h => 20, 2059 req_h => $::WIDTH / 80,
1762 vertical => 0, 2060 vertical => 0,
1763 can_hover => 1, 2061 can_hover => 1,
1764 inner_pad => 5, 2062 inner_pad => .05,
1765 @_ 2063 @_
1766 ); 2064 );
1767 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
1768 $self 2069 $self
2070}
2071
2072sub set_value {
2073 my ($self, $value) = @_;
2074
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076
2077 $hi = $lo + 1 if $hi <= $lo;
2078
2079 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi;
2081
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit;
2084
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088
2089 if ($value != $old_value) {
2090 $self->emit (changed => $value);
2091 $self->update;
2092 }
1769} 2093}
1770 2094
1771sub size_request { 2095sub size_request {
1772 my ($self) = @_; 2096 my ($self) = @_;
1773 2097
… …
1786 2110
1787sub mouse_motion { 2111sub mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
1789 2113
1790 if ($GRAB == $self) { 2114 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116
2117 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2120
2121 $self->set_value ($x * ($hi - $lo) + $lo);
2122 }
2123}
2124
2125sub update {
2126 my ($self) = @_;
2127
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]);
2130
1791 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
1792 2132
1793 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
1794 2134
1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1797 2136
1798 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1799 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
1800 $x = $lo if $x < $lo;
1801 $x = $hi - $page if $x > $hi - $page;
1802 $self->{range}[0] = $x;
1803 2139
1804 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
1805 $self->update; 2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value;
2146 $self->{knob_w} = $page;
1806 } 2147 });
1807}
1808 2148
1809# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
1810# so that the handle doesn't leave the texture. This calculation isn't 100%
1811# correct propably, but it does the job for now
1812sub _calc_inner_pad_px {
1813 my ($self, $w) = @_;
1814 ($w / 100) * $self->{inner_pad} # % to pixels
1815} 2150}
1816 2151
1817sub _draw { 2152sub _draw {
1818 my ($self) = @_; 2153 my ($self) = @_;
1819 2154
1820 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
1821 2156
1822 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
1823 2158
1824 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
1825 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
1826 2161
2162 glTranslate 1, 0, 0;
1827 glRotate 90, 0, 0, 1; 2163 glRotate 90, 0, 0, 1;
1828 glTranslate 0, -$self->{w}, 0;
1829
1830 ($w, $h) = ($h, $w);
1831 } 2164 }
1832 2165
1833 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1834 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1835 2168
1836 my ($value, $lo, $hi, $page) = @{$self->{range}};
1837
1838 $hi = $value + 1 if $lo == $hi;
1839
1840 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1841 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1842
1843 $page = int $page * $inner_w / ($hi - $lo);
1844 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1845
1846 $w -= $page;
1847 $page &= ~1;
1848 glTranslate $page * 0.5, 0, 0;
1849 $page ||= 2;
1850
1851 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1852 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1853
1854 glEnable GL_BLEND;
1855 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1856 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
1857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1858 2171
1859 # draw background 2172 # draw background
1860 $tex[1]->draw_quad (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1861 2174
1862 # draw handle 2175 # draw handle
1863 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1864 2177
1865 glDisable GL_BLEND;
1866 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
1867} 2179}
1868 2180
1869############################################################################# 2181#############################################################################
1870 2182
… …
1876 2188
1877sub new { 2189sub new {
1878 my $class = shift; 2190 my $class = shift;
1879 2191
1880 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
1881 fontsize => 1, 2193 fontsize => 1,
2194 can_events => 0,
2195 #font => default_font
1882 @_, 2196 @_,
1883 2197
1884 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout 1),
1885 par => [], 2199 par => [],
1886 height => 0, 2200 height => 0,
1887 children => [ 2201 children => [
1888 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
1889 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
1890 ], 2204 ],
1891 ); 2205 );
1892 2206
1893 $self->{children}[1]->connect (changed => sub { 2207 $self->{children}[1]->connect (changed => sub { $self->update });
1894 $self->update;
1895 });
1896 2208
1897 $self 2209 $self
1898} 2210}
1899 2211
1900sub set_fontsize { 2212sub set_fontsize {
… …
1908 my ($self, $text) = @_; 2220 my ($self, $text) = @_;
1909 2221
1910 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
1911 2223
1912 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $layout->set_width ($self->{w}); 2225 $layout->set_width ($self->{children}[0]{w});
1914 $layout->set_text ($text); 2226 $layout->set_markup ($text);
1915 2227
1916 ($layout->size)[1] 2228 ($layout->size)[1]
1917} 2229}
1918 2230
1919sub reflow { 2231sub reflow {
… …
1926sub size_allocate { 2238sub size_allocate {
1927 my ($self, $w, $h) = @_; 2239 my ($self, $w, $h) = @_;
1928 2240
1929 $self->SUPER::size_allocate ($w, $h); 2241 $self->SUPER::size_allocate ($w, $h);
1930 2242
2243 $self->{layout}->set_font ($self->{font}) if $self->{font};
1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2244 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1932 $self->{layout}->set_width ($self->{children}[0]{w}); 2245 $self->{layout}->set_width ($self->{children}[0]{w});
1933 2246
1934 $self->reflow; 2247 $self->reflow;
1935} 2248}
… …
1956 2269
1957 return unless $self->{h} > 0; 2270 return unless $self->{h} > 0;
1958 2271
1959 delete $self->{texture}; 2272 delete $self->{texture};
1960 2273
1961 $ROOT->on_refresh ($self, sub { 2274 $ROOT->on_post_alloc ($self, sub {
1962 if (delete $self->{need_reflow}) { 2275 if (delete $self->{need_reflow}) {
1963 my $height = 0; 2276 my $height = 0;
1964 2277
1965 $height += $_->[0] = $self->text_height ($_->[2]) 2278 $height += $_->[0] = $self->text_height ($_->[2])
1966 for @{$self->{par}}; 2279 for @{$self->{par}};
… …
1970 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1971 2284
1972 delete $self->{texture}; 2285 delete $self->{texture};
1973 } 2286 }
1974 2287
1975 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1976 glClearColor 0, 0, 0, 1; 2289 glClearColor 0, 0, 0, 0;
1977 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
1978 2291
1979 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2292 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2294
1984 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
1985 2296
… …
1988 2299
1989 my $y = 0; 2300 my $y = 0;
1990 2301
1991 my $layout = $self->{layout}; 2302 my $layout = $self->{layout};
1992 2303
2304 $layout->set_font ($self->{font}) if $self->{font};
2305
1993 for my $par (@{$self->{par}}) { 2306 for my $par (@{$self->{par}}) {
1994 my $h = $par->[0]; 2307 my $h = $par->[0];
1995 2308
1996 if ($y0 < $y + $h && $y < $y1) { 2309 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] });
1997 $layout->set_text ($par->[2]); 2311 $layout->set_markup ($par->[2]);
1998 2312
1999 glColor @{ $par->[1] };
2000 my ($W, $H) = $layout->size; 2313 my ($W, $H) = $layout->size;
2001 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2002 } 2315 }
2003 2316
2004 $y += $h; 2317 $y += $h;
2005 } 2318 }
2006 2319
2007 glDisable GL_TEXTURE_2D; 2320 glDisable GL_TEXTURE_2D;
2008 glDisable GL_BLEND;
2009 }; 2321 };
2010 }); 2322 });
2011} 2323}
2012 2324
2013sub _draw { 2325sub _draw {
2014 my ($self) = @_; 2326 my ($self) = @_;
2015 2327
2016 if ($self->{texture}) {
2017 glEnable GL_TEXTURE_2D; 2328 glEnable GL_TEXTURE_2D;
2018 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2019 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2330 glColor 1, 1, 1, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2020 glDisable GL_TEXTURE_2D; 2332 glDisable GL_TEXTURE_2D;
2021 }
2022 2333
2023 $self->{children}[1]->draw; 2334 $self->{children}[1]->draw;
2024 2335
2025} 2336}
2026 2337
… …
2074 2385
2075sub new { 2386sub new {
2076 my $class = shift; 2387 my $class = shift;
2077 2388
2078 my $self = $class->SUPER::new ( 2389 my $self = $class->SUPER::new (
2079 state => 0, 2390 state => 0,
2080 connect_activate => \&toggle_flopper, 2391 connect_activate => \&toggle_flopper,
2081 can_events => 1,
2082 @_ 2392 @_
2083 ); 2393 );
2084 2394
2085 if ($self->{state}) { 2395 if ($self->{state}) {
2086 $self->{state} = 0; 2396 $self->{state} = 0;
… …
2106 $self->emit (changed => $self->{state}); 2416 $self->emit (changed => $self->{state});
2107} 2417}
2108 2418
2109############################################################################# 2419#############################################################################
2110 2420
2421package CFClient::UI::Tooltip;
2422
2423our @ISA = CFClient::UI::Bin::;
2424
2425use CFClient::OpenGL;
2426
2427sub new {
2428 my $class = shift;
2429
2430 $class->SUPER::new (
2431 @_,
2432 can_events => 0,
2433 )
2434}
2435
2436sub set_tooltip_from {
2437 my ($self, $widget) = @_;
2438
2439 $self->add (new CFClient::UI::Label
2440 markup => $widget->{tooltip},
2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8,
2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2446 );
2447}
2448
2449sub size_request {
2450 my ($self) = @_;
2451
2452 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2453
2454 ($w + 4, $h + 4)
2455}
2456
2457sub size_allocate {
2458 my ($self, $w, $h) = @_;
2459
2460 $self->SUPER::size_allocate ($w - 4, $h - 4);
2461}
2462
2463sub _draw {
2464 my ($self) = @_;
2465
2466 glTranslate 0.375, 0.375;
2467
2468 my ($w, $h) = @$self{qw(w h)};
2469
2470 glColor 1, 0.8, 0.4;
2471 glBegin GL_QUADS;
2472 glVertex 0 , 0;
2473 glVertex 0 , $h;
2474 glVertex $w, $h;
2475 glVertex $w, 0;
2476 glEnd;
2477
2478 glColor 0, 0, 0;
2479 glBegin GL_LINE_LOOP;
2480 glVertex 0 , 0;
2481 glVertex 0 , $h;
2482 glVertex $w, $h;
2483 glVertex $w, 0;
2484 glEnd;
2485
2486 glTranslate 2 - 0.375, 2 - 0.375;
2487 $self->SUPER::_draw;
2488}
2489
2490#############################################################################
2491
2492package CFClient::UI::Face;
2493
2494our @ISA = CFClient::UI::Base::;
2495
2496use CFClient::OpenGL;
2497
2498sub new {
2499 my $class = shift;
2500
2501 $class->SUPER::new (
2502 aspect => 1,
2503 @_,
2504 )
2505}
2506
2507sub size_request {
2508 (32, 8)
2509}
2510
2511sub _draw {
2512 my ($self) = @_;
2513
2514 return unless $::CONN;#d# manage and cache textures differently
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2516
2517 # TODO animation
2518 if ($tex) {
2519 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D;
2524 }
2525}
2526
2527#############################################################################
2528
2529package CFClient::UI::InventoryItem;
2530
2531our @ISA = CFClient::UI::HBox::;
2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2559sub new {
2560 my $class = shift;
2561
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new (
2569 can_hover => 1,
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_,
2644 );
2645
2646 $self
2647}
2648
2649sub set_items {
2650 my ($self, $items) = @_;
2651
2652 $self->{scrolled}->clear;
2653 return unless $items;
2654
2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2659
2660 $self->{real_items} = \@items;
2661
2662 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2665 }
2666
2667 $self->{scrolled}->add (@items);
2668
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670}
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675}
2676
2677#############################################################################
2678
2679package CFClient::UI::Menu;
2680
2681our @ISA = CFClient::UI::FancyFrame::;
2682
2683use CFClient::OpenGL;
2684
2685sub new {
2686 my $class = shift;
2687
2688 my $self = $class->SUPER::new (
2689 items => [],
2690 z => 100,
2691 @_,
2692 );
2693
2694 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2695
2696 for my $item (@{ $self->{items} }) {
2697 my ($widget, $cb) = @$item;
2698
2699 # handle various types of items, only text for now
2700 if (!ref $widget) {
2701 $widget = new CFClient::UI::Label
2702 can_hover => 1,
2703 can_events => 1,
2704 text => $widget;
2705 }
2706
2707 $self->{item}{$widget} = $item;
2708
2709 $self->{vbox}->add ($widget);
2710 }
2711
2712 $self
2713}
2714
2715# popup given the event (must be a mouse button down event currently)
2716sub popup {
2717 my ($self, $ev) = @_;
2718
2719 $self->emit ("popdown");
2720
2721 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self;
2723 $self->{button} = $ev->{button};
2724
2725 $self->show;
2726 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2727}
2728
2729sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_;
2731
2732 # TODO: should use vbox->find_widget or so
2733 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2734 $self->{hover} = $self->{item}{$HOVER};
2735}
2736
2737sub button_up {
2738 my ($self, $ev, $x, $y) = @_;
2739
2740 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB;
2742 $self->hide;
2743
2744 $self->emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover};
2746 }
2747}
2748
2749#############################################################################
2750
2751package CFClient::UI::Statusbox;
2752
2753our @ISA = CFClient::UI::VBox::;
2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2761 )
2762}
2763
2764sub reorder {
2765 my ($self) = @_;
2766 my $NOW = time;
2767
2768 while (my ($k, $v) = each %{ $self->{item} }) {
2769 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2770 }
2771
2772 my @widgets;
2773
2774 my @items = sort {
2775 $a->{pri} <=> $b->{pri}
2776 or $b->{id} <=> $a->{id}
2777 } values %{ $self->{item} };
2778
2779 my $count = 10 + 1;
2780 for my $item (@items) {
2781 last unless --$count;
2782
2783 push @widgets, $item->{label} ||= do {
2784 # TODO: doesn't handle markup well (read as: at all)
2785 my $short = $item->{count} > 1
2786 ? "<b>$item->{count} ×</b> $item->{text}"
2787 : $item->{text};
2788
2789 for ($short) {
2790 s/^\s+//;
2791 s/\s+/ /g;
2792 }
2793
2794 new CFClient::UI::Label
2795 markup => $short,
2796 tooltip => $item->{tooltip},
2797 tooltip_font => $::FONT_PROP,
2798 tooltip_width => 0.67,
2799 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44,
2801 fg => $item->{fg},
2802 can_events => 1,
2803 can_hover => 1
2804 };
2805 }
2806
2807 $self->clear;
2808 $self->SUPER::add (reverse @widgets);
2809}
2810
2811sub add {
2812 my ($self, $text, %arg) = @_;
2813
2814 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//;
2816
2817 my $timeout = time + ((delete $arg{timeout}) || 60);
2818
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820
2821 if (my $item = $self->{item}{$group}) {
2822 if ($item->{text} eq $text) {
2823 $item->{count}++;
2824 } else {
2825 $item->{count} = 1;
2826 $item->{text} = $item->{tooltip} = $text;
2827 }
2828 $item->{id} = ++$self->{id};
2829 $item->{timeout} = $timeout;
2830 delete $item->{label};
2831 } else {
2832 $self->{item}{$group} = {
2833 id => ++$self->{id},
2834 text => $text,
2835 timeout => $timeout,
2836 tooltip => $text,
2837 fg => [0.8, 0.8, 0.8, 0.8],
2838 pri => 0,
2839 count => 1,
2840 %arg,
2841 };
2842 }
2843
2844 $self->reorder;
2845}
2846
2847sub reconfigure {
2848 my ($self) = @_;
2849
2850 delete $_->{label}
2851 for values %{ $self->{item} || {} };
2852
2853 $self->reorder;
2854 $self->SUPER::reconfigure;
2855}
2856
2857#############################################################################
2858
2111package CFClient::UI::Root; 2859package CFClient::UI::Root;
2112 2860
2113our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
2114 2862
2115use CFClient::OpenGL; 2863use CFClient::OpenGL;
2116 2864
2117sub check_size { 2865sub new {
2118 my ($self) = @_; 2866 my $class = shift;
2119 2867
2120 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2868 $class->SUPER::new (
2121} 2869 @_,
2122 2870 )
2123sub size_request {
2124 ($::WIDTH, $::HEIGHT)
2125} 2871}
2126 2872
2127sub configure { 2873sub configure {
2128 my ($self, $x, $y, $w, $h) = @_; 2874 my ($self, $x, $y, $w, $h) = @_;
2129 2875
2130 $self->SUPER::configure ($x, $y, $w, $h); 2876 $self->{w} = $w;
2877 $self->{h} = $h;
2878}
2131 2879
2880sub check_size {
2881 my ($self) = @_;
2882
2883 $self->size_allocate ($self->{w}, $self->{h})
2884 if $self->{w};
2885}
2886
2887sub size_request {
2888 my ($self) = @_;
2889
2890 ($self->{w}, $self->{h})
2891}
2892
2893sub size_allocate {
2894 my ($self, $w, $h) = @_;
2895
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2132 for my $child (@{$self->{children}}) { 2902 for my $child ($self->children) {
2133 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2134 2904
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906 if exists $child->{req_x};
2907
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909 if exists $child->{req_y};
2910
2135 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2136 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913
2137 $child->configure ($X, $Y, $W,$H); 2914 $child->configure ($X, $Y, $W, $H);
2138 } 2915 }
2139} 2916}
2140 2917
2141sub _topleft { 2918sub coord2local {
2142 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2143 2920
2144 ($x, $y) 2921 ($x, $y)
2145} 2922}
2146 2923
2924sub coord2global {
2925 my ($self, $x, $y) = @_;
2926
2927 ($x, $y)
2928}
2929
2147sub update { 2930sub update {
2148 my ($self) = @_; 2931 my ($self) = @_;
2149 2932
2150 $self->check_size; 2933 $self->check_size;
2151 ::refresh (); 2934 $::WANT_REFRESH++;
2152} 2935}
2153 2936
2154sub add { 2937sub add {
2155 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2156 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2157 # integerize window positions 2943 # integerise window positions
2158 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2159 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2160 2947
2161 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2162} 2949}
2163 2950
2164sub on_refresh { 2951sub on_refresh {
2165 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2166 2953
2167 $self->{refresh_hook}{$id} = $cb; 2954 $self->{refresh_hook}{$id} = $cb;
2168} 2955}
2169 2956
2957sub on_post_alloc {
2958 my ($self, $id, $cb) = @_;
2959
2960 $self->{post_alloc_hook}{$id} = $cb;
2961}
2962
2170sub draw { 2963sub draw {
2171 my ($self) = @_; 2964 my ($self) = @_;
2172 2965
2173 while (my $rcb = delete $self->{refresh_hook}) { 2966 while ($self->{refresh_hook}) {
2174 $_->() for values %$rcb; 2967 $_->()
2968 for values %{delete $self->{refresh_hook}};
2969 }
2970
2971 if ($self->{check_size}) {
2972 my @queue = ([], []);
2973
2974 for (;;) {
2975 if ($self->{check_size}) {
2976 # heuristic: check containers last
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2978 for values %{delete $self->{check_size}}
2979 }
2980
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2982
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2984 ? @$widget{qw(user_w user_h)}
2985 : $widget->size_request;
2986
2987 if (delete $widget->{force_alloc}
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990
2991 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h;
2993
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2995
2996 $widget->{parent}->check_size
2997 if $widget->{parent};
2998 }
2999 }
3000 }
3001
3002 while ($self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) {
3004 my ($widget, $w, $h) = @$_;
3005
3006 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0;
3008
3009 $widget->{w} = $w;
3010 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h);
3012 $widget->emit (size_allocate => $w, $h);
3013 }
3014 }
3015
3016 while ($self->{post_alloc_hook}) {
3017 $_->()
3018 for values %{delete $self->{post_alloc_hook}};
2175 } 3019 }
2176 3020
2177 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2178 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2179 glClear GL_COLOR_BUFFER_BIT; 3023 glClear GL_COLOR_BUFFER_BIT;
… …
2190############################################################################# 3034#############################################################################
2191 3035
2192package CFClient::UI; 3036package CFClient::UI;
2193 3037
2194$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2195 3040
21961 30411
2197 3042

Diff Legend

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