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

Diff Legend

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