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

Diff Legend

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