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

Diff Legend

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