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.114 by root, Sat Apr 15 13:56:25 2006 UTC vs.
Revision 1.237 by root, Thu May 25 21:36:45 2006 UTC

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

Diff Legend

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