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.142 by elmex, Thu Apr 20 16:29:40 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 2006 UTC

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

Diff Legend

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