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.102 by elmex, Fri Apr 14 12:17:06 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC

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

Diff Legend

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