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.87 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.239 by root, Thu May 25 22:29:57 2006 UTC

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

Diff Legend

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