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.87 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.224 by elmex, Tue May 23 20:00:55 2006 UTC

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

Diff Legend

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