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.95 by root, Thu Apr 13 23:31:43 2006 UTC vs.
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC

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

Diff Legend

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