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

Diff Legend

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