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

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

Diff Legend

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