ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.107 by root, Fri Apr 14 20:27:35 2006 UTC vs.
Revision 1.216 by root, Fri May 19 16:43:57 2006 UTC

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

Diff Legend

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