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.115 by root, Sat Apr 15 19:35:20 2006 UTC vs.
Revision 1.239 by root, Thu May 25 22:29:57 2006 UTC

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

Diff Legend

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