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.123 by root, Mon Apr 17 19:50:22 2006 UTC vs.
Revision 1.214 by root, Wed May 17 22:59:13 2006 UTC

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

Diff Legend

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