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.109 by root, Sat Apr 15 01:13:47 2006 UTC vs.
Revision 1.235 by root, Thu May 25 16:35:42 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;
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
676sub add { 1106sub add {
677 my ($self, $x, $y, $chld) = @_; 1107 my ($self, $x, $y, $child) = @_;
678 1108
1109 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 1110 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 1111
682 $self->{w} = $self->{h} = -1; 1112 $child->check_size;
1113}
1114
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs 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
683 $self->update; 1131 $self->update;
684} 1132}
685 1133
686sub get_wh { 1134sub get_wh {
687 my ($self) = @_; 1135 my ($self) = @_;
… …
693 or next; 1141 or next;
694 1142
695 for my $x (0 .. $#$row) { 1143 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x] 1144 my $widget = $row->[$x]
697 or next; 1145 or next;
698 my ($w, $h) = $widget->size_request; 1146 my ($w, $h) = @$widget{qw(req_w req_h)};
699 1147
700 $w[$x] = max $w[$x], $w; 1148 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h; 1149 $h[$y] = max $h[$y], $h;
702 } 1150 }
703 } 1151 }
… …
715 (sum @$hs), 1163 (sum @$hs),
716 ) 1164 )
717} 1165}
718 1166
719sub size_allocate { 1167sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_; 1168 my ($self, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723 1169
724 my ($ws, $hs) = $self->get_wh; 1170 my ($ws, $hs) = $self->get_wh;
725 1171
726 my $req_w = sum @$ws; 1172 my $req_w = sum @$ws;
727 my $req_h = sum @$hs; 1173 my $req_h = sum @$hs;
… …
733 1179
734 # linearly scale sizes 1180 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1181 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1182 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737 1183
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems 1184 CFClient::UI::harmonize $ws;
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems 1185 CFClient::UI::harmonize $hs;
740 1186
741 my $y; 1187 my $y;
742 1188
743 for my $r (0 .. $#{$self->{children}}) { 1189 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r] 1190 my $row = $self->{children}[$r]
… …
749 1195
750 for my $c (0 .. $#$row) { 1196 for my $c (0 .. $#$row) {
751 my $col_w = $ws->[$c]; 1197 my $col_w = $ws->[$c];
752 1198
753 if (my $widget = $row->[$c]) { 1199 if (my $widget = $row->[$c]) {
754 $widget->size_allocate ($x, $y, $col_w, $row_h); 1200 $widget->configure ($x, $y, $col_w, $row_h);
755 } 1201 }
756 1202
757 $x += $col_w; 1203 $x += $col_w;
758 } 1204 }
759 1205
… …
804 (List::Util::max map $_->[1], @alloc), 1250 (List::Util::max map $_->[1], @alloc),
805 ) 1251 )
806} 1252}
807 1253
808sub size_allocate { 1254sub size_allocate {
809 my ($self, $x, $y, $w, $h) = @_; 1255 my ($self, $w, $h) = @_;
810
811 $self->_size_allocate ($x, $y, $w, $h);
812 1256
813 ($h, $w) = ($w, $h); 1257 ($h, $w) = ($w, $h);
814 1258
815 my $children = $self->{children}; 1259 my $children = $self->{children};
816 1260
817 my @h = map +($_->size_request)[0], @$children; 1261 my @h = map $_->{req_w}, @$children;
818 1262
819 my $req_h = List::Util::sum @h; 1263 my $req_h = List::Util::sum @h;
820 1264
821 if ($req_h > $h) { 1265 if ($req_h > $h) {
822 # ah well, not enough space 1266 # ah well, not enough space
… …
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 1277 $h[$_] = $alloc_h;
834 } 1278 }
835 } 1279 }
836 1280
1281 CFClient::UI::harmonize \@h;
1282
837 my $y = 0; 1283 my $y = 0;
838 for (0 .. $#$children) { 1284 for (0 .. $#$children) {
839 my $child = $children->[$_]; 1285 my $child = $children->[$_];
840 my $h = int $h[$_]; 1286 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 1287 $child->configure ($y, 0, $h, $w);
842 1288
843 $y += $h; 1289 $y += $h;
844 } 1290 }
1291
1292 1
845} 1293}
846 1294
847############################################################################# 1295#############################################################################
848 1296
849package CFClient::UI::VBox; 1297package CFClient::UI::VBox;
… …
862 (List::Util::sum map $_->[1], @alloc), 1310 (List::Util::sum map $_->[1], @alloc),
863 ) 1311 )
864} 1312}
865 1313
866sub size_allocate { 1314sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_; 1315 my ($self, $w, $h) = @_;
868 1316
869 $self->_size_allocate ($x, $y, $w, $h); 1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
870 1318
871 my $children = $self->{children}; 1319 my $children = $self->{children};
872 1320
873 my @h = map +($_->size_request)[1], @$children; 1321 my @h = map $_->{req_h}, @$children;
874 1322
875 my $req_h = List::Util::sum @h; 1323 my $req_h = List::Util::sum @h;
876 1324
877 if ($req_h > $h) { 1325 if ($req_h > $h) {
878 # ah well, not enough space 1326 # ah well, not enough space
… …
886 1334
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888 } 1336 }
889 } 1337 }
890 1338
1339 CFClient::UI::harmonize \@h;
1340
891 my $y = 0; 1341 my $y = 0;
892 for (0 .. $#$children) { 1342 for (0 .. $#$children) {
893 my $child = $children->[$_]; 1343 my $child = $children->[$_];
894 my $h = int $h[$_]; 1344 my $h = $h[$_];
895 $child->size_allocate (0, $y, $w, $h); 1345 $child->configure (0, $y, $w, $h);
896 1346
897 $y += $h; 1347 $y += $h;
898 } 1348 }
1349
1350 1
899} 1351}
900 1352
901############################################################################# 1353#############################################################################
902 1354
903package CFClient::UI::Label; 1355package CFClient::UI::Label;
904 1356
905our @ISA = CFClient::UI::Base::; 1357our @ISA = CFClient::UI::DrawBG::;
906 1358
907use SDL::OpenGL; 1359use CFClient::OpenGL;
908 1360
909sub new { 1361sub new {
910 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
911 1363
912 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
913 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
914 fontsize => $::FONTSIZE, 1366 #bg => none
915 text => "", 1367 #active_bg => none
1368 #font => default_font
1369 #text => initial text
1370 #markup => initial narkup
1371 #max_w => maximum pixel width
1372 ellipsise => 3, # end
1373 layout => (new CFClient::Layout),
1374 fontsize => 1,
916 align => -1, 1375 align => -1,
1376 valign => -1,
917 padding => 2, 1377 padding => 2,
918 layout => new CFClient::Layout, 1378 can_events => 0,
919 %arg 1379 %arg
920 ); 1380 );
921 1381
1382 if (exists $self->{template}) {
1383 my $layout = new CFClient::Layout;
1384 $layout->set_text (delete $self->{template});
1385 $self->{template} = $layout;
1386 }
1387
1388 if (exists $self->{markup}) {
1389 $self->set_markup (delete $self->{markup});
1390 } else {
922 $self->set_text ($self->{text}); 1391 $self->set_text (delete $self->{text});
1392 }
923 1393
924 $self 1394 $self
925} 1395}
926 1396
927sub escape_text { 1397sub escape($) {
928 local $_ = $_[1]; 1398 local $_ = $_[0];
929 1399
930 s/&/&amp;/g; 1400 s/&/&amp;/g;
931 s/>/&gt;/g; 1401 s/>/&gt;/g;
932 s/</&lt;/g; 1402 s/</&lt;/g;
933 1403
934 $_[1] 1404 $_
1405}
1406
1407sub update {
1408 my ($self) = @_;
1409
1410 delete $self->{texture};
1411 $self->SUPER::update;
935} 1412}
936 1413
937sub set_text { 1414sub set_text {
938 my ($self, $text) = @_; 1415 my ($self, $text) = @_;
939 1416
1417 return if $self->{text} eq "T$text";
940 $self->{text} = $text; 1418 $self->{text} = "T$text";
1419
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
941 $self->{layout}->set_markup ($text); 1421 $self->{layout}->set_text ($text);
942 1422
943 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
945 $self->update; 1423 $self->update;
1424 $self->check_size;
946} 1425}
947 1426
948sub get_text { 1427sub set_markup {
949 my ($self, $text) = @_; 1428 my ($self, $markup) = @_;
950 1429
951 $self->{text} 1430 return if $self->{text} eq "M$markup";
1431 $self->{text} = "M$markup";
1432
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup);
1437
1438 $self->update;
1439 $self->check_size;
952} 1440}
953 1441
954sub size_request { 1442sub size_request {
955 my ($self) = @_; 1443 my ($self) = @_;
956 1444
957 $self->{layout}->set_width; 1445 $self->{layout}->set_font ($self->{font}) if $self->{font};
1446 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
958 $self->{layout}->set_height ($self->{fontsize}); 1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1450
959 my ($w, $h) = $self->{layout}->size; 1451 my ($w, $h) = $self->{layout}->size;
1452
1453 if (exists $self->{template}) {
1454 $self->{template}->set_font ($self->{font}) if $self->{font};
1455 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1456
1457 my ($w2, $h2) = $self->{template}->size;
1458
1459 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2;
1461 }
960 1462
961 ( 1463 (
962 $w + $self->{padding} * 2, 1464 $w + $self->{padding} * 2,
963 $h + $self->{padding} * 2, 1465 $h + $self->{padding} * 2,
964 ) 1466 )
965} 1467}
966 1468
967sub size_allocate { 1469sub size_allocate {
968 my ($self, $x, $y, $w, $h) = @_; 1470 my ($self, $w, $h) = @_;
969
970 $self->_size_allocate ($x, $y, $w, $h) or return;
971 1471
972 delete $self->{texture}; 1472 delete $self->{texture};
973} 1473}
974 1474
975sub update { 1475sub set_fontsize {
976 my ($self) = @_; 1476 my ($self, $fontsize) = @_;
977 1477
1478 $self->{fontsize} = $fontsize;
978 delete $self->{texture}; 1479 delete $self->{texture};
1480
979 $self->SUPER::update; 1481 $self->update;
1482 $self->check_size;
980} 1483}
981 1484
982sub _draw { 1485sub _draw {
983 my ($self) = @_; 1486 my ($self) = @_;
984 1487
1488 $self->SUPER::_draw; # draw background, if applicable
1489
985 my $tex = $self->{texture} ||= do { 1490 my $tex = $self->{texture} ||= do {
1491 $self->{layout}->set_foreground (@{$self->{fg}});
1492 $self->{layout}->set_font ($self->{font}) if $self->{font};
986 $self->{layout}->set_width ($self->{w}); 1493 $self->{layout}->set_width ($self->{w});
987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1494 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497
988 new_from_layout CFClient::Texture $self->{layout} 1498 my $tex = new_from_layout CFClient::Texture $self->{layout};
1499
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1502 : ($self->{w} - $tex->{w}) * 0.5);
1503
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1506 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
989 }; 1509 };
990 1510
991 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993 glEnable GL_TEXTURE_2D; 1511 glEnable GL_TEXTURE_2D;
994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995 1513
1514 if ($tex->{format} == GL_ALPHA) {
996 glColor @{$self->{fg}}; 1515 glColor @{$self->{fg}};
997 1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
998 my $x = 1517 } else {
999 $self->{align} < 0 ? $self->{padding} 1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1519 }
1001 : ($self->{w} - $tex->{w}) * 0.5;
1002
1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1004 1520
1005 glDisable GL_TEXTURE_2D; 1521 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND;
1007} 1522}
1008 1523
1009############################################################################# 1524#############################################################################
1010 1525
1011package CFClient::UI::Entry; 1526package CFClient::UI::EntryBase;
1012 1527
1013our @ISA = CFClient::UI::Label::; 1528our @ISA = CFClient::UI::Label::;
1014 1529
1015use SDL; 1530use CFClient::OpenGL;
1016use SDL::OpenGL;
1017 1531
1018sub new { 1532sub new {
1019 my $class = shift; 1533 my $class = shift;
1020 1534
1021 $class->SUPER::new ( 1535 $class->SUPER::new (
1022 fg => [1, 1, 1], 1536 fg => [1, 1, 1],
1023 bg => [0, 0, 0, 0.2], 1537 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5], 1538 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0], 1539 active_fg => [0, 0, 0],
1026 can_hover => 1, 1540 can_hover => 1,
1027 can_focus => 1, 1541 can_focus => 1,
1542 valign => 0,
1543 can_events => 1,
1544 #text => ...
1028 @_ 1545 @_
1029 ) 1546 )
1030} 1547}
1031 1548
1032sub _set_text { 1549sub _set_text {
1033 my ($self, $text) = @_; 1550 my ($self, $text) = @_;
1034 1551
1035 my $old_text = $self->{text}; 1552 delete $self->{cur_h};
1553
1554 return if $self->{text} eq $text;
1555
1556 delete $self->{texture};
1036 1557
1037 $self->{last_activity} = $::NOW; 1558 $self->{last_activity} = $::NOW;
1038
1039 $self->{text} = $text; 1559 $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 1560
1043 $text =~ s/./*/g if $self->{hidden}; 1561 $text =~ s/./*/g if $self->{hidden};
1562 $self->{layout}->set_text ("$text ");
1044 1563
1045 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1564 $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} 1565}
1071 1566
1072sub set_text { 1567sub set_text {
1073 my ($self, $text) = @_; 1568 my ($self, $text) = @_;
1074 1569
1075 $self->{cursor} = length $text; 1570 $self->{cursor} = length $text;
1076 $self->_set_text ($text); 1571 $self->_set_text ($text);
1077 $self->update; 1572 $self->update;
1573 $self->check_size;
1574}
1575
1576sub get_text {
1577 $_[0]{text}
1578}
1579
1580sub size_request {
1581 my ($self) = @_;
1582
1583 my ($w, $h) = $self->SUPER::size_request;
1584
1585 ($w + 1, $h) # add 1 for cursor
1078} 1586}
1079 1587
1080sub key_down { 1588sub key_down {
1081 my ($self, $ev) = @_; 1589 my ($self, $ev) = @_;
1082 1590
1083 my $mod = $ev->key_mod; 1591 my $mod = $ev->{mod};
1084 my $sym = $ev->key_sym; 1592 my $sym = $ev->{sym};
1085
1086 my $uni = $ev->key_unicode; 1593 my $uni = $ev->{unicode};
1087 1594
1088 my $text = $self->get_text; 1595 my $text = $self->get_text;
1089 1596
1090 if ($sym == SDLK_BACKSPACE) { 1597 if ($uni == 8) {
1091 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1598 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1092 } elsif ($sym == SDLK_DELETE) { 1599 } elsif ($uni == 127) {
1093 substr $text, $self->{cursor}, 1, ""; 1600 substr $text, $self->{cursor}, 1, "";
1094 } elsif ($sym == SDLK_LEFT) { 1601 } elsif ($sym == CFClient::SDLK_LEFT) {
1095 --$self->{cursor} if $self->{cursor}; 1602 --$self->{cursor} if $self->{cursor};
1096 } elsif ($sym == SDLK_RIGHT) { 1603 } elsif ($sym == CFClient::SDLK_RIGHT) {
1097 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1604 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1098 } elsif ($sym == SDLK_HOME) { 1605 } elsif ($sym == CFClient::SDLK_HOME) {
1099 $self->{cursor} = 0; 1606 $self->{cursor} = 0;
1100 } elsif ($sym == SDLK_END) { 1607 } elsif ($sym == CFClient::SDLK_END) {
1101 $self->{cursor} = length $text; 1608 $self->{cursor} = length $text;
1102 } elsif ($sym == SDLK_ESCAPE) { 1609 } elsif ($uni == 27) {
1103 $self->emit ('escape'); 1610 $self->_emit ('escape');
1104 } elsif ($uni) { 1611 } elsif ($uni) {
1105 substr $text, $self->{cursor}++, 0, chr $uni; 1612 substr $text, $self->{cursor}++, 0, chr $uni;
1106 } 1613 }
1107 1614
1108 $self->_set_text ($text); 1615 $self->_set_text ($text);
1109 $self->update; 1616 $self->update;
1617 $self->check_size;
1110} 1618}
1111 1619
1112sub focus_in { 1620sub focus_in {
1113 my ($self) = @_; 1621 my ($self) = @_;
1114 1622
… …
1162 1670
1163 $self->SUPER::_draw; 1671 $self->SUPER::_draw;
1164 1672
1165 #TODO: force update every cursor change :( 1673 #TODO: force update every cursor change :(
1166 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1674 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1675
1676 unless (exists $self->{cur_h}) {
1677 my $text = substr $self->{text}, 0, $self->{cursor};
1678 utf8::encode $text;
1679
1680 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1681 }
1682
1167 glColor @{$self->{fg}}; 1683 glColor @{$self->{fg}};
1168 glBegin GL_LINES; 1684 glBegin GL_LINES;
1169 glVertex $self->{cur_x}, $self->{cur_y};
1170 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1685 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1686 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1171 glEnd; 1687 glEnd;
1172 } 1688 }
1173} 1689}
1174 1690
1175package CFClient::UI::LineEntry; 1691package CFClient::UI::Entry;
1176 1692
1177our @ISA = CFClient::UI::Entry::; 1693our @ISA = CFClient::UI::EntryBase::;
1178 1694
1179use SDL; 1695use CFClient::OpenGL;
1180use SDL::OpenGL;
1181 1696
1182sub key_down { 1697sub key_down {
1183 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1184 1699
1185 my $sym = $ev->key_sym; 1700 my $sym = $ev->{sym};
1186 1701
1187 if ($sym == SDLK_RETURN) { 1702 if ($sym == 13) {
1703 unshift @{$self->{history}},
1704 my $txt = $self->get_text;
1705 $self->{history_pointer} = -1;
1706 $self->{history_saveback} = '';
1188 $self->emit (activate => $self->get_text); 1707 $self->_emit (activate => $txt);
1189 $self->update; 1708 $self->update;
1709
1710 } elsif ($sym == CFClient::SDLK_UP) {
1711 if ($self->{history_pointer} < 0) {
1712 $self->{history_saveback} = $self->get_text;
1713 }
1714 if (@{$self->{history} || []} > 0) {
1715 $self->{history_pointer}++;
1716 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1717 $self->{history_pointer} = @{$self->{history} || []} - 1;
1718 }
1719 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1720 }
1721
1722 } elsif ($sym == CFClient::SDLK_DOWN) {
1723 $self->{history_pointer}--;
1724 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1725
1726 if ($self->{history_pointer} >= 0) {
1727 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1728 } else {
1729 $self->set_text ($self->{history_saveback});
1730 }
1190 1731
1191 } else { 1732 } else {
1192 $self->SUPER::key_down ($ev); 1733 $self->SUPER::key_down ($ev);
1193 } 1734 }
1194 1735
… …
1198 1739
1199package CFClient::UI::Button; 1740package CFClient::UI::Button;
1200 1741
1201our @ISA = CFClient::UI::Label::; 1742our @ISA = CFClient::UI::Label::;
1202 1743
1203use SDL; 1744use CFClient::OpenGL;
1204use SDL::OpenGL;
1205 1745
1206my @tex = 1746my @tex =
1207 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1208 qw(b1_button_active.png); 1748 qw(b1_button_active.png);
1209 1749
1210sub new { 1750sub new {
1211 my $class = shift; 1751 my $class = shift;
1212 1752
1213 $class->SUPER::new ( 1753 $class->SUPER::new (
1214 padding => 4, 1754 padding => 4,
1215 fg => [1, 1, 1], 1755 fg => [1, 1, 1],
1216 bg => [1, 1, 1, 0.2],
1217 active_fg => [1, 1, 0], 1756 active_fg => [0, 0, 1],
1218 can_hover => 1, 1757 can_hover => 1,
1758 align => 0,
1759 valign => 0,
1760 can_events => 1,
1219 @_ 1761 @_
1220 ) 1762 )
1221} 1763}
1222 1764
1765sub activate { }
1766
1223sub button_up { 1767sub button_up {
1224 my ($self, $ev, $x, $y) = @_; 1768 my ($self, $ev, $x, $y) = @_;
1225 1769
1770 $self->emit ("activate")
1226 if ($x >= 0 && $x < $self->{w} 1771 if $x >= 0 && $x < $self->{w}
1227 && $y >= 0 && $y < $self->{h}) { 1772 && $y >= 0 && $y < $self->{h};
1228 $self->emit ("activate");
1229 }
1230} 1773}
1231 1774
1232sub _draw { 1775sub _draw {
1233 my ($self) = @_; 1776 my ($self) = @_;
1234 1777
1235 local $self->{fg} = $self->{fg}; 1778 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 1779
1242 if ($GRAB == $self) { 1780 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg}; 1781 $self->{fg} = $self->{active_fg};
1244 } 1782 }
1245 1783
1246 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1784 glEnable GL_TEXTURE_2D;
1247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786 glColor 0, 0, 0, 1;
1248 1787
1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1788 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1250 1789
1251 glDisable GL_TEXTURE_2D; 1790 glDisable GL_TEXTURE_2D;
1252 glDisable GL_BLEND;
1253 1791
1254 $self->SUPER::_draw; 1792 $self->SUPER::_draw;
1255} 1793}
1256 1794
1257############################################################################# 1795#############################################################################
… …
1259package CFClient::UI::CheckBox; 1797package CFClient::UI::CheckBox;
1260 1798
1261our @ISA = CFClient::UI::DrawBG::; 1799our @ISA = CFClient::UI::DrawBG::;
1262 1800
1263my @tex = 1801my @tex =
1264 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1265 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1803 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1266 1804
1267use SDL; 1805use CFClient::OpenGL;
1268use SDL::OpenGL;
1269 1806
1270sub new { 1807sub new {
1271 my $class = shift; 1808 my $class = shift;
1272 1809
1273 $class->SUPER::new ( 1810 $class->SUPER::new (
1274 padding => 2, 1811 padding => 2,
1275 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1276 active_fg => [1, 1, 0], 1813 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5],
1277 state => 0, 1816 state => 0,
1278 can_hover => 1, 1817 can_hover => 1,
1279 @_ 1818 @_
1280 ) 1819 )
1281} 1820}
… …
1284 my ($self) = @_; 1823 my ($self) = @_;
1285 1824
1286 ($self->{padding} * 2 + 6) x 2 1825 ($self->{padding} * 2 + 6) x 2
1287} 1826}
1288 1827
1289sub size_allocate {
1290 my ($self, $x, $y, $w, $h) = @_;
1291
1292 $self->_size_allocate ($x, $y, $w, $h);
1293}
1294
1295sub button_down { 1828sub button_down {
1296 my ($self, $ev, $x, $y) = @_; 1829 my ($self, $ev, $x, $y) = @_;
1297 1830
1298 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1299 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1300 $self->{state} = !$self->{state}; 1833 $self->{state} = !$self->{state};
1301 $self->emit (changed => $self->{state}); 1834 $self->_emit (changed => $self->{state});
1302 } 1835 }
1303} 1836}
1304 1837
1305sub _draw { 1838sub _draw {
1306 my ($self) = @_; 1839 my ($self) = @_;
… …
1311 1844
1312 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1313 1846
1314 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1315 1848
1849 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850
1851 glEnable GL_TEXTURE_2D;
1852 $tex->draw_quad_alpha (0, 0, $s, $s);
1853 glDisable GL_TEXTURE_2D;
1854}
1855
1856#############################################################################
1857
1858package CFClient::UI::Image;
1859
1860our @ISA = CFClient::UI::Base::;
1861
1862use CFClient::OpenGL;
1863use Carp qw/confess/;
1864
1865our %loaded_images;
1866
1867sub new {
1868 my $class = shift;
1869
1870 my $self = $class->SUPER::new (can_events => 0, @_);
1871
1872 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1873
1874 $loaded_images{$self->{image}} ||=
1875 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1876
1877 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1878
1879 Scalar::Util::weaken $loaded_images{$self->{image}};
1880
1881 $self->{aspect} = $tex->{w} / $tex->{h};
1882
1883 $self
1884}
1885
1886sub size_request {
1887 my ($self) = @_;
1888
1889 ($self->{tex}->{w}, $self->{tex}->{h})
1890}
1891
1892sub _draw {
1893 my ($self) = @_;
1894
1895 my $tex = $self->{tex};
1896
1897 my ($w, $h) = ($self->{w}, $self->{h});
1898
1899 if ($self->{rot90}) {
1900 glRotate 90, 0, 0, 1;
1901 glTranslate 0, -$self->{w}, 0;
1902
1903 ($w, $h) = ($h, $w);
1904 }
1905
1906 glEnable GL_TEXTURE_2D;
1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1908
1909 $tex->draw_quad_alpha (0, 0, $w, $h);
1910
1911 glDisable GL_TEXTURE_2D;
1912}
1913
1914#############################################################################
1915
1916package CFClient::UI::VGauge;
1917
1918our @ISA = CFClient::UI::Base::;
1919
1920use List::Util qw(min max);
1921
1922use CFClient::OpenGL;
1923
1924my %tex = (
1925 food => [
1926 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1927 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1928 ],
1929 grace => [
1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1931 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1932 ],
1933 hp => [
1934 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1935 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1936 ],
1937 mana => [
1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1939 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1940 ],
1941);
1942
1943# eg. VGauge->new (gauge => 'food'), default gauge: food
1944sub new {
1945 my $class = shift;
1946
1947 my $self = $class->SUPER::new (
1948 type => 'food',
1949 @_
1950 );
1951
1952 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1953
1954 $self
1955}
1956
1957sub size_request {
1958 my ($self) = @_;
1959
1960 #my $tex = $tex{$self->{type}}[0];
1961 #@$tex{qw(w h)}
1962 (0, 0)
1963}
1964
1965sub set_max {
1966 my ($self, $max) = @_;
1967
1968 return if $self->{max_val} == $max;
1969
1970 $self->{max_val} = $max;
1971 $self->update;
1972}
1973
1974sub set_value {
1975 my ($self, $val, $max) = @_;
1976
1977 $self->set_max ($max)
1978 if defined $max;
1979
1980 return if $self->{val} == $val;
1981
1982 $self->{val} = $val;
1983 $self->update;
1984}
1985
1986sub _draw {
1987 my ($self) = @_;
1988
1989 my $tex = $tex{$self->{type}};
1990 my ($t1, $t2, $t3) = @$tex;
1991
1992 my ($w, $h) = ($self->{w}, $self->{h});
1993
1994 if ($self->{vertical}) {
1995 glRotate 90, 0, 0, 1;
1996 glTranslate 0, -$self->{w}, 0;
1997
1998 ($w, $h) = ($h, $w);
1999 }
2000
2001 my $ycut = $self->{val} / ($self->{max_val} || 1);
2002
2003 my $ycut1 = max 0, min 1, $ycut;
2004 my $ycut2 = max 0, min 1, $ycut - 1;
2005
2006 my $h1 = $self->{h} * (1 - $ycut1);
2007 my $h2 = $self->{h} * (1 - $ycut2);
2008
1316 glEnable GL_BLEND; 2009 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D; 2011 glEnable GL_TEXTURE_2D;
1318 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319 2013
1320 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2014 glBindTexture GL_TEXTURE_2D, $t1->{name};
2015 glBegin GL_QUADS;
2016 glTexCoord 0 , 0; glVertex 0 , 0;
2017 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
2018 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
2019 glTexCoord $t1->{s}, 0; glVertex $w, 0;
2020 glEnd;
1321 2021
1322 $tex->draw_quad (0, 0, $s, $s); 2022 my $ycut1 = List::Util::min 1, $ycut;
2023 glBindTexture GL_TEXTURE_2D, $t2->{name};
2024 glBegin GL_QUADS;
2025 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
2026 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
2027 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
2028 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
2029 glEnd;
1323 2030
2031 if ($t3) {
2032 glBindTexture GL_TEXTURE_2D, $t3->{name};
2033 glBegin GL_QUADS;
2034 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2035 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2036 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2037 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2038 glEnd;
2039 }
2040
2041 glDisable GL_BLEND;
1324 glDisable GL_TEXTURE_2D; 2042 glDisable GL_TEXTURE_2D;
1325 glDisable GL_BLEND;
1326} 2043}
1327 2044
1328############################################################################# 2045#############################################################################
1329 2046
2047package CFClient::UI::Gauge;
2048
2049our @ISA = CFClient::UI::VBox::;
2050
2051sub new {
2052 my ($class, %arg) = @_;
2053
2054 my $self = $class->SUPER::new (
2055 tooltip => $arg{type},
2056 can_hover => 1,
2057 can_events => 1,
2058 %arg,
2059 );
2060
2061 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2062 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2063 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
2064
2065 $self
2066}
2067
2068sub set_fontsize {
2069 my ($self, $fsize) = @_;
2070
2071 $self->{value}->set_fontsize ($fsize);
2072 $self->{max} ->set_fontsize ($fsize);
2073}
2074
2075sub set_max {
2076 my ($self, $max) = @_;
2077
2078 $self->{gauge}->set_max ($max);
2079 $self->{max}->set_text ($max);
2080}
2081
2082sub set_value {
2083 my ($self, $val, $max) = @_;
2084
2085 $self->set_max ($max)
2086 if defined $max;
2087
2088 $self->{gauge}->set_value ($val, $max);
2089 $self->{value}->set_text ($val);
2090}
2091
2092#############################################################################
2093
1330package CFClient::UI::Slider; 2094package CFClient::UI::Slider;
1331 2095
1332use strict; 2096use strict;
1333 2097
1334use SDL::OpenGL; 2098use CFClient::OpenGL;
1335 2099
1336our @ISA = CFClient::UI::DrawBG::; 2100our @ISA = CFClient::UI::DrawBG::;
1337 2101
1338my @tex = 2102my @tex =
1339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2103 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1340 qw(s1_slider.png s1_slider_bg.png); 2104 qw(s1_slider.png s1_slider_bg.png);
1341 2105
1342sub new { 2106sub new {
1343 my $class = shift; 2107 my $class = shift;
1344 2108
1345 # range [value, low, high, page] 2109 # range [value, low, high, page, unit]
1346 2110
1347 # TODO: 0-width page 2111 # TODO: 0-width page
1348 # TODO: req_w/h are wrong with vertical 2112 # TODO: req_w/h are wrong with vertical
1349 # TODO: calculations are off 2113 # TODO: calculations are off
1350 my $self = $class->SUPER::new ( 2114 my $self = $class->SUPER::new (
1351 fg => [1, 1, 1], 2115 fg => [1, 1, 1],
1352 active_fg => [0, 0, 0], 2116 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5],
1353 range => [0, 0, 100, 10], 2119 range => [0, 0, 100, 10, 0],
1354 req_w => 40, 2120 req_w => $::WIDTH / 80,
1355 req_h => 13, 2121 req_h => $::WIDTH / 80,
1356 vertical => 0, 2122 vertical => 0,
1357 can_hover => 1, 2123 can_hover => 1,
1358 inner_pad => 5, 2124 inner_pad => 0.02,
1359 @_ 2125 @_
1360 ); 2126 );
1361 2127
2128 $self->set_value ($self->{range}[0]);
2129 $self->update;
2130
1362 $self 2131 $self
2132}
2133
2134sub set_range {
2135 my ($self, $range) = @_;
2136
2137 $self->{range} = $range;
2138
2139 $self->update;
2140}
2141
2142sub set_value {
2143 my ($self, $value) = @_;
2144
2145 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2146
2147 $hi = $lo + 1 if $hi <= $lo;
2148
2149 $page = $hi - $lo if $page > $hi - $lo;
2150
2151 $value = $lo if $value < $lo;
2152 $value = $hi - $page if $value > $hi - $page;
2153
2154 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2155 if $unit;
2156
2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158
2159 if ($value != $old_value) {
2160 $self->_emit (changed => $value);
2161 $self->update;
2162 }
1363} 2163}
1364 2164
1365sub size_request { 2165sub size_request {
1366 my ($self) = @_; 2166 my ($self) = @_;
1367 2167
… …
1373 2173
1374sub button_down { 2174sub button_down {
1375 my ($self, $ev, $x, $y) = @_; 2175 my ($self, $ev, $x, $y) = @_;
1376 2176
1377 $self->SUPER::button_down ($ev, $x, $y); 2177 $self->SUPER::button_down ($ev, $x, $y);
2178
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180
1378 $self->mouse_motion ($ev, $x, $y); 2181 $self->mouse_motion ($ev, $x, $y);
1379} 2182}
1380 2183
1381sub mouse_motion { 2184sub mouse_motion {
1382 my ($self, $ev, $x, $y) = @_; 2185 my ($self, $ev, $x, $y) = @_;
1383 2186
1384 if ($GRAB == $self) { 2187 if ($GRAB == $self) {
2188 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189
2190 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2195 }
2196}
2197
2198sub update {
2199 my ($self) = @_;
2200
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2202 $self->set_value ($self->{range}[0]);
2203
1385 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2204 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100;
1386 2206
1387 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2207 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1388 2208
1389 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2209 $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 2210 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1391 2211
1392 $x -= $inner_pad_px; # substract the padding 2212 $value = ($value - $lo) / $range;
1393 $x = $x * ($hi - $lo) / $inner_w + $lo; 2213 $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 2214
1398 $self->emit (changed => $x); 2215 $self->{knob_x} = $value - $knob_w * 0.5;
1399 $self->update; 2216 $self->{knob_w} = $knob_w;
1400 } 2217 });
1401}
1402 2218
1403# the inner_* stuff is for generating a padding for the slider handle, 2219 $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} 2220}
1410 2221
1411sub _draw { 2222sub _draw {
1412 my ($self) = @_; 2223 my ($self) = @_;
1413 2224
1414 $self->SUPER::_draw (); 2225 $self->SUPER::_draw ();
1415 2226
1416 my ($w, $h) = @$self{qw(w h)}; 2227 glScale $self->{w}, $self->{h};
1417 2228
1418 if ($self->{vertical}) { 2229 if ($self->{vertical}) {
1419 # draw a vertical slider like a rotated horizontal slider 2230 # draw a vertical slider like a rotated horizontal slider
1420 2231
2232 glTranslate 1, 0, 0;
1421 glRotate 90, 0, 0, 1; 2233 glRotate 90, 0, 0, 1;
1422 glTranslate 0, -$self->{w}, 0;
1423
1424 ($w, $h) = ($h, $w);
1425 } 2234 }
1426 2235
1427 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1428 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1429 2238
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; 2239 glEnable GL_TEXTURE_2D;
1451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1452 2241
1453 # draw background 2242 # draw background
1454 $tex[1]->draw_quad (0, 0, $w, $h); 2243 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1455 2244
1456 # draw handle 2245 # draw handle
1457 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2246 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1458 2247
1459 glDisable GL_BLEND;
1460 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
1461} 2249}
1462 2250
1463############################################################################# 2251#############################################################################
1464 2252
2253package CFClient::UI::ValSlider;
2254
2255our @ISA = CFClient::UI::HBox::;
2256
2257sub new {
2258 my ($class, %arg) = @_;
2259
2260 my $range = delete $arg{range};
2261
2262 my $self = $class->SUPER::new (
2263 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2264 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2265 to_value => sub { shift },
2266 from_value => sub { shift },
2267 %arg,
2268 );
2269
2270 $self->{slider}->connect (changed => sub {
2271 my ($self, $value) = @_;
2272 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2273 $self->{parent}->emit (changed => $value);
2274 });
2275
2276# $self->{entry}->connect (changed => sub {
2277# my ($self, $value) = @_;
2278# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2279# $self->{parent}->emit (changed => $value);
2280# });
2281
2282 $self->add ($self->{slider}, $self->{entry});
2283
2284 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2285
2286 $self
2287}
2288
2289sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) }
2291
2292#############################################################################
2293
1465package CFClient::UI::TextView; 2294package CFClient::UI::TextView;
1466 2295
1467our @ISA = CFClient::UI::HBox::; 2296our @ISA = CFClient::UI::HBox::;
1468 2297
1469use SDL::OpenGL; 2298use CFClient::OpenGL;
1470 2299
1471sub new { 2300sub new {
1472 my $class = shift; 2301 my $class = shift;
1473 2302
1474 my $self = $class->SUPER::new ( 2303 my $self = $class->SUPER::new (
1475 req_w => $::WIDTH / 6, 2304 fontsize => 1,
1476 req_h => $::HEIGHT / 6, 2305 can_events => 0,
1477 fontsize => $::FONTSIZE, 2306 #font => default_font
1478 @_, 2307 @_,
1479 2308
1480 layout => (new CFClient::Layout), 2309 layout => (new CFClient::Layout 1),
1481 par => [], 2310 par => [],
1482 height => 0, 2311 height => 0,
1483 children => [ 2312 children => [
1484 (new CFClient::UI::Empty expand => 1), 2313 (new CFClient::UI::Empty expand => 1),
1485 (new CFClient::UI::Slider vertical => 1), 2314 (new CFClient::UI::Slider vertical => 1),
1486 ], 2315 ],
1487 ); 2316 );
1488 2317
1489 $self->{children}[1]->connect (changed => sub { 2318 $self->{children}[1]->connect (changed => sub { $self->update });
1490 $self->update;
1491 });
1492 2319
1493 $self 2320 $self
1494} 2321}
1495 2322
1496sub set_fontsize { 2323sub set_fontsize {
… …
1498 2325
1499 $self->{fontsize} = $fontsize; 2326 $self->{fontsize} = $fontsize;
1500 $self->reflow; 2327 $self->reflow;
1501} 2328}
1502 2329
2330sub size_allocate {
2331 my ($self, $w, $h) = @_;
2332
2333 $self->SUPER::size_allocate ($w, $h);
2334
2335 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $self->{layout}->set_width ($self->{children}[0]{w});
2338
2339 $self->reflow;
2340}
2341
1503sub text_height { 2342sub text_size {
1504 my ($self, $text) = @_; 2343 my ($self, $text, $indent) = @_;
1505 2344
1506 my $layout = $self->{layout}; 2345 my $layout = $self->{layout};
1507 2346
1508 $layout->set_height ($self->{fontsize}); 2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1509 $layout->set_width ($self->{w}); 2348 $layout->set_width ($self->{children}[0]{w} - $indent);
1510 $layout->set_text ($text); 2349 $layout->set_markup ($text);
1511 2350
1512 ($layout->size)[1] 2351 $layout->size
1513} 2352}
1514 2353
1515sub reflow { 2354sub reflow {
1516 my ($self) = @_; 2355 my ($self) = @_;
1517 2356
1518 $self->{need_reflow}++; 2357 $self->{need_reflow}++;
1519 $self->update; 2358 $self->update;
1520} 2359}
1521 2360
1522sub size_request { 2361sub set_offset {
1523 my ($self) = @_; 2362 my ($self, $offset) = @_;
1524 2363
1525 ($self->{req_w}, $self->{req_h}) 2364 # todo: base offset on lines or so, not on pixels
2365 $self->{children}[1]->set_value ($offset);
1526} 2366}
1527 2367
1528sub size_allocate { 2368sub clear {
1529 my ($self, $x, $y, $w, $h) = @_; 2369 my ($self) = @_;
1530 2370
1531 $self->SUPER::size_allocate ($x, $y, $w, $h); 2371 $self->{par} = [];
1532 2372 $self->{height} = 0;
1533 $self->{layout}->set_height ($self->{fontsize}); 2373 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1534 $self->{layout}->set_width ($self->{w});
1535
1536 $self->reflow;
1537} 2374}
1538 2375
1539sub add_paragraph { 2376sub add_paragraph {
1540 my ($self, $color, $text) = @_; 2377 my ($self, $color, $text, $indent) = @_;
1541 2378
1542 #TODO: intelligently "reformat" paragraph 2379 for my $line (split /\n/, $text) {
1543 2380 my ($w, $h) = $self->text_size ($line);
1544 my $height = $self->text_height ($text);
1545
1546 $self->{height} += $height; 2381 $self->{height} += $h;
2382 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2383 }
1547 2384
1548 push @{$self->{par}}, [$height, $color, $text];
1549
1550 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2385 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1551 $self->{children}[1]->update;
1552} 2386}
1553 2387
1554sub update { 2388sub update {
1555 my ($self) = @_; 2389 my ($self) = @_;
1556 2390
… …
1558 2392
1559 return unless $self->{h} > 0; 2393 return unless $self->{h} > 0;
1560 2394
1561 delete $self->{texture}; 2395 delete $self->{texture};
1562 2396
1563 $TOPLEVEL->on_refresh ($self, sub { 2397 $ROOT->on_post_alloc ($self, sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399
1564 if (delete $self->{need_reflow}) { 2400 if (delete $self->{need_reflow}) {
1565 my $height = 0; 2401 my $height = 0;
1566 2402
1567 $height += $_->[0] = $self->text_height ($_->[2]) 2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
1568 for @{$self->{par}}; 2407 for (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2409 $layout->set_width ($W - $_->[3]);
2410 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3];
2413 $_->[1] = $h;
2414 }
2415
2416 $height += $_->[1];
2417 }
1569 2418
1570 $self->{height} = $height; 2419 $self->{height} = $height;
1571 2420
1572 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1573 2422
1574 delete $self->{texture}; 2423 delete $self->{texture};
1575 } 2424 }
1576 2425
1577 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1578 glClearColor 0, 0, 0, 1; 2427 glClearColor 0.5, 0.5, 0.5, 0;
1579 glClear GL_COLOR_BUFFER_BIT; 2428 glClear GL_COLOR_BUFFER_BIT;
1580 2429
2430 my $top = int $self->{children}[1]{range}[0];
2431
2432 my $y0 = $top;
2433 my $y1 = $top + $H;
2434
2435 my $y = 0;
2436
2437 my $layout = $self->{layout};
2438
2439 $layout->set_font ($self->{font}) if $self->{font};
2440
1581 glEnable GL_BLEND; 2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
1582 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2443 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 2444
1595 for my $par (@{$self->{par}}) { 2445 for my $par (@{$self->{par}}) {
1596 my $h = $par->[0]; 2446 my $h = $par->[1];
1597 2447
1598 if ($y0 < $y + $h && $y < $y1) { 2448 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] });
2450 $layout->set_width ($W - $par->[3]);
1599 $layout->set_text ($par->[2]); 2451 $layout->set_markup ($par->[4]);
1600 2452
1601 glColor @{ $par->[1] }; 2453 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1602 my ($W, $H) = $layout->size; 2454
1603 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2455 glRasterPos $par->[3], $y - $y0;
2456 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1604 } 2457 }
1605 2458
1606 $y += $h; 2459 $y += $h;
1607 } 2460 }
1608 2461
1609 glDisable GL_TEXTURE_2D;
1610 glDisable GL_BLEND; 2462 glDisable GL_BLEND;
1611 }; 2463 };
1612 }); 2464 });
1613} 2465}
1614 2466
1615sub _draw { 2467sub _draw {
1616 my ($self) = @_; 2468 my ($self) = @_;
1617 2469
1618 if ($self->{texture}) {
1619 glEnable GL_TEXTURE_2D; 2470 glEnable GL_TEXTURE_2D;
1620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1;
1621 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2473 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1622 glDisable GL_TEXTURE_2D; 2474 glDisable GL_TEXTURE_2D;
1623 }
1624 2475
1625 $self->{children}[1]->draw; 2476 $self->{children}[1]->draw;
1626 2477
1627} 2478}
1628 2479
1629############################################################################# 2480#############################################################################
1630 2481
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 button_down {
1661 my ($self, $ev, $x, $y) = @_;
1662
1663 $self->focus_in;
1664
1665 if ($ev->button == 2) {
1666 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1667 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1668
1669 $self->{motion} = sub {
1670 my ($ev, $x, $y) = @_;
1671
1672 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1673
1674 $::CFG->{map_shift_x} = $bw + $x - $ox;
1675 $::CFG->{map_shift_y} = $bh + $y - $oy;
1676
1677 $self->update;
1678 };
1679 }
1680}
1681
1682sub button_up {
1683 my ($self, $ev, $x, $y) = @_;
1684
1685 delete $self->{motion};
1686}
1687
1688sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_;
1690
1691 $self->{motion}->($ev, $x, $y) if $self->{motion};
1692}
1693
1694sub size_request {
1695 (
1696 1 + 32 * int $::WIDTH / 32,
1697 1 + 32 * int $::HEIGHT / 32,
1698 )
1699}
1700
1701sub update {
1702 my ($self) = @_;
1703
1704 $self->{need_update} = 1;
1705 $self->SUPER::update;
1706}
1707
1708sub draw {
1709 my ($self) = @_;
1710
1711 if (delete $self->{need_update}) {
1712 glNewList $self->{list}, GL_COMPILE;
1713
1714 if ($::MAP) {
1715 my $sw = int $::WIDTH / 32;
1716 my $sh = int $::HEIGHT / 32;
1717
1718 my $sx = $::CFG->{map_shift_x};
1719 my $sy = $::CFG->{map_shift_y};
1720
1721 glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0;
1722
1723 my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1);
1724
1725 if ($::CFG->{fow_enable}) {
1726 if ($::CFG->{fow_smooth}) { # smooth fog of war
1727 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1728 glConvolutionFilter2D
1729 GL_CONVOLUTION_2D,
1730 GL_ALPHA,
1731 3, 3,
1732 GL_ALPHA, GL_FLOAT,
1733 pack "f*",
1734 0.1, 0.1, 0.1,
1735 0.1, 0.2, 0.1,
1736 0.1, 0.1, 0.1,
1737 ;
1738 glEnable GL_CONVOLUTION_2D;
1739 }
1740
1741 my $tex = new CFClient::Texture
1742 w => $w,
1743 h => $h,
1744 data => $data,
1745 internalformat => GL_ALPHA,
1746 format => GL_ALPHA;
1747
1748 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1749
1750 glEnable GL_BLEND;
1751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1752 glEnable GL_TEXTURE_2D;
1753 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1754
1755 glColor +($::CFG->{fow_intensity}) x 3, 1;
1756 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1757
1758 glDisable GL_TEXTURE_2D;
1759 glDisable GL_BLEND;
1760 }
1761
1762 # HACK BEGIN
1763 {
1764 my ($w, $h) = (250, 250);
1765
1766 glEnable GL_BLEND;
1767 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1768 glEnable GL_TEXTURE_2D;
1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1770
1771 CFClient::Texture->new (
1772 w => $w,
1773 h => $h,
1774 data => $::MAP->mapmap ($w, $h),
1775 type => GL_UNSIGNED_INT_8_8_8_8_REV
1776 )->draw_quad (100, 100);
1777
1778 glDisable GL_TEXTURE_2D;
1779 glDisable GL_BLEND;
1780 }
1781 # HACK END
1782 }
1783
1784 glEndList;
1785 }
1786
1787 glPushMatrix;
1788 glCallList $self->{list};
1789 glPopMatrix;
1790
1791 if ($FOCUS != $self) {
1792 glColor 64/255, 64/255, 64/255;
1793 glLogicOp GL_AND;
1794 glEnable GL_COLOR_LOGIC_OP;
1795 glBegin GL_QUADS;
1796 glVertex 0, 0;
1797 glVertex 0, $::HEIGHT;
1798 glVertex $::WIDTH, $::HEIGHT;
1799 glVertex $::WIDTH, 0;
1800 glEnd;
1801 glDisable GL_COLOR_LOGIC_OP;
1802 }
1803}
1804
1805my %DIR = (
1806 SDLK_KP8, [1, "north"],
1807 SDLK_KP9, [2, "northeast"],
1808 SDLK_KP6, [3, "east"],
1809 SDLK_KP3, [4, "southeast"],
1810 SDLK_KP2, [5, "south"],
1811 SDLK_KP1, [6, "southwest"],
1812 SDLK_KP4, [7, "west"],
1813 SDLK_KP7, [8, "northwest"],
1814
1815 SDLK_UP, [1, "north"],
1816 SDLK_RIGHT, [3, "east"],
1817 SDLK_DOWN, [5, "south"],
1818 SDLK_LEFT, [7, "west"],
1819);
1820
1821sub key_down {
1822 my ($self, $ev) = @_;
1823
1824 my $mod = $ev->key_mod;
1825 my $sym = $ev->key_sym;
1826
1827 if ($sym == SDLK_KP5) {
1828 $::CONN->user_send ("command stay fire");
1829 } elsif ($sym == SDLK_a) {
1830 $::CONN->user_send ("command apply");
1831 } elsif ($sym == SDLK_QUOTE) {
1832 $self->emit ('activate_console');
1833 } elsif ($sym == SDLK_SLASH) {
1834 $self->emit ('activate_console' => '/');
1835 } elsif (exists $DIR{$sym}) {
1836 if ($mod & KMOD_SHIFT) {
1837 $self->{shft}++;
1838 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1839 } elsif ($mod & KMOD_CTRL) {
1840 $self->{ctrl}++;
1841 $::CONN->user_send ("command run $DIR{$sym}[0]");
1842 } else {
1843 $::CONN->user_send ("command $DIR{$sym}[1]");
1844 }
1845 }
1846}
1847
1848sub key_up {
1849 my ($self, $ev) = @_;
1850
1851 my $mod = $ev->key_mod;
1852 my $sym = $ev->key_sym;
1853
1854 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1855 $::CONN->user_send ("command fire_stop");
1856 }
1857 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1858 $::CONN->user_send ("command run_stop");
1859 }
1860}
1861
1862#############################################################################
1863
1864package CFClient::UI::Animator; 2482package CFClient::UI::Animator;
1865 2483
1866use SDL::OpenGL; 2484use CFClient::OpenGL;
1867 2485
1868our @ISA = CFClient::UI::Bin::; 2486our @ISA = CFClient::UI::Bin::;
1869 2487
1870sub moveto { 2488sub moveto {
1871 my ($self, $x, $y) = @_; 2489 my ($self, $x, $y) = @_;
… …
1909 2527
1910sub new { 2528sub new {
1911 my $class = shift; 2529 my $class = shift;
1912 2530
1913 my $self = $class->SUPER::new ( 2531 my $self = $class->SUPER::new (
1914 state => 0, 2532 state => 0,
1915 connect_activate => \&toggle_flopper, 2533 connect_activate => \&toggle_flopper,
1916 @_ 2534 @_
1917 ); 2535 );
1918 2536
1919 if ($self->{state}) { 2537 if ($self->{state}) {
… …
1927sub toggle_flopper { 2545sub toggle_flopper {
1928 my ($self) = @_; 2546 my ($self) = @_;
1929 2547
1930 # TODO: use animation 2548 # TODO: use animation
1931 if ($self->{state} = !$self->{state}) { 2549 if ($self->{state} = !$self->{state}) {
1932 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2550 $CFClient::UI::ROOT->add ($self->{other});
1933 $self->{other}->move ( 2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
1934 ($::WIDTH - $self->{other}{w}) * 0.5, 2552 $self->_emit ("open");
1935 ($::HEIGHT - $self->{other}{h}) * 0.5, 2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559}
2560
2561#############################################################################
2562
2563package CFClient::UI::Tooltip;
2564
2565our @ISA = CFClient::UI::Bin::;
2566
2567use CFClient::OpenGL;
2568
2569sub new {
2570 my $class = shift;
2571
2572 $class->SUPER::new (
2573 @_,
2574 can_events => 0,
2575 )
2576}
2577
2578sub set_tooltip_from {
2579 my ($self, $widget) = @_;
2580
2581 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip},
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8,
2585 fg => [0, 0, 0, 1],
2586 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP),
2588 );
2589}
2590
2591sub size_request {
2592 my ($self) = @_;
2593
2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2595
2596 ($w + 4, $h + 4)
2597}
2598
2599sub size_allocate {
2600 my ($self, $w, $h) = @_;
2601
2602 $self->SUPER::size_allocate ($w - 4, $h - 4);
2603}
2604
2605sub _draw {
2606 my ($self) = @_;
2607
2608 glTranslate 0.375, 0.375;
2609
2610 my ($w, $h) = @$self{qw(w h)};
2611
2612 glColor 1, 0.8, 0.4;
2613 glBegin GL_QUADS;
2614 glVertex 0 , 0;
2615 glVertex 0 , $h;
2616 glVertex $w, $h;
2617 glVertex $w, 0;
2618 glEnd;
2619
2620 glColor 0, 0, 0;
2621 glBegin GL_LINE_LOOP;
2622 glVertex 0 , 0;
2623 glVertex 0 , $h;
2624 glVertex $w, $h;
2625 glVertex $w, 0;
2626 glEnd;
2627
2628 glTranslate 2 - 0.375, 2 - 0.375;
2629 $self->SUPER::_draw;
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Face;
2635
2636our @ISA = CFClient::UI::Base::;
2637
2638use CFClient::OpenGL;
2639
2640sub new {
2641 my $class = shift;
2642
2643 my $self = $class->SUPER::new (
2644 aspect => 1,
2645 can_events => 0,
2646 @_,
2647 );
2648
2649 if ($self->{anim} && $self->{animspeed}) {
2650 Scalar::Util::weaken (my $widget = $self);
2651
2652 $self->{timer} = Event->timer (
2653 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2654 hard => 1,
2655 interval => $self->{animspeed},
2656 cb => sub {
2657 ++$widget->{frame};
2658 $widget->update;
2659 },
1936 ); 2660 );
2661 }
2662
2663 $self
2664}
2665
2666sub size_request {
2667 (32, 8)
2668}
2669
2670sub update {
2671 my ($self) = @_;
2672
2673 return unless $self->{visible};
2674
2675 $self->SUPER::update;
2676}
2677
2678sub _draw {
2679 my ($self) = @_;
2680
2681 return unless $::CONN;
2682
2683 my $face;
2684
2685 if ($self->{frame}) {
2686 my $anim = $::CONN->{anim}[$self->{anim}];
2687
2688 $face = $anim->[ $self->{frame} % @$anim ]
2689 if $anim && @$anim;
2690 }
2691
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693
2694 if ($tex) {
2695 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D;
2700 }
2701}
2702
2703sub DESTROY {
2704 my ($self) = @_;
2705
2706 $self->{timer}->cancel
2707 if $self->{timer};
2708
2709 $self->SUPER::DESTROY;
2710}
2711
2712#############################################################################
2713
2714package CFClient::UI::Inventory;
2715
2716our @ISA = CFClient::UI::ScrolledWindow::;
2717
2718sub new {
2719 my $class = shift;
2720
2721 my $self = $class->SUPER::new (
2722 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2723 @_,
2724 );
2725
2726 $self
2727}
2728
2729sub set_items {
2730 my ($self, $items) = @_;
2731
2732 $self->{scrolled}->clear;
2733 return unless $items;
2734
2735 my @items = sort {
2736 ($a->{type} <=> $b->{type})
2737 or ($a->{name} cmp $b->{name})
2738 } @$items;
2739
2740 $self->{real_items} = \@items;
2741
2742 my $row = 0;
2743 for my $item (@items) {
2744 CFClient::Item::update_widgets $item;
2745
2746 $self->{scrolled}->add (0, $row, $item->{face_widget});
2747 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2748 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2749
2750 $row++;
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760
2761#############################################################################
2762
2763package CFClient::UI::Menu;
2764
2765our @ISA = CFClient::UI::FancyFrame::;
2766
2767use CFClient::OpenGL;
2768
2769sub new {
2770 my $class = shift;
2771
2772 my $self = $class->SUPER::new (
2773 items => [],
2774 z => 100,
2775 @_,
2776 );
2777
2778 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2779
2780 for my $item (@{ $self->{items} }) {
2781 my ($widget, $cb) = @$item;
2782
2783 # handle various types of items, only text for now
2784 if (!ref $widget) {
2785 $widget = new CFClient::UI::Label
2786 can_hover => 1,
2787 can_events => 1,
2788 text => $widget;
2789 }
2790
2791 $self->{item}{$widget} = $item;
2792
2793 $self->{vbox}->add ($widget);
2794 }
2795
2796 $self
2797}
2798
2799# popup given the event (must be a mouse button down event currently)
2800sub popup {
2801 my ($self, $ev) = @_;
2802
2803 $self->_emit ("popdown");
2804
2805 # maybe save $GRAB? must be careful about events...
2806 $GRAB = $self;
2807 $self->{button} = $ev->{button};
2808
2809 $self->show;
2810 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2811}
2812
2813sub mouse_motion {
2814 my ($self, $ev, $x, $y) = @_;
2815
2816 # TODO: should use vbox->find_widget or so
2817 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2818 $self->{hover} = $self->{item}{$HOVER};
2819}
2820
2821sub button_up {
2822 my ($self, $ev, $x, $y) = @_;
2823
2824 if ($ev->{button} == $self->{button}) {
2825 undef $GRAB;
2826 $self->hide;
2827
2828 $self->_emit ("popdown");
2829 $self->{hover}[1]->() if $self->{hover};
2830 }
2831}
2832
2833#############################################################################
2834
2835package CFClient::UI::Statusbox;
2836
2837our @ISA = CFClient::UI::VBox::;
2838
2839sub new {
2840 my $class = shift;
2841
2842 $class->SUPER::new (
2843 fontsize => 0.8,
2844 @_,
2845 )
2846}
2847
2848sub reorder {
2849 my ($self) = @_;
2850 my $NOW = time;
2851
2852 while (my ($k, $v) = each %{ $self->{item} }) {
2853 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2854 }
2855
2856 my @widgets;
2857
2858 my @items = sort {
2859 $a->{pri} <=> $b->{pri}
2860 or $b->{id} <=> $a->{id}
2861 } values %{ $self->{item} };
2862
2863 my $count = 10 + 1;
2864 for my $item (@items) {
2865 last unless --$count;
2866
2867 push @widgets, $item->{label} ||= do {
2868 # TODO: doesn't handle markup well (read as: at all)
2869 my $short = $item->{count} > 1
2870 ? "<b>$item->{count} ×</b> $item->{text}"
2871 : $item->{text};
2872
2873 for ($short) {
2874 s/^\s+//;
2875 s/\s+/ /g;
2876 }
2877
2878 new CFClient::UI::Label
2879 markup => $short,
2880 tooltip => $item->{tooltip},
2881 tooltip_font => $::FONT_PROP,
2882 tooltip_width => 0.67,
2883 fontsize => $item->{fontsize} || $self->{fontsize},
2884 max_w => $::WIDTH * 0.44,
2885 fg => $item->{fg},
2886 can_events => 1,
2887 can_hover => 1
2888 };
2889 }
2890
2891 $self->clear;
2892 $self->SUPER::add (reverse @widgets);
2893}
2894
2895sub add {
2896 my ($self, $text, %arg) = @_;
2897
2898 $text =~ s/^\s+//;
2899 $text =~ s/\s+$//;
2900
2901 return unless $text;
2902
2903 my $timeout = time + ((delete $arg{timeout}) || 60);
2904
2905 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2906
2907 if (my $item = $self->{item}{$group}) {
2908 if ($item->{text} eq $text) {
2909 $item->{count}++;
2910 } else {
2911 $item->{count} = 1;
2912 $item->{text} = $item->{tooltip} = $text;
2913 }
2914 $item->{id} = ++$self->{id};
2915 $item->{timeout} = $timeout;
2916 delete $item->{label};
1937 } else { 2917 } else {
1938 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2918 $self->{item}{$group} = {
2919 id => ++$self->{id},
2920 text => $text,
2921 timeout => $timeout,
2922 tooltip => $text,
2923 fg => [0.8, 0.8, 0.8, 0.8],
2924 pri => 0,
2925 count => 1,
2926 %arg,
2927 };
1939 } 2928 }
2929
2930 $self->reorder;
2931}
2932
2933sub reconfigure {
2934 my ($self) = @_;
2935
2936 delete $_->{label}
2937 for values %{ $self->{item} || {} };
2938
2939 $self->reorder;
2940 $self->SUPER::reconfigure;
1940} 2941}
1941 2942
1942############################################################################# 2943#############################################################################
1943 2944
1944package CFClient::UI::Toplevel; 2945package CFClient::UI::Root;
1945 2946
1946our @ISA = CFClient::UI::Container::; 2947our @ISA = CFClient::UI::Container::;
1947 2948
1948use SDL::OpenGL; 2949use CFClient::OpenGL;
2950
2951sub new {
2952 my $class = shift;
2953
2954 $class->SUPER::new (
2955 @_,
2956 )
2957}
2958
2959sub configure {
2960 my ($self, $x, $y, $w, $h) = @_;
2961
2962 $self->{w} = $w;
2963 $self->{h} = $h;
2964}
2965
2966sub check_size {
2967 my ($self) = @_;
2968
2969 $self->size_allocate ($self->{w}, $self->{h})
2970 if $self->{w};
2971}
1949 2972
1950sub size_request { 2973sub size_request {
1951 ($::WIDTH, $::HEIGHT) 2974 my ($self) = @_;
2975
2976 ($self->{w}, $self->{h})
1952} 2977}
1953 2978
1954sub size_allocate { 2979sub size_allocate {
1955 my ($self, $x, $y, $w, $h) = @_; 2980 my ($self, $w, $h) = @_;
1956 2981
1957 $self->_size_allocate ($x, $y, $w, $h); 2982 for my $child ($self->children) {
2983 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1958 2984
1959 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2985 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
1960 for @{$self->{children}}; 2986 if exists $child->{req_x};
1961}
1962 2987
1963sub translate { 2988 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2989 if exists $child->{req_y};
2990
2991 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2992 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2993
2994 $child->configure ($X, $Y, $W, $H);
2995 }
2996}
2997
2998sub coord2local {
1964 my ($self, $x, $y) = @_; 2999 my ($self, $x, $y) = @_;
1965 3000
1966 ($x, $y) 3001 ($x, $y)
1967} 3002}
1968 3003
3004sub coord2global {
3005 my ($self, $x, $y) = @_;
3006
3007 ($x, $y)
3008}
3009
1969sub update { 3010sub update {
1970 my ($self) = @_; 3011 my ($self) = @_;
1971 3012
1972 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 3013 $self->check_size;
1973 ::refresh (); 3014 $::WANT_REFRESH++;
1974} 3015}
1975 3016
1976sub add { 3017sub add {
1977 my ($self, $widget) = @_; 3018 my ($self, @children) = @_;
1978 3019
3020 for (my @widgets = @children; my $w = pop @widgets; ) {
3021 push @widgets, $w->children;
3022 $w->{root} = $self;
3023 $w->{visible} = 1;
3024 }
3025
3026 for my $child (@children) {
3027 $child->{is_toplevel} = 1;
3028
3029 # integerise window positions
3030 $child->{x} = int $child->{x};
3031 $child->{y} = int $child->{y};
3032 }
3033
1979 $self->SUPER::add ($widget); 3034 $self->SUPER::add (@children);
3035}
1980 3036
1981 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 3037sub remove {
3038 my ($self, @children) = @_;
3039
3040 $self->SUPER::remove (@children);
3041
3042 while (@children) {
3043 my $w = pop @children;
3044 push @children, $w->children;
3045 $w->set_invisible;
3046 }
1982} 3047}
1983 3048
1984sub on_refresh { 3049sub on_refresh {
1985 my ($self, $id, $cb) = @_; 3050 my ($self, $id, $cb) = @_;
1986 3051
1987 $self->{refresh_hook}{$id} = $cb; 3052 $self->{refresh_hook}{$id} = $cb;
1988} 3053}
1989 3054
3055sub on_post_alloc {
3056 my ($self, $id, $cb) = @_;
3057
3058 $self->{post_alloc_hook}{$id} = $cb;
3059}
3060
1990sub draw { 3061sub draw {
1991 my ($self) = @_; 3062 my ($self) = @_;
1992 3063
1993 while (my $rcb = delete $self->{refresh_hook}) { 3064 while ($self->{refresh_hook}) {
1994 $_->() for values %$rcb; 3065 $_->()
3066 for values %{delete $self->{refresh_hook}};
3067 }
3068
3069 if ($self->{check_size}) {
3070 my @queue = ([], []);
3071
3072 for (;;) {
3073 if ($self->{check_size}) {
3074 # heuristic: check containers last
3075 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3076 for values %{delete $self->{check_size}}
3077 }
3078
3079 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3080
3081 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3082 ? @$widget{qw(user_w user_h)}
3083 : $widget->size_request;
3084
3085 if (delete $widget->{force_alloc}
3086 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3087 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3088
3089 $widget->{req_w} = $w;
3090 $widget->{req_h} = $h;
3091
3092 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3093
3094 $widget->{parent}->check_size
3095 if $widget->{parent};
3096 }
3097 }
3098 }
3099
3100 while ($self->{size_alloc}) {
3101 for (values %{delete $self->{size_alloc}}) {
3102 my ($widget, $w, $h) = @$_;
3103
3104 $w = 0 if $w < 0;
3105 $h = 0 if $h < 0;
3106
3107 $widget->{w} = $w;
3108 $widget->{h} = $h;
3109 $widget->emit (size_allocate => $w, $h);
3110 }
3111 }
3112
3113 while ($self->{post_alloc_hook}) {
3114 $_->()
3115 for values %{delete $self->{post_alloc_hook}};
1995 } 3116 }
1996 3117
1997 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3118 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1998 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3119 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1999 glClear GL_COLOR_BUFFER_BIT; 3120 glClear GL_COLOR_BUFFER_BIT;
2000 3121
2001 glMatrixMode GL_PROJECTION; 3122 glMatrixMode GL_PROJECTION;
2002 glLoadIdentity; 3123 glLoadIdentity;
2003 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3124 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2004 glMatrixMode GL_MODELVIEW; 3125 glMatrixMode GL_MODELVIEW;
2005 glLoadIdentity; 3126 glLoadIdentity;
2006 3127
2007 $self->_draw; 3128 $self->_draw;
2008} 3129}
2009 3130
2010############################################################################# 3131#############################################################################
2011 3132
2012package CFClient::UI; 3133package CFClient::UI;
2013 3134
2014$TOPLEVEL = new CFClient::UI::Toplevel; 3135$ROOT = new CFClient::UI::Root;
3136$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2015 3137
20161 31381
2017 3139

Diff Legend

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