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.118 by root, Sat Apr 15 23:25:00 2006 UTC vs.
Revision 1.212 by elmex, Wed May 17 14:55:14 2006 UTC

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

Diff Legend

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