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.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util ();
6use List::Util (); 6use List::Util ();
7use Event;
7 8
8use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFPlus::Texture;
9 12
10our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
11 14
15our $LAYOUT;
12our $ROOT; 16our $ROOT;
17our $TOOLTIP;
13our $BUTTON_STATE; 18our $BUTTON_STATE;
19
20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
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;
82}
83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
22} 95}
23 96
24sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
25 my ($ev) = @_; 98 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
27 100
28 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
29 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
30 105
31 $GRAB = $widget; 106 $GRAB = $widget;
32 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
33 }
34 108
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 109 $TOOLTIP_WATCHER->cb->();
110 }
36 111
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
38} 122}
39 123
40sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
41 my ($ev) = @_; 125 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y});
43 126
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
45 128
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 130
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 131 $GRAB->emit (button_up => $ev)
132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
49 133
50 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 136 $grab->update if $grab;
53 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
138
139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
54 } 141 }
55} 142}
56 143
57sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
58 my ($ev) = @_; 145 my ($ev) = @_;
59 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
60 147
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 149
63 if ($widget != $HOVER) { 150 check_hover $widget;
64 my $hover = $HOVER; $HOVER = $widget;
65 151
66 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 153 if $HOVER;
68 }
69
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71} 154}
72 155
73# convert position array to integers 156# convert position array to integers
74sub harmonize { 157sub harmonize {
75 my ($vals) = @_; 158 my ($vals) = @_;
… …
81 $rem += $_ - $i; 164 $rem += $_ - $i;
82 $_ = $i; 165 $_ = $i;
83 } 166 }
84} 167}
85 168
169sub full_refresh {
170 # make a copy, otherwise for complains about freed values.
171 my @widgets = values %WIDGET;
172
173 $_->update
174 for @widgets;
175}
176
177sub reconfigure_widgets {
178 # make a copy, otherwise C<for> complains about freed values.
179 my @widgets = values %WIDGET;
180
181 $_->reconfigure
182 for @widgets;
183}
184
185# call when resolution changes etc.
186sub rescale_widgets {
187 my ($sx, $sy) = @_;
188
189 for my $widget (values %WIDGET) {
190 if ($widget->{is_toplevel}) {
191 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
192 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
193
194 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
196 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
197 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
198 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
199 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
200
201 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
203
204 }
205 }
206
207 reconfigure_widgets;
208}
209
86############################################################################# 210#############################################################################
87 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
88package CFClient::UI::Base; 220package CFPlus::UI::Base;
89 221
90use strict; 222use strict;
91 223
92use CFClient::OpenGL; 224use CFPlus::OpenGL;
93 225
94sub new { 226sub new {
95 my $class = shift; 227 my $class = shift;
96 228
97 my $self = bless { 229 my $self = bless {
98 x => 0, 230 x => "center",
99 y => 0, 231 y => "center",
100 z => 0, 232 z => 0,
233 w => undef,
234 h => undef,
101 can_events => 1, 235 can_events => 1,
102 @_ 236 @_
103 }, $class; 237 }, $class;
104 238
239 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240
105 for (keys %$self) { 241 for (keys %$self) {
106 if (/^connect_(.*)$/) { 242 if (/^on_(.*)$/) {
107 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
108 } 244 }
109 } 245 }
110 246
247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255
256 $self->show if $layout->{show};
257 }
258
111 $self 259 $self
112} 260}
113 261
262sub destroy {
263 my ($self) = @_;
264
265 $self->hide;
266 $self->emit ("destroy");
267 %$self = ();
268}
269
114sub show { 270sub show {
115 my ($self) = @_; 271 my ($self) = @_;
116 272
117 return if $self->{parent}; 273 return if $self->{parent};
118 274
119 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
276}
277
278sub set_visible {
279 my ($self) = @_;
280
281 return if $self->{visible};
282
283 $self->{root} = $self->{parent}{root};
284 $self->{visible} = $self->{parent}{visible} + 1;
285
286 $self->emit (visibility_change => 1);
287
288 $self->realloc if !exists $self->{req_w};
289
290 $_->set_visible for $self->children;
291}
292
293sub set_invisible {
294 my ($self) = @_;
295
296 return unless $self->{visible};
297
298 $_->set_invisible for $self->children;
299
300 delete $self->{visible};
301 delete $self->{root};
302
303 undef $GRAB if $GRAB == $self;
304 undef $HOVER if $HOVER == $self;
305
306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
307 if $TOOLTIP->{owner} == $self;
308
309 $self->emit ("focus_out");
310 $self->emit (visibility_change => 0);
311}
312
313sub set_visibility {
314 my ($self, $visible) = @_;
315
316 return if $self->{visible} == $visible;
317
318 $visible ? $self->hide
319 : $self->show;
320}
321
322sub toggle_visibility {
323 my ($self) = @_;
324
325 $self->{visible}
326 ? $self->hide
327 : $self->show;
120} 328}
121 329
122sub hide { 330sub hide {
123 my ($self) = @_; 331 my ($self) = @_;
124 332
125 return unless $self->{parent}; 333 $self->set_invisible;
126 334
127 $self->{parent}->remove ($self); 335 $self->{parent}->remove ($self)
336 if $self->{parent};
128} 337}
129 338
130sub move { 339sub move_abs {
131 my ($self, $x, $y, $z) = @_; 340 my ($self, $x, $y, $z) = @_;
132 341
133 $self->{x} = int $x; 342 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
134 $self->{y} = int $y; 343 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
135 $self->{z} = $z if defined $z; 344 $self->{z} = $z if defined $z;
136 345
137 $self->update; 346 $self->update;
138} 347}
139 348
140sub needs_redraw { 349sub set_size {
141 0 350 my ($self, $w, $h) = @_;
351
352 $self->{force_w} = $w;
353 $self->{force_h} = $h;
354
355 $self->realloc;
142} 356}
143 357
144sub size_request { 358sub size_request {
145 require Carp; 359 require Carp;
146 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
147} 361}
148 362
363sub baseline_shift {
364 0
365}
366
149sub configure { 367sub configure {
150 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
151 369
152 if ($self->{aspect}) { 370 if ($self->{aspect}) {
371 my ($ow, $oh) = ($w, $h);
372
153 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
154 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
155 375
156 # use alignment to adjust x, y 376 # use alignment to adjust x, y
157 377
158 $x += int +($w - $w2) * 0.5; 378 $x += int 0.5 * ($ow - $w);
159 $y += int +($h - $h2) * 0.5; 379 $y += int 0.5 * ($oh - $h);
160
161 ($w, $h) = ($w2, $h2);
162 } 380 }
163 381
164 if ($self->{x} != $x || $self->{y} != $y) { 382 if ($self->{x} ne $x || $self->{y} ne $y) {
165 $self->{x} = $x; 383 $self->{x} = $x;
166 $self->{y} = $y; 384 $self->{y} = $y;
167 $self->update; 385 $self->update;
168 } 386 }
169 387
170 if ($self->{w} != $w || $self->{h} != $h) { 388 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
389 return unless $self->{visible};
390
171 $self->{w} = $w; 391 $self->{alloc_w} = $w;
172 $self->{h} = $h; 392 $self->{alloc_h} = $h;
173 393
174 $self->size_allocate ($w, $h); 394 $self->{root}{size_alloc}{$self+0} = $self;
175 $self->update;
176 } 395 }
177} 396}
178 397
179sub size_allocate { 398sub children {
180 # nothing to be done 399 # nop
181} 400}
182 401
183# return top left coordinates 402sub visible_children {
184sub _topleft { 403 $_[0]->children
404}
405
406sub set_max_size {
185 my ($self, $x, $y) = @_; 407 my ($self, $w, $h) = @_;
186 408
187 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 409 $self->{max_w} = int $w if defined $w;
410 $self->{max_h} = int $h if defined $h;
411
412 $self->realloc;
413}
414
415sub set_tooltip {
416 my ($self, $tooltip) = @_;
417
418 $tooltip =~ s/^\s+//;
419 $tooltip =~ s/\s+$//;
420
421 return if $self->{tooltip} eq $tooltip;
422
423 $self->{tooltip} = $tooltip;
424
425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
426 delete $CFPlus::UI::TOOLTIP->{owner};
427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
428 }
188} 429}
189 430
190# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
191sub coord2local { 432sub coord2local {
192 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
193 434
194 my ($X, $Y) = $self->_topleft; 435 Carp::confess unless $self->{parent};#d#
195 ($x - $X, $y - $Y) 436
437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
196} 438}
197 439
198# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
199sub coord2global { 441sub coord2global {
200 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
201 443
202 my ($X, $Y) = $self->_topleft; 444 Carp::confess unless $self->{parent};#d#
203 ($x + $X, $y + $Y)
204}
205 445
446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
447}
448
206sub focus_in { 449sub invoke_focus_in {
207 my ($self) = @_; 450 my ($self) = @_;
208 451
209 return if $FOCUS == $self; 452 return if $FOCUS == $self;
210 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
211 454
212 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
213 456
214 $self->emit (focus_in => $focus); 457 $self->update;
215 458
216 $focus->update if $focus; 459 0
217 $FOCUS->update;
218} 460}
219 461
220sub focus_out { 462sub invoke_focus_out {
221 my ($self) = @_; 463 my ($self) = @_;
222 464
223 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
224 466
225 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
226 468
227 $self->emit (focus_out => $focus); 469 $self->update;
228 470
229 $focus->update if $focus; #? 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
230} 472 unless $FOCUS;
231 473
474 0
475}
476
477sub grab_focus {
478 my ($self) = @_;
479
480 $FOCUS->emit ("focus_out") if $FOCUS;
481 $self->emit ("focus_in");
482}
483
232sub mouse_motion { } 484sub invoke_mouse_motion { 0 }
233sub button_up { } 485sub invoke_button_up { 0 }
234sub key_down { } 486sub invoke_key_down { 0 }
235sub key_up { } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
236 489
237sub button_down { 490sub invoke_button_down {
238 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
239 492
240 $self->focus_in; 493 $self->grab_focus;
241}
242 494
243sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 495 0
244sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 496}
245sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
246sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
247sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
248 497
249sub draw { 498sub connect {
499 my ($self, $signal, $cb) = @_;
500
501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
507}
508
509sub disconnect_all {
250 my ($self) = @_; 510 my ($self, $signal) = @_;
251 511
252 return unless $self->{h} && $self->{w}; 512 delete $self->{signal_cb}{$signal};
253
254 glPushMatrix;
255 glTranslate $self->{x}, $self->{y}, 0;
256 $self->_draw;
257 glPopMatrix;
258
259 if ($self == $HOVER && $self->{can_hover}) {
260 my ($x, $y) = @$self{qw(x y)};
261
262 glColor 1, 0.8, 0.5, 0.2;
263 glEnable GL_BLEND;
264 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
265 glBegin GL_QUADS;
266 glVertex $x , $y;
267 glVertex $x + $self->{w}, $y;
268 glVertex $x + $self->{w}, $y + $self->{h};
269 glVertex $x , $y + $self->{h};
270 glEnd;
271 glDisable GL_BLEND;
272 }
273} 513}
274 514
275sub _draw { 515my %has_coords = (
276 my ($self) = @_; 516 button_down => 1,
517 button_up => 1,
518 mouse_motion => 1,
519 mouse_wheel => 1,
520);
277 521
278 warn "no draw defined for $self\n"; 522sub emit {
523 my ($self, $signal, @args) = @_;
524
525 # I do not really like this solution, but I do not like duplication
526 # and needlessly verbose code, either.
527 my @append
528 = $has_coords{$signal}
529 ? $args[0]->xy ($self)
530 : ();
531
532 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
533
534 for my $cb (
535 @{$self->{signal_cb}{$signal} || []}, # before
536 ($self->can ("invoke_$signal") || sub { 1 }), # closure
537 ) {
538 return $cb->($self, @args, @append) || next;
539 }
540
541 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args)
279} 543}
280 544
281sub find_widget { 545sub find_widget {
282 my ($self, $x, $y) = @_; 546 my ($self, $x, $y) = @_;
283 547
… …
291} 555}
292 556
293sub set_parent { 557sub set_parent {
294 my ($self, $parent) = @_; 558 my ($self, $parent) = @_;
295 559
296 Scalar::Util::weaken ($self->{parent} = $parent); 560 CFPlus::weaken ($self->{parent} = $parent);
561 $self->set_visible if $parent->{visible};
297} 562}
298 563
299sub check_size { 564sub realloc {
300 my ($self) = @_; 565 my ($self) = @_;
301 566
302 return unless $self->{parent}; 567 if ($self->{visible}) {
568 return if $self->{root}{realloc}{$self+0};
303 569
304 my ($w, $h) = $self->size_request; 570 $self->{root}{realloc}{$self+0} = $self;
305 571 $self->{root}->update;
306 if ($w != $self->{req_w} || $h != $self->{req_h}) { 572 } else {
307 $self->{req_w} = $w; 573 delete $self->{req_w};
308 $self->{req_h} = $h; 574 delete $self->{req_h};
309
310 $self->{parent}->check_size;
311 } 575 }
312} 576}
313 577
314sub update { 578sub update {
315 my ($self) = @_; 579 my ($self) = @_;
316 580
317 $self->{parent}->update 581 $self->{parent}->update
318 if $self->{parent}; 582 if $self->{parent};
319} 583}
320 584
321sub connect { 585sub reconfigure {
322 my ($self, $signal, $cb) = @_; 586 my ($self) = @_;
323 587
324 push @{ $self->{signal_cb}{$signal} }, $cb; 588 $self->realloc;
589 $self->update;
325} 590}
326 591
327sub emit { 592# using global variables seems a bit hacky, but passing through all drawing
328 my ($self, $signal, @args) = @_; 593# functions seems pointless.
594our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
329 595
330 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 596sub draw {
331 $cb->($self, @args); 597 my ($self) = @_;
332 }
333}
334 598
599 return unless $self->{h} && $self->{w};
600
601 # update screen rectangle
602 local $draw_x = $draw_x + $self->{x};
603 local $draw_y = $draw_y + $self->{y};
604
605 # skip widgets that are entirely outside the drawing area
606 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
607 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
608
609 glPushMatrix;
610 glTranslate $self->{x}, $self->{y}, 0;
611
612 if ($self == $HOVER && $self->{can_hover}) {
613 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
614 glEnable GL_BLEND;
615 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glBegin GL_QUADS;
617 glVertex 0 , 0;
618 glVertex $self->{w}, 0;
619 glVertex $self->{w}, $self->{h};
620 glVertex 0 , $self->{h};
621 glEnd;
622 glDisable GL_BLEND;
623 }
624
625 if ($ENV{CFPLUS_DEBUG} & 1) {
626 glPushMatrix;
627 glColor 1, 1, 0, 1;
628 glTranslate 0.375, 0.375;
629 glBegin GL_LINE_LOOP;
630 glVertex 0 , 0;
631 glVertex $self->{w} - 1, 0;
632 glVertex $self->{w} - 1, $self->{h} - 1;
633 glVertex 0 , $self->{h} - 1;
634 glEnd;
635 glPopMatrix;
636 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
637 }
638
639 $self->_draw;
640 glPopMatrix;
641}
642
643sub _draw {
644 my ($self) = @_;
645
646 warn "no draw defined for $self\n";
647}
648
649my $cntx;#d#
335sub DESTROY { 650sub DESTROY {
336 my ($self) = @_; 651 my ($self) = @_;
337 652
338 #$self->deactivate; 653 return if CFPlus::in_destruct;
654
655 eval { $self->destroy };
656 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657
658 delete $WIDGET{$self+0};
339} 659}
340 660
341############################################################################# 661#############################################################################
342 662
343package CFClient::UI::DrawBG; 663package CFPlus::UI::DrawBG;
344 664
345our @ISA = CFClient::UI::Base::; 665our @ISA = CFPlus::UI::Base::;
346 666
347use strict; 667use strict;
348use CFClient::OpenGL; 668use CFPlus::OpenGL;
349 669
350sub new { 670sub new {
351 my $class = shift; 671 my $class = shift;
352 672
353 # range [value, low, high, page] 673 # range [value, low, high, page]
354 674
355 $class->SUPER::new ( 675 $class->SUPER::new (
356 bg => [0, 0, 0, 0.2], 676 #bg => [0, 0, 0, 0.2],
357 active_bg => [1, 1, 1, 0.5], 677 #active_bg => [1, 1, 1, 0.5],
358 @_ 678 @_
359 ) 679 )
360} 680}
361 681
362sub _draw { 682sub _draw {
363 my ($self) = @_; 683 my ($self) = @_;
364 684
685 my $color = $FOCUS == $self && $self->{active_bg}
686 ? $self->{active_bg}
687 : $self->{bg};
688
689 if ($color && (@$color < 4 || $color->[3])) {
365 my ($w, $h) = @$self{qw(w h)}; 690 my ($w, $h) = @$self{qw(w h)};
366 691
367 glEnable GL_BLEND; 692 glEnable GL_BLEND;
368 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
369 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 694 glColor_premultiply @$color;
370 695
371 glBegin GL_QUADS; 696 glBegin GL_QUADS;
372 glVertex 0 , 0; 697 glVertex 0 , 0;
373 glVertex 0 , $h; 698 glVertex 0 , $h;
374 glVertex $w, $h; 699 glVertex $w, $h;
375 glVertex $w, 0; 700 glVertex $w, 0;
376 glEnd; 701 glEnd;
377 702
378 glDisable GL_BLEND; 703 glDisable GL_BLEND;
704 }
379} 705}
380 706
381############################################################################# 707#############################################################################
382 708
383package CFClient::UI::Empty; 709package CFPlus::UI::Empty;
384 710
385our @ISA = CFClient::UI::Base::; 711our @ISA = CFPlus::UI::Base::;
386 712
387sub new { 713sub new {
388 my ($class, %arg) = @_; 714 my ($class, %arg) = @_;
389 $class->SUPER::new (can_events => 0, %arg); 715 $class->SUPER::new (can_events => 0, %arg);
390} 716}
391 717
392sub size_request { 718sub size_request {
393 (0, 0) 719 my ($self) = @_;
720
721 ($self->{w} + 0, $self->{h} + 0)
394} 722}
395 723
396sub draw { } 724sub draw { }
397 725
398############################################################################# 726#############################################################################
399 727
400package CFClient::UI::Container; 728package CFPlus::UI::Container;
401 729
402our @ISA = CFClient::UI::Base::; 730our @ISA = CFPlus::UI::Base::;
403 731
404sub new { 732sub new {
405 my ($class, %arg) = @_; 733 my ($class, %arg) = @_;
406 734
407 my $children = delete $arg{children} || []; 735 my $children = delete $arg{children};
408 736
409 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 737 my $self = $class->SUPER::new (
738 children => [],
739 can_events => 0,
740 %arg,
741 );
742
410 $self->add ($_) for @$children; 743 $self->add (@$children)
744 if $children;
411 745
412 $self 746 $self
747}
748
749sub realloc {
750 my ($self) = @_;
751
752 $self->{force_realloc} = 1;
753 $self->{force_size_alloc} = 1;
754 $self->SUPER::realloc;
755}
756
757sub add {
758 my ($self, @widgets) = @_;
759
760 $_->set_parent ($self)
761 for @widgets;
762
763 use sort 'stable';
764
765 $self->{children} = [
766 sort { $a->{z} <=> $b->{z} }
767 @{$self->{children}}, @widgets
768 ];
769
770 $self->realloc;
771}
772
773sub children {
774 @{ $_[0]{children} }
775}
776
777sub remove {
778 my ($self, $child) = @_;
779
780 delete $child->{parent};
781 $child->hide;
782
783 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
784
785 $self->realloc;
786}
787
788sub clear {
789 my ($self) = @_;
790
791 my $children = delete $self->{children};
792 $self->{children} = [];
793
794 for (@$children) {
795 delete $_->{parent};
796 $_->hide;
797 }
798
799 $self->realloc;
800}
801
802sub find_widget {
803 my ($self, $x, $y) = @_;
804
805 $x -= $self->{x};
806 $y -= $self->{y};
807
808 my $res;
809
810 for (reverse $self->visible_children) {
811 $res = $_->find_widget ($x, $y)
812 and return $res;
813 }
814
815 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
816}
817
818sub _draw {
819 my ($self) = @_;
820
821 $_->draw for @{$self->{children}};
822}
823
824#############################################################################
825
826package CFPlus::UI::Bin;
827
828our @ISA = CFPlus::UI::Container::;
829
830sub new {
831 my ($class, %arg) = @_;
832
833 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
834
835 $class->SUPER::new (children => [$child], %arg)
413} 836}
414 837
415sub add { 838sub add {
416 my ($self, $child) = @_; 839 my ($self, $child) = @_;
417 840
418 $child->set_parent ($self); 841 $self->SUPER::remove ($_) for @{ $self->{children} };
419 842 $self->SUPER::add ($child);
420 use sort 'stable';
421
422 $self->{children} = [
423 sort { $a->{z} <=> $b->{z} }
424 @{$self->{children}}, $child
425 ];
426
427 $child->check_size;
428} 843}
429 844
430sub remove { 845sub remove {
431 my ($self, $child) = @_; 846 my ($self, $widget) = @_;
432 847
433 delete $child->{parent}; 848 $self->SUPER::remove ($widget);
434 849
435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 850 $self->{children} = [new CFPlus::UI::Empty]
851 unless @{$self->{children}};
852}
436 853
437 $self->check_size; 854sub child { $_[0]->{children}[0] }
855
856sub size_request {
857 $_[0]{children}[0]->size_request
858}
859
860sub invoke_size_allocate {
861 my ($self, $w, $h) = @_;
862
863 $self->{children}[0]->configure (0, 0, $w, $h);
864
865 1
866}
867
868#############################################################################
869
870# back-buffered drawing area
871
872package CFPlus::UI::Window;
873
874our @ISA = CFPlus::UI::Bin::;
875
876use CFPlus::OpenGL;
877
878sub new {
879 my ($class, %arg) = @_;
880
881 my $self = $class->SUPER::new (%arg);
882}
883
884sub update {
885 my ($self) = @_;
886
887 $ROOT->on_post_alloc ($self => sub { $self->render_child });
888 $self->SUPER::update;
889}
890
891sub invoke_size_allocate {
892 my ($self, $w, $h) = @_;
893
894 $self->update;
895
896 $self->SUPER::invoke_size_allocate ($w, $h)
897}
898
899sub _render {
900 my ($self) = @_;
901
902 $self->{children}[0]->draw;
903}
904
905sub render_child {
906 my ($self) = @_;
907
908 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
909 glClearColor 0, 0, 0, 0;
910 glClear GL_COLOR_BUFFER_BIT;
911
912 {
913 package CFPlus::UI::Base;
914
915 local ($draw_x, $draw_y, $draw_w, $draw_h) =
916 (0, 0, $self->{w}, $self->{h});
917
918 $self->_render;
919 }
920 };
921}
922
923sub _draw {
924 my ($self) = @_;
925
926 my $tex = $self->{texture}
927 or return;
928
929 glEnable GL_TEXTURE_2D;
930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
931 glColor 0, 0, 0, 1;
932
933 $tex->draw_quad_alpha_premultiplied (0, 0);
934
935 glDisable GL_TEXTURE_2D;
936}
937
938#############################################################################
939
940package CFPlus::UI::ViewPort;
941
942our @ISA = CFPlus::UI::Window::;
943
944sub new {
945 my $class = shift;
946
947 $class->SUPER::new (
948 scroll_x => 0,
949 scroll_y => 1,
950 @_,
951 )
952}
953
954sub size_request {
955 my ($self) = @_;
956
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958
959 $w = 10 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y};
961
962 ($w, $h)
963}
964
965sub invoke_size_allocate {
966 my ($self, $w, $h) = @_;
967
968 my $child = $self->child;
969
970 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
971 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
972
973 $self->child->configure (0, 0, $w, $h);
974 $self->update;
975
976 1
977}
978
979sub set_offset {
980 my ($self, $x, $y) = @_;
981
982 $self->{view_x} = int $x;
983 $self->{view_y} = int $y;
984
985 $self->update;
986}
987
988# hmm, this does not work for topleft of $self... but we should not ask for that
989sub coord2local {
990 my ($self, $x, $y) = @_;
991
992 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
993}
994
995sub coord2global {
996 my ($self, $x, $y) = @_;
997
998 $x = List::Util::min $self->{w}, $x - $self->{view_x};
999 $y = List::Util::min $self->{h}, $y - $self->{view_y};
1000
1001 $self->SUPER::coord2global ($x, $y)
438} 1002}
439 1003
440sub find_widget { 1004sub find_widget {
441 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
442 1006
443 $x -= $self->{x}; 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
444 $y -= $self->{y}; 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
445 1009 ) {
446 my $res;
447
448 for (reverse @{ $self->{children} }) {
449 $res = $_->find_widget ($x, $y)
450 and return $res;
451 }
452
453 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011 } else {
1012 $self->CFPlus::UI::Base::find_widget ($x, $y)
1013 }
454} 1014}
455 1015
456sub _draw { 1016sub _render {
457 my ($self) = @_; 1017 my ($self) = @_;
458 1018
459 $_->draw for @{$self->{children}}; 1019 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1020 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1021
1022 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1023
1024 $self->SUPER::_render;
460} 1025}
461 1026
462############################################################################# 1027#############################################################################
463 1028
464package CFClient::UI::Bin; 1029package CFPlus::UI::ScrolledWindow;
465 1030
466our @ISA = CFClient::UI::Container::; 1031our @ISA = CFPlus::UI::HBox::;
467 1032
468sub new { 1033sub new {
469 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
470 1035
471 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 1036 my $child = delete $arg{child};
472 1037
473 $class->SUPER::new (children => [$child], %arg) 1038 my $self;
1039
1040 my $slider = new CFPlus::UI::Slider
1041 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]);
1045 },
1046 ;
1047
1048 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1),
1050 can_events => 1,
1051 slider => $slider,
1052 %arg,
1053 );
1054
1055 $self->SUPER::add ($self->{vp}, $self->{slider});
1056 $self->add ($child) if $child;
1057
1058 $self
474} 1059}
1060
1061#TODO# update range on size_allocate depending on child
475 1062
476sub add { 1063sub add {
477 my ($self, $child) = @_;
478
479 $self->{children} = [];
480
481 $self->SUPER::add ($child);
482}
483
484sub remove {
485 my ($self, $widget) = @_; 1064 my ($self, $widget) = @_;
486 1065
487 $self->SUPER::remove ($widget); 1066 $self->{vp}->add ($self->{child} = $widget);
488
489 $self->{children} = [new CFClient::UI::Empty]
490 unless @{$self->{children}};
491} 1067}
492 1068
493sub child { $_[0]->{children}[0] } 1069sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_;
494 1071
495sub size_request { 1072 return 0 unless $ev->{dy}; # only vertical movements
496 $_[0]{children}[0]->size_request
497}
498 1073
1074 $self->{slider}->emit (mouse_wheel => $ev);
1075
1076 1
1077}
1078
1079sub update_slider {
1080 my ($self) = @_;
1081
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1083}
1084
1085sub update {
1086 my ($self) = @_;
1087
1088 $self->SUPER::update;
1089
1090 $self->update_slider;
1091}
1092
499sub size_allocate { 1093sub invoke_size_allocate {
500 my ($self, $w, $h) = @_; 1094 my ($self, $w, $h) = @_;
501 1095
502 $self->{children}[0]->configure (0, 0, $w, $h); 1096 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h)
503} 1099}
504 1100
505############################################################################# 1101#############################################################################
506 1102
507package CFClient::UI::Window; 1103package CFPlus::UI::Frame;
508 1104
509our @ISA = CFClient::UI::Bin::; 1105our @ISA = CFPlus::UI::Bin::;
510 1106
511use CFClient::OpenGL; 1107use CFPlus::OpenGL;
1108
1109sub new {
1110 my $class = shift;
1111
1112 $class->SUPER::new (
1113 bg => undef,
1114 @_,
1115 )
1116}
1117
1118sub _draw {
1119 my ($self) = @_;
1120
1121 if ($self->{bg}) {
1122 my ($w, $h) = @$self{qw(w h)};
1123
1124 glEnable GL_BLEND;
1125 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1126 glColor_premultiply @{ $self->{bg} };
1127
1128 glBegin GL_QUADS;
1129 glVertex 0 , 0;
1130 glVertex 0 , $h;
1131 glVertex $w, $h;
1132 glVertex $w, 0;
1133 glEnd;
1134
1135 glDisable GL_BLEND;
1136 }
1137
1138 $self->SUPER::_draw;
1139}
1140
1141#############################################################################
1142
1143package CFPlus::UI::FancyFrame;
1144
1145our @ISA = CFPlus::UI::Bin::;
1146
1147use CFPlus::OpenGL;
512 1148
513sub new { 1149sub new {
514 my ($class, %arg) = @_; 1150 my ($class, %arg) = @_;
515 1151
516 my $self = $class->SUPER::new (%arg); 1152 if ((exists $arg{label}) && !ref $arg{label}) {
517} 1153 $arg{label} = new CFPlus::UI::Label
518 1154 align => 1,
519sub update { 1155 valign => 0,
520 my ($self) = @_; 1156 text => $arg{label},
521 1157 fontsize => ($arg{border} || 0.8) * 0.75;
522 # we want to do this delayed...
523 $self->render_chld;
524 $self->SUPER::update;
525}
526
527sub render_chld {
528 my ($self) = @_;
529
530 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
531 glClearColor 0, 0, 0, 1;
532 glClear GL_COLOR_BUFFER_BIT;
533 $self->child->draw;
534 }; 1158 }
535}
536
537sub size_allocate {
538 my ($self, $w, $h) = @_;
539
540 $self->child->configure (0, 0, $w, $h);
541
542 $self->render_chld;
543}
544
545sub _draw {
546 my ($self) = @_;
547
548 my ($w, $h) = ($self->w, $self->h);
549
550 my $tex = $self->{texture}
551 or return;
552
553 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
555 glEnable GL_TEXTURE_2D;
556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
557
558 $tex->draw_quad (0, 0, $w, $h);
559
560 glDisable GL_BLEND;
561 glDisable GL_TEXTURE_2D;
562}
563
564#############################################################################
565
566package CFClient::UI::ViewPort;
567
568our @ISA = CFClient::UI::Window::;
569
570sub new { die }
571
572sub size_request {
573 my ($self) = @_;
574
575 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
576 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
577
578 @$self{qw(child_w child_h)}
579}
580
581sub _draw {
582 my ($self) = @_;
583
584 $self->{children}[1]->draw;
585}
586
587
588#############################################################################
589
590package CFClient::UI::Frame;
591
592our @ISA = CFClient::UI::Bin::;
593
594use CFClient::OpenGL;
595
596sub new {
597 my $class = shift;
598 1159
599 my $self = $class->SUPER::new ( 1160 my $self = $class->SUPER::new (
1161 # label => "",
600 bg => [1, 1, 1, 1], 1162 fg => [0.6, 0.3, 0.1],
601 border_bg => [1, 1, 1, 1],
602 border => 0.8, 1163 border => 0.8,
603 @_ 1164 style => 'single',
1165 %arg,
604 ); 1166 );
605 1167
606 $self 1168 $self
607} 1169}
608 1170
609sub set_size { 1171sub add {
610 my ($self, $w, $h) = @_;
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
614}
615
616sub size_request {
617 my ($self) = @_; 1172 my ($self, @widgets) = @_;
618 ($self->{req_w}, $self->{req_h})
619}
620 1173
621sub size_allocate { 1174 $self->SUPER::add (@widgets);
622 my ($self, $w, $h) = @_; 1175 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
623 $self->{w} = $w;
624 $self->{h} = $h;
625 $self->child->configure (0, 0, $w, $h);
626}
627
628sub _draw {
629 my ($self) = @_;
630
631 my ($w, $h) = ($self->{w}, $self->{h});
632
633 glEnable GL_BLEND;
634 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
635 glEnable GL_TEXTURE_2D;
636 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
637
638# glBegin GL_QUADS;
639# glColor 0, 0, 0, 0;
640# glVertex 0 , 0;
641# glVertex 0 , $h;
642# glVertex $w, $h;
643# glVertex $w, 0;
644# glEnd;
645
646
647 $self->child->draw;
648 glDisable GL_BLEND;
649 glDisable GL_TEXTURE_2D;
650}
651
652#############################################################################
653
654package CFClient::UI::FancyFrame;
655
656our @ISA = CFClient::UI::Bin::;
657
658use CFClient::OpenGL;
659
660my @tex =
661 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
662 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
663
664sub new {
665 my $class = shift;
666
667 # TODO: user_x, user_y, overwrite moveto?
668
669 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1],
672 border => 0.8,
673 can_events => 1,
674 @_
675 );
676
677 $self->{title} &&= new CFClient::UI::Label
678 align => 0,
679 valign => 1,
680 text => $self->{title},
681 fontsize => 1;
682
683 $self
684} 1176}
685 1177
686sub border { 1178sub border {
687 int $_[0]{border} * $::FONTSIZE 1179 int $_[0]{border} * $::FONTSIZE
688} 1180}
689 1181
690sub size_request { 1182sub size_request {
691 my ($self) = @_; 1183 my ($self) = @_;
692 1184
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 1185 ($self->{label_w}, undef) = $self->{label}->size_request
1186 if $self->{label};
694 1187
695 my ($w, $h) = $self->SUPER::size_request; 1188 my ($w, $h) = $self->SUPER::size_request;
696 1189
697 ( 1190 (
698 $w + $self->border * 2, 1191 $w + $self->border * 2,
699 $h + $self->border * 2, 1192 $h + $self->border * 2,
700 ) 1193 )
701} 1194}
702 1195
703sub size_allocate { 1196sub invoke_size_allocate {
704 my ($self, $w, $h) = @_; 1197 my ($self, $w, $h) = @_;
705 1198
706 $h -= List::Util::max 0, $self->border * 2; 1199 my $border = $self->border;
1200
707 $w -= List::Util::max 0, $self->border * 2; 1201 $w -= List::Util::max 0, $border * 2;
1202 $h -= List::Util::max 0, $border * 2;
708 1203
709 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1204 if (my $label = $self->{label}) {
710 if $self->{title}; 1205 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1206 $label->{h} = List::Util::min $h, $border;
1207 $label->invoke_size_allocate ($label->{w}, $label->{h});
1208 }
711 1209
712 $self->child->configure ($self->border, $self->border, $w, $h); 1210 $self->child->configure ($border, $border, $w, $h);
713}
714 1211
1212 1
1213}
1214
1215sub _draw {
1216 my ($self) = @_;
1217
1218 my $child = $self->{children}[0];
1219
1220 my $border = $self->border;
1221 my ($w, $h) = ($self->{w}, $self->{h});
1222
1223 $child->draw;
1224
1225 glColor @{$self->{fg}};
1226 glBegin GL_LINE_STRIP;
1227 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1228 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1230 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1233 glEnd;
1234
1235 if ($self->{label}) {
1236 glTranslate $border * 2, 0;
1237 $self->{label}->_draw;
1238 }
1239}
1240
1241#############################################################################
1242
1243package CFPlus::UI::Toplevel;
1244
1245our @ISA = CFPlus::UI::Bin::;
1246
1247use CFPlus::OpenGL;
1248
1249my $bg =
1250 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1251 mipmap => 1, wrap => 1;
1252
1253my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256
1257sub new {
1258 my ($class, %arg) = @_;
1259
1260 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1],
1262 border_bg => [1, 1, 1, 1],
1263 border => 0.6,
1264 can_events => 1,
1265 min_w => 64,
1266 min_h => 32,
1267 %arg,
1268 );
1269
1270 $self->{title_widget} = new CFPlus::UI::Label
1271 align => 0,
1272 valign => 1,
1273 text => $self->{title},
1274 fontsize => $self->{border},
1275 if exists $self->{title};
1276
1277 if ($self->{has_close_button}) {
1278 $self->{close_button} =
1279 new CFPlus::UI::ImageButton
1280 path => 'x1_close.png',
1281 on_activate => sub { $self->emit ("delete") };
1282
1283 $self->CFPlus::UI::Container::add ($self->{close_button});
1284 }
1285
1286 $self
1287}
1288
1289sub add {
1290 my ($self, @widgets) = @_;
1291
1292 $self->SUPER::add (@widgets);
1293 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1294 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1295}
1296
1297sub border {
1298 int $_[0]{border} * $::FONTSIZE
1299}
1300
1301sub size_request {
1302 my ($self) = @_;
1303
1304 $self->{title_widget}->size_request
1305 if $self->{title_widget};
1306
1307 $self->{close_button}->size_request
1308 if $self->{close_button};
1309
1310 my ($w, $h) = $self->SUPER::size_request;
1311
1312 (
1313 $w + $self->border * 2,
1314 $h + $self->border * 2,
1315 )
1316}
1317
1318sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 if ($self->{title_widget}) {
1322 $self->{title_widget}{w} = $w;
1323 $self->{title_widget}{h} = $h;
1324 $self->{title_widget}->invoke_size_allocate ($w, $h);
1325 }
1326
1327 my $border = $self->border;
1328
1329 $h -= List::Util::max 0, $border * 2;
1330 $w -= List::Util::max 0, $border * 2;
1331
1332 $self->child->configure ($border, $border, $w, $h);
1333
1334 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1335 if $self->{close_button};
1336
1337 1
1338}
1339
1340sub invoke_delete {
1341 my ($self) = @_;
1342
1343 $self->hide;
1344
1345 1
1346}
1347
715sub button_down { 1348sub invoke_button_down {
716 my ($self, $ev, $x, $y) = @_; 1349 my ($self, $ev, $x, $y) = @_;
717 1350
1351 my ($w, $h) = @$self{qw(w h)};
718 my $border = $self->border; 1352 my $border = $self->border;
719 1353
720 if ($x < $self->{w} && $x >= $self->{w} - $border 1354 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
721 && $y < $self->{h} && $y >= $self->{h} - $border) { 1355 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
722 1356
1357 if ($lr & $td) {
1358 my ($wx, $wy) = ($self->{x}, $self->{y});
723 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1359 my ($ox, $oy) = ($ev->{x}, $ev->{y});
724 my ($bw, $bh) = ($self->{w}, $self->{h}); 1360 my ($bw, $bh) = ($self->{w}, $self->{h});
725 1361
1362 my $mx = $x < $border;
1363 my $my = $y < $border;
1364
726 $self->{motion} = sub { 1365 $self->{motion} = sub {
727 my ($ev, $x, $y) = @_; 1366 my ($ev, $x, $y) = @_;
728 1367
729 ($x, $y) = ($ev->{x}, $ev->{y}); 1368 my $dx = $ev->{x} - $ox;
1369 my $dy = $ev->{y} - $oy;
730 1370
731 $self->{user_w} = $bw + $x - $ox; 1371 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
732 $self->{user_h} = $bh + $y - $oy; 1372 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
733 $self->check_size; 1373
1374 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1375 $self->realloc;
734 }; 1376 };
735 1377
736 } elsif ($x >= 0 && $x < $self->{w} 1378 } elsif ($lr ^ $td) {
737 && $y >= 0 && $y < $border) {
738
739 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1379 my ($ox, $oy) = ($ev->{x}, $ev->{y});
740 my ($bx, $by) = ($self->{x}, $self->{y}); 1380 my ($bx, $by) = ($self->{x}, $self->{y});
741 1381
742 $self->{motion} = sub { 1382 $self->{motion} = sub {
743 my ($ev, $x, $y) = @_; 1383 my ($ev, $x, $y) = @_;
744 1384
745 ($x, $y) = ($ev->{x}, $ev->{y}); 1385 ($x, $y) = ($ev->{x}, $ev->{y});
746 1386
747 $self->move ($bx + $x - $ox, $by + $y - $oy); 1387 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
748 $self->update; 1388 # HACK: the next line is required to enforce placement
1389 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
749 }; 1390 };
1391 } else {
1392 return 0;
1393 }
1394
750 } 1395 1
751} 1396}
752 1397
753sub button_up { 1398sub invoke_button_up {
754 my ($self, $ev, $x, $y) = @_; 1399 my ($self, $ev, $x, $y) = @_;
755 1400
756 delete $self->{motion}; 1401 ! ! delete $self->{motion}
757} 1402}
758 1403
759sub mouse_motion { 1404sub invoke_mouse_motion {
760 my ($self, $ev, $x, $y) = @_; 1405 my ($self, $ev, $x, $y) = @_;
761 1406
762 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1407 $self->{motion}->($ev, $x, $y) if $self->{motion};
1408
1409 ! ! $self->{motion}
1410}
1411
1412sub invoke_visibility_change {
1413 my ($self, $visible) = @_;
1414
1415 delete $self->{motion} unless $visible;
1416
1417 0
763} 1418}
764 1419
765sub _draw { 1420sub _draw {
766 my ($self) = @_; 1421 my ($self) = @_;
767 1422
1423 my $child = $self->{children}[0];
1424
768 my ($w, $h ) = ($self->{w}, $self->{h}); 1425 my ($w, $h ) = ($self->{w}, $self->{h});
769 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1426 my ($cw, $ch) = ($child->{w}, $child->{h});
770 1427
771 glEnable GL_BLEND;
772 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
773 glEnable GL_TEXTURE_2D; 1428 glEnable GL_TEXTURE_2D;
774 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
775 1430
776 my $border = $self->border; 1431 my $border = $self->border;
777 1432
778 glColor @{ $self->{border_bg} }; 1433 glColor @{ $self->{border_bg} };
779 $tex[1]->draw_quad (0, 0, $w, $border); 1434 $border[0]->draw_quad_alpha (0, 0, $w, $border);
780 $tex[3]->draw_quad (0, $border, $border, $ch); 1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
781 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
782 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1437 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
783 1438
784 my $bg = $tex[0]; 1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440 glColor @{ $self->{bg} };
785 1441
786 # TODO: repeat texture not scale 1442 # TODO: repeat texture not scale
787 my $rep_x = $cw / $bg->{w}; 1443 # solve this better(?)
788 my $rep_y = $ch / $bg->{h}; 1444 $bg->{s} = $cw / $bg->{w};
789 1445 $bg->{t} = $ch / $bg->{h};
790 glColor @{ $self->{bg} };
791
792 $bg->{s} = $rep_x;
793 $bg->{t} = $rep_y;
794 $bg->{wrap_mode} = 1;
795 $bg->draw_quad ($border, $border, $cw, $ch); 1446 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1447 }
796 1448
797 glDisable GL_TEXTURE_2D; 1449 glDisable GL_TEXTURE_2D;
798 glDisable GL_BLEND;
799 1450
800 $self->{title}->draw if $self->{title};
801 $self->child->draw; 1451 $child->draw;
1452
1453 if ($self->{title_widget}) {
1454 glTranslate 0, $border - $self->{h};
1455 $self->{title_widget}->_draw;
1456
1457 glTranslate 0, - ($border - $self->{h});
1458 }
1459
1460 $self->{close_button}->draw
1461 if $self->{close_button};
802} 1462}
803 1463
804############################################################################# 1464#############################################################################
805 1465
806package CFClient::UI::Table; 1466package CFPlus::UI::Table;
807 1467
808our @ISA = CFClient::UI::Base::; 1468our @ISA = CFPlus::UI::Base::;
809 1469
810use List::Util qw(max sum); 1470use List::Util qw(max sum);
811 1471
812use CFClient::OpenGL; 1472use CFPlus::OpenGL;
813 1473
814sub new { 1474sub new {
815 my $class = shift; 1475 my $class = shift;
816 1476
817 $class->SUPER::new ( 1477 $class->SUPER::new (
818 col_expand => [], 1478 col_expand => [],
819 @_ 1479 @_,
820 ) 1480 )
821} 1481}
822 1482
1483sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485}
1486
823sub add { 1487sub add {
824 my ($self, $x, $y, $child) = @_; 1488 my ($self) = shift;
825 1489
1490 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, ();
826 $child->set_parent ($self); 1492 $child->set_parent ($self);
827 $self->{children}[$y][$x] = $child; 1493 $self->{children}[$y][$x] = $child;
1494 }
828 1495
829 $child->check_size; 1496 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1;
1498 $self->realloc;
830} 1499}
831 1500
1501sub remove {
1502 my ($self, $child) = @_;
1503
1504 # TODO: not yet implemented
1505}
1506
832# TODO: move to container class maybe? send childs a signal on removal? 1507# TODO: move to container class maybe? send children a signal on removal?
833sub clear { 1508sub clear {
834 my ($self) = @_; 1509 my ($self) = @_;
835 1510
1511 my @children = $self->children;
836 delete $self->{children}; 1512 delete $self->{children};
837 $self->update; 1513
1514 for (@children) {
1515 delete $_->{parent};
1516 $_->hide;
1517 }
1518
1519 $self->realloc;
838} 1520}
839 1521
840sub get_wh { 1522sub get_wh {
841 my ($self) = @_; 1523 my ($self) = @_;
842 1524
… …
868 (sum @$ws), 1550 (sum @$ws),
869 (sum @$hs), 1551 (sum @$hs),
870 ) 1552 )
871} 1553}
872 1554
873sub size_allocate { 1555sub invoke_size_allocate {
874 my ($self, $w, $h) = @_; 1556 my ($self, $w, $h) = @_;
875 1557
876 my ($ws, $hs) = $self->get_wh; 1558 my ($ws, $hs) = $self->get_wh;
877 1559
878 my $req_w = sum @$ws; 1560 my $req_w = (sum @$ws) || 1;
879 my $req_h = sum @$hs; 1561 my $req_h = (sum @$hs) || 1;
880 1562
881 # TODO: nicer code && do row_expand 1563 # TODO: nicer code && do row_expand
882 my @col_expand = @{$self->{col_expand}}; 1564 my @col_expand = @{$self->{col_expand}};
883 @col_expand = (1) x @$ws unless @col_expand; 1565 @col_expand = (1) x @$ws unless @col_expand;
884 my $col_expand = (sum @col_expand) || 1; 1566 my $col_expand = (sum @col_expand) || 1;
885 1567
886 # linearly scale sizes 1568 # linearly scale sizes
887 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
888 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
889 1571
890 CFClient::UI::harmonize $ws; 1572 CFPlus::UI::harmonize $ws;
891 CFClient::UI::harmonize $hs; 1573 CFPlus::UI::harmonize $hs;
892 1574
893 my $y; 1575 my $y;
894 1576
895 for my $r (0 .. $#{$self->{children}}) { 1577 for my $r (0 .. $#{$self->{children}}) {
896 my $row = $self->{children}[$r] 1578 my $row = $self->{children}[$r]
… …
910 } 1592 }
911 1593
912 $y += $row_h; 1594 $y += $row_h;
913 } 1595 }
914 1596
1597 1
915} 1598}
916 1599
917sub find_widget { 1600sub find_widget {
918 my ($self, $x, $y) = @_; 1601 my ($self, $x, $y) = @_;
919 1602
… …
938 } 1621 }
939} 1622}
940 1623
941############################################################################# 1624#############################################################################
942 1625
943package CFClient::UI::HBox; 1626package CFPlus::UI::Box;
944 1627
945# TODO: wrap into common Box base class
946
947our @ISA = CFClient::UI::Container::; 1628our @ISA = CFPlus::UI::Container::;
948 1629
949sub size_request { 1630sub size_request {
950 my ($self) = @_; 1631 my ($self) = @_;
951 1632
952 my @alloc = map [$_->size_request], @{$self->{children}}; 1633 $self->{vertical}
1634 ? (
1635 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1636 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1637 )
1638 : (
1639 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1640 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1641 )
1642}
953 1643
1644sub invoke_size_allocate {
1645 my ($self, $w, $h) = @_;
1646
1647 my $space = $self->{vertical} ? $h : $w;
1648 my @children = $self->visible_children;
1649
1650 my @req;
1651
1652 if ($self->{homogeneous}) {
1653 @req = ($space / (@children || 1)) x @children;
1654 } else {
1655 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1656 my $req = List::Util::sum @req;
1657
1658 if ($req > $space) {
1659 # ah well, not enough space
1660 $_ *= $space / $req for @req;
1661 } else {
1662 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1663
1664 $space = ($space - $req) / $expand; # remaining space to give away
1665
1666 $req[$_] += $space * $children[$_]{expand}
1667 for 0 .. $#children;
1668 }
954 ( 1669 }
955 (List::Util::sum map $_->[0], @alloc), 1670
956 (List::Util::max map $_->[1], @alloc), 1671 CFPlus::UI::harmonize \@req;
1672
1673 my $pos = 0;
1674 for (0 .. $#children) {
1675 my $alloc = $req[$_];
1676 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1677
1678 $pos += $alloc;
1679 }
1680
1681 1
1682}
1683
1684#############################################################################
1685
1686package CFPlus::UI::HBox;
1687
1688our @ISA = CFPlus::UI::Box::;
1689
1690sub new {
1691 my $class = shift;
1692
1693 $class->SUPER::new (
1694 vertical => 0,
1695 @_,
957 ) 1696 )
958} 1697}
959 1698
960sub size_allocate {
961 my ($self, $w, $h) = @_;
962
963 ($h, $w) = ($w, $h);
964
965 my $children = $self->{children};
966
967 my @h = map $_->{req_w}, @$children;
968
969 my $req_h = List::Util::sum @h;
970
971 if ($req_h > $h) {
972 # ah well, not enough space
973 $_ *= $h / $req_h for @h;
974 } else {
975 my $exp = List::Util::sum map $_->{expand}, @$children;
976 $exp ||= 1;
977
978 for (0 .. $#$children) {
979 my $child = $children->[$_];
980
981 my $alloc_h = $h[$_];
982 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
983 $h[$_] = $alloc_h;
984 }
985 }
986
987 CFClient::UI::harmonize \@h;
988
989 my $y = 0;
990 for (0 .. $#$children) {
991 my $child = $children->[$_];
992 my $h = $h[$_];
993 $child->configure ($y, 0, $h, $w);
994
995 $y += $h;
996 }
997
998 1
999}
1000
1001############################################################################# 1699#############################################################################
1002 1700
1003package CFClient::UI::VBox; 1701package CFPlus::UI::VBox;
1004 1702
1005# TODO: wrap into common Box base class 1703our @ISA = CFPlus::UI::Box::;
1006 1704
1007our @ISA = CFClient::UI::Container::; 1705sub new {
1706 my $class = shift;
1008 1707
1009sub size_request { 1708 $class->SUPER::new (
1010 my ($self) = @_; 1709 vertical => 1,
1011 1710 @_,
1012 my @alloc = map [$_->size_request], @{$self->{children}};
1013
1014 (
1015 (List::Util::max map $_->[0], @alloc),
1016 (List::Util::sum map $_->[1], @alloc),
1017 ) 1711 )
1018} 1712}
1019 1713
1020sub size_allocate {
1021 my ($self, $w, $h) = @_;
1022
1023 my $children = $self->{children};
1024
1025 my @h = map $_->{req_h}, @$children;
1026
1027 my $req_h = List::Util::sum @h;
1028
1029 if ($req_h > $h) {
1030 # ah well, not enough space
1031 $_ *= $h / $req_h for @h;
1032 } else {
1033 my $exp = List::Util::sum map $_->{expand}, @$children;
1034 $exp ||= 1;
1035
1036 for (0 .. $#$children) {
1037 my $child = $children->[$_];
1038
1039 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1040 }
1041 }
1042
1043 CFClient::UI::harmonize \@h;
1044
1045 my $y = 0;
1046 for (0 .. $#$children) {
1047 my $child = $children->[$_];
1048 my $h = $h[$_];
1049 $child->configure (0, $y, $w, $h);
1050
1051 $y += $h;
1052 }
1053
1054 1
1055}
1056
1057############################################################################# 1714#############################################################################
1058 1715
1059package CFClient::UI::Label; 1716package CFPlus::UI::Label;
1060 1717
1061our @ISA = CFClient::UI::Base::; 1718our @ISA = CFPlus::UI::DrawBG::;
1062 1719
1063use CFClient::OpenGL; 1720use CFPlus::OpenGL;
1064 1721
1065sub new { 1722sub new {
1066 my ($class, %arg) = @_; 1723 my ($class, %arg) = @_;
1067 1724
1068 my $self = $class->SUPER::new ( 1725 my $self = $class->SUPER::new (
1069 fg => [1, 1, 1], 1726 fg => [1, 1, 1],
1727 #bg => none
1728 #active_bg => none
1729 #font => default_font
1730 #text => initial text
1731 #markup => initial narkup
1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1734 ellipsise => 3, # end
1735 layout => (new CFPlus::Layout),
1070 fontsize => 1, 1736 fontsize => 1,
1071 text => "",
1072 align => -1, 1737 align => -1,
1073 valign => -1, 1738 valign => -1,
1074 padding => 2, 1739 padding_x => 2,
1075 layout => new CFClient::Layout, 1740 padding_y => 2,
1076 can_events => 0, 1741 can_events => 0,
1077 %arg 1742 %arg
1078 ); 1743 );
1079 1744
1080 if (exists $self->{template}) { 1745 if (exists $self->{template}) {
1081 my $layout = new CFClient::Layout; 1746 my $layout = new CFPlus::Layout;
1082 $layout->set_text (delete $self->{template}); 1747 $layout->set_text (delete $self->{template});
1083 $self->{template} = $layout; 1748 $self->{template} = $layout;
1084 } 1749 }
1085 1750
1086 $self->set_text (delete $self->{text}) if exists $self->{text}; 1751 if (exists $self->{markup}) {
1087 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1752 $self->set_markup (delete $self->{markup});
1753 } else {
1754 $self->set_text (delete $self->{text});
1755 }
1088 1756
1089 $self 1757 $self
1090} 1758}
1091 1759
1092sub escape_text { 1760sub update {
1093 local $_ = $_[1]; 1761 my ($self) = @_;
1094 1762
1095 s/&/&amp;/g; 1763 delete $self->{texture};
1096 s/>/&gt;/g; 1764 $self->SUPER::update;
1097 s/</&lt;/g; 1765}
1098 1766
1099 $_[1] 1767sub realloc {
1768 my ($self) = @_;
1769
1770 delete $self->{ox};
1771 $self->SUPER::realloc;
1100} 1772}
1101 1773
1102sub set_text { 1774sub set_text {
1103 my ($self, $text) = @_; 1775 my ($self, $text) = @_;
1104 1776
1777 return if $self->{text} eq "T$text";
1778 $self->{text} = "T$text";
1779
1105 $self->{layout}->set_text ($text); 1780 $self->{layout}->set_text ($text);
1106 1781
1107 delete $self->{texture}; 1782 delete $self->{size_req};
1108 $self->check_size; 1783 $self->realloc;
1109 $self->update; 1784 $self->update;
1110} 1785}
1111 1786
1112sub set_markup { 1787sub set_markup {
1113 my ($self, $markup) = @_; 1788 my ($self, $markup) = @_;
1114 1789
1790 return if $self->{text} eq "M$markup";
1791 $self->{text} = "M$markup";
1792
1793 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1794
1115 $self->{layout}->set_markup ($markup); 1795 $self->{layout}->set_markup ($markup);
1116 1796
1117 delete $self->{texture}; 1797 delete $self->{size_req};
1118 $self->check_size; 1798 $self->realloc;
1119 $self->update; 1799 $self->update;
1120} 1800}
1121 1801
1122sub size_request { 1802sub size_request {
1123 my ($self) = @_; 1803 my ($self) = @_;
1124 1804
1125 $self->{layout}->set_width; 1805 $self->{size_req} ||= do {
1806 $self->{layout}->set_font ($self->{font}) if $self->{font};
1807 $self->{layout}->set_width ($self->{max_w} || -1);
1808 $self->{layout}->set_ellipsise ($self->{ellipsise});
1809 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1810 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1127 1811
1128 my ($w, $h) = $self->{layout}->size; 1812 my ($w, $h) = $self->{layout}->size;
1129 1813
1130 if (exists $self->{template}) { 1814 if (exists $self->{template}) {
1815 $self->{template}->set_font ($self->{font}) if $self->{font};
1816 $self->{template}->set_width ($self->{max_w} || -1);
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132 1818
1133 my ($w2, $h2) = $self->{template}->size; 1819 my ($w2, $h2) = $self->{template}->size;
1134 1820
1135 $w = List::Util::max $w, $w2; 1821 $w = List::Util::max $w, $w2;
1136 $h = List::Util::max $h, $h2; 1822 $h = List::Util::max $h, $h2;
1823 }
1824
1825 [$w, $h]
1137 } 1826 };
1138 1827
1139 ( 1828 @{ $self->{size_req} }
1140 $w + $self->{padding} * 2,
1141 $h + $self->{padding} * 2,
1142 )
1143} 1829}
1144 1830
1831sub baseline_shift {
1832 $_[0]{layout}->descent
1833}
1834
1145sub size_allocate { 1835sub invoke_size_allocate {
1146 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1147 1837
1838 delete $self->{ox};
1839
1148 delete $self->{texture}; 1840 delete $self->{texture}
1841 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1842
1843 1
1149} 1844}
1150 1845
1151sub set_fontsize { 1846sub set_fontsize {
1152 my ($self, $fontsize) = @_; 1847 my ($self, $fontsize) = @_;
1153 1848
1154 $self->{fontsize} = $fontsize; 1849 $self->{fontsize} = $fontsize;
1155 $self->check_size; 1850 delete $self->{size_req};
1851 delete $self->{texture};
1852
1853 $self->realloc;
1854}
1855
1856sub reconfigure {
1857 my ($self) = @_;
1858
1859 delete $self->{size_req};
1860 delete $self->{texture};
1861
1862 $self->SUPER::reconfigure;
1156} 1863}
1157 1864
1158sub _draw { 1865sub _draw {
1159 my ($self) = @_; 1866 my ($self) = @_;
1160 1867
1868 $self->SUPER::_draw; # draw background, if applicable
1869
1161 my $tex = $self->{texture} ||= do { 1870 my $size = $self->{texture} ||= do {
1871 $self->{layout}->set_foreground (@{$self->{fg}});
1872 $self->{layout}->set_font ($self->{font}) if $self->{font};
1162 $self->{layout}->set_width ($self->{w}); 1873 $self->{layout}->set_width ($self->{w});
1874 $self->{layout}->set_ellipsise ($self->{ellipsise});
1875 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1163 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1164 new_from_layout CFClient::Texture $self->{layout} 1877
1878 [$self->{layout}->size]
1165 }; 1879 };
1166 1880
1167 glEnable GL_BLEND; 1881 unless (exists $self->{ox}) {
1168 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1169 glEnable GL_TEXTURE_2D;
1170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1171
1172 glColor @{$self->{fg}};
1173
1174 $self->{ox} = int (
1175 $self->{align} < 0 ? $self->{padding} 1882 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1176 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1883 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1177 : ($self->{w} - $tex->{w}) * 0.5 1884 : ($self->{w} - $size->[0]) * 0.5);
1178 );
1179 1885
1180 $self->{oy} = int (
1181 $self->{valign} < 0 ? $self->{padding} 1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1182 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1183 : ($self->{h} - $tex->{h}) * 0.5 1888 : ($self->{h} - $size->[1]) * 0.5);
1184 ); 1889 };
1185 1890
1186 $tex->draw_quad ($self->{ox}, $self->{oy}); 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1187 1893
1188 glDisable GL_TEXTURE_2D; 1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1189 glDisable GL_BLEND;
1190} 1895}
1191 1896
1192############################################################################# 1897#############################################################################
1193 1898
1194package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1195 1900
1196our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1197 1902
1198use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1199 1904
1200sub new { 1905sub new {
1201 my $class = shift; 1906 my $class = shift;
1202 1907
1203 $class->SUPER::new ( 1908 $class->SUPER::new (
1204 fg => [1, 1, 1], 1909 fg => [1, 1, 1],
1205 bg => [0, 0, 0, 0.2], 1910 bg => [0, 0, 0, 0.2],
1206 active_bg => [1, 1, 1, 0.5], 1911 active_bg => [1, 1, 1, 0.5],
1207 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1208 can_hover => 1, 1913 can_hover => 1,
1209 can_focus => 1, 1914 can_focus => 1,
1210 valign => 0, 1915 valign => 0,
1211 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1918 #text => ...
1919 #hidden => "*",
1212 @_ 1920 @_
1213 ) 1921 )
1214} 1922}
1215 1923
1216sub _set_text { 1924sub _set_text {
… …
1218 1926
1219 delete $self->{cur_h}; 1927 delete $self->{cur_h};
1220 1928
1221 return if $self->{text} eq $text; 1929 return if $self->{text} eq $text;
1222 1930
1223 delete $self->{texture};
1224
1225 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1226 $self->{text} = $text; 1932 $self->{text} = $text;
1227 1933
1228 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1229 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1936 delete $self->{size_req};
1230 1937
1231 $self->emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1939
1940 $self->realloc;
1941 $self->update;
1942}
1943
1944sub set_text {
1945 my ($self, $text) = @_;
1946
1947 $self->{cursor} = length $text;
1948 $self->_set_text ($text);
1232} 1949}
1233 1950
1234sub get_text { 1951sub get_text {
1235 $_[0]{text} 1952 $_[0]{text}
1236} 1953}
… …
1241 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1242 1959
1243 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1244} 1961}
1245 1962
1246sub size_allocate {
1247 my ($self, $w, $h) = @_;
1248
1249 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1250}
1251
1252sub set_text {
1253 my ($self, $text) = @_;
1254
1255 $self->{cursor} = length $text;
1256 $self->_set_text ($text);
1257 $self->update;
1258}
1259
1260sub key_down { 1963sub invoke_key_down {
1261 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1262 1965
1263 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1264 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1265 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
1266 1969
1267 my $text = $self->get_text; 1970 my $text = $self->get_text;
1268 1971
1269 if ($sym == 8) { 1972 if ($uni == 8) {
1270 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1271 } elsif ($sym == 127) { 1974 } elsif ($uni == 127) {
1272 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1273 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1274 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1275 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1276 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1277 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1981 # what a hack
1982 $self->{cursor} =
1983 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1984 ? length $1
1985 : 0;
1986 } elsif ($sym == CFPlus::SDLK_END) {
1987 # uh, again
1988 $self->{cursor} =
1989 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1990 ? $self->{cursor} + length $1
1991 : length $self->{text};
1992 } elsif ($uni == 21) { # ctrl-u
1993 $text = "";
1278 $self->{cursor} = 0; 1994 $self->{cursor} = 0;
1279 } elsif ($sym == CFClient::SDLK_END) {
1280 $self->{cursor} = length $text;
1281 } elsif ($sym == 27) { 1995 } elsif ($uni == 27) {
1282 $self->emit ('escape'); 1996 $self->emit ('escape');
1283 } elsif ($uni) { 1997 } elsif ($uni == 0x0d) {
1998 substr $text, $self->{cursor}++, 0, "\012";
1999 } elsif ($uni >= 0x20) {
1284 substr $text, $self->{cursor}++, 0, chr $uni; 2000 substr $text, $self->{cursor}++, 0, chr $uni;
2001 } else {
2002 return 0;
1285 } 2003 }
1286 2004
1287 $self->_set_text ($text); 2005 $self->_set_text ($text);
2006
2007 $self->realloc;
1288 $self->update; 2008 $self->update;
1289}
1290 2009
2010 1
2011}
2012
1291sub focus_in { 2013sub invoke_focus_in {
1292 my ($self) = @_; 2014 my ($self) = @_;
1293 2015
1294 $self->{last_activity} = $::NOW; 2016 $self->{last_activity} = $::NOW;
1295 2017
1296 $self->SUPER::focus_in; 2018 $self->SUPER::invoke_focus_in
1297} 2019}
1298 2020
1299sub button_down { 2021sub invoke_button_down {
1300 my ($self, $ev, $x, $y) = @_; 2022 my ($self, $ev, $x, $y) = @_;
1301 2023
1302 $self->SUPER::button_down ($ev, $x, $y); 2024 $self->SUPER::invoke_button_down ($ev, $x, $y);
1303 2025
1304 my $idx = $self->{layout}->xy_to_index ($x, $y); 2026 my $idx = $self->{layout}->xy_to_index ($x, $y);
1305 2027
1306 # byte-index to char-index 2028 # byte-index to char-index
1307 my $text = $self->{text}; 2029 my $text = $self->{text};
1308 utf8::encode $text; 2030 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1309 $self->{cursor} = length substr $text, 0, $idx; 2031 $self->{cursor} = length $text;
1310 2032
1311 $self->_set_text ($self->{text}); 2033 $self->_set_text ($self->{text});
1312 $self->update; 2034 $self->update;
2035
2036 1
1313} 2037}
1314 2038
1315sub mouse_motion { 2039sub invoke_mouse_motion {
1316 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1317# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2041# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2042
2043 1
1318} 2044}
1319 2045
1320sub _draw { 2046sub _draw {
1321 my ($self) = @_; 2047 my ($self) = @_;
1322 2048
1323 local $self->{fg} = $self->{fg}; 2049 local $self->{fg} = $self->{fg};
1324 2050
1325 if ($FOCUS == $self) { 2051 if ($FOCUS == $self) {
1326 glColor @{$self->{active_bg}}; 2052 glColor_premultiply @{$self->{active_bg}};
1327 $self->{fg} = $self->{active_fg}; 2053 $self->{fg} = $self->{active_fg};
1328 } else { 2054 } else {
1329 glColor @{$self->{bg}}; 2055 glColor_premultiply @{$self->{bg}};
1330 } 2056 }
1331 2057
1332 glEnable GL_BLEND; 2058 glEnable GL_BLEND;
1333 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1334 glBegin GL_QUADS; 2060 glBegin GL_QUADS;
1335 glVertex 0 , 0; 2061 glVertex 0 , 0;
1336 glVertex 0 , $self->{h}; 2062 glVertex 0 , $self->{h};
1337 glVertex $self->{w}, $self->{h}; 2063 glVertex $self->{w}, $self->{h};
1338 glVertex $self->{w}, 0; 2064 glVertex $self->{w}, 0;
… …
1349 utf8::encode $text; 2075 utf8::encode $text;
1350 2076
1351 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2077 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1352 } 2078 }
1353 2079
1354 glColor @{$self->{fg}};
1355 glBegin GL_LINES; 2080 glBegin GL_LINES;
1356 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2081 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1357 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2082 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1358 glEnd; 2083 glEnd;
1359 } 2084 }
1360} 2085}
1361 2086
2087#############################################################################
2088
1362package CFClient::UI::Entry; 2089package CFPlus::UI::Entry;
1363 2090
1364our @ISA = CFClient::UI::EntryBase::; 2091our @ISA = CFPlus::UI::EntryBase::;
1365 2092
1366use CFClient::OpenGL; 2093use CFPlus::OpenGL;
1367 2094
1368sub key_down { 2095sub invoke_key_down {
1369 my ($self, $ev) = @_; 2096 my ($self, $ev) = @_;
1370 2097
1371 my $sym = $ev->{sym}; 2098 my $sym = $ev->{sym};
1372 2099
1373 if ($sym == 13) { 2100 if ($ev->{uni} == 0x0d || $sym == 13) {
2101 unshift @{$self->{history}},
2102 my $txt = $self->get_text;
2103
2104 $self->{history_pointer} = -1;
2105 $self->{history_saveback} = '';
1374 $self->emit (activate => $self->get_text); 2106 $self->emit (activate => $txt);
1375 $self->update; 2107 $self->update;
1376 2108
2109 } elsif ($sym == CFPlus::SDLK_UP) {
2110 if ($self->{history_pointer} < 0) {
2111 $self->{history_saveback} = $self->get_text;
2112 }
2113 if (@{$self->{history} || []} > 0) {
2114 $self->{history_pointer}++;
2115 if ($self->{history_pointer} >= @{$self->{history} || []}) {
2116 $self->{history_pointer} = @{$self->{history} || []} - 1;
2117 }
2118 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2119 }
2120
2121 } elsif ($sym == CFPlus::SDLK_DOWN) {
2122 $self->{history_pointer}--;
2123 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2124
2125 if ($self->{history_pointer} >= 0) {
2126 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2127 } else {
2128 $self->set_text ($self->{history_saveback});
2129 }
2130
1377 } else { 2131 } else {
1378 $self->SUPER::key_down ($ev); 2132 return $self->SUPER::invoke_key_down ($ev)
2133 }
2134
1379 } 2135 1
1380
1381} 2136}
1382 2137
1383############################################################################# 2138#############################################################################
1384 2139
2140package CFPlus::UI::TextEdit;
2141
2142our @ISA = CFPlus::UI::EntryBase::;
2143
2144use CFPlus::OpenGL;
2145
2146sub move_cursor_ver {
2147 my ($self, $dy) = @_;
2148
2149 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2150
2151 $y += $dy;
2152
2153 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2154 $self->{cursor} = $index;
2155 delete $self->{cur_h};
2156 $self->update;
2157 return;
2158 }
2159}
2160
2161sub invoke_key_down {
2162 my ($self, $ev) = @_;
2163
2164 my $sym = $ev->{sym};
2165
2166 if ($sym == CFPlus::SDLK_UP) {
2167 $self->move_cursor_ver (-1);
2168 } elsif ($sym == CFPlus::SDLK_DOWN) {
2169 $self->move_cursor_ver (+1);
2170 } else {
2171 return $self->SUPER::invoke_key_down ($ev)
2172 }
2173
2174 1
2175}
2176
2177#############################################################################
2178
1385package CFClient::UI::Button; 2179package CFPlus::UI::Button;
1386 2180
1387our @ISA = CFClient::UI::Label::; 2181our @ISA = CFPlus::UI::Label::;
1388 2182
1389use CFClient::OpenGL; 2183use CFPlus::OpenGL;
1390 2184
1391my @tex = 2185my @tex =
1392 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1393 qw(b1_button_active.png); 2187 qw(b1_button_active.png);
1394 2188
1395sub new { 2189sub new {
1396 my $class = shift; 2190 my $class = shift;
1397 2191
1398 $class->SUPER::new ( 2192 $class->SUPER::new (
1399 padding => 4, 2193 padding_x => 4,
2194 padding_y => 4,
1400 fg => [1, 1, 1], 2195 fg => [1, 1, 1],
1401 bg => [1, 1, 1, 0.2],
1402 active_fg => [0, 0, 1], 2196 active_fg => [0, 0, 1],
1403 can_hover => 1, 2197 can_hover => 1,
1404 align => 0, 2198 align => 0,
1405 valign => 0, 2199 valign => 0,
1406 can_events => 1, 2200 can_events => 1,
1407 @_ 2201 @_
1408 ) 2202 )
1409} 2203}
1410 2204
1411sub button_up { 2205sub invoke_button_up {
1412 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1413 2207
2208 $self->emit ("activate")
1414 if ($x >= 0 && $x < $self->{w} 2209 if $x >= 0 && $x < $self->{w}
1415 && $y >= 0 && $y < $self->{h}) { 2210 && $y >= 0 && $y < $self->{h};
1416 $self->emit ("activate"); 2211
1417 } 2212 1
1418} 2213}
1419 2214
1420sub _draw { 2215sub _draw {
1421 my ($self) = @_; 2216 my ($self) = @_;
1422 2217
1423 local $self->{fg} = $self->{fg}; 2218 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1424 2219
1425 if ($GRAB == $self) {
1426 $self->{fg} = $self->{active_fg};
1427 }
1428
1429 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1431 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1433 glColor 0, 0, 0, 1; 2222 glColor 0, 0, 0, 1;
1434 2223
1435 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 2224 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1436 2225
1437 glDisable GL_TEXTURE_2D; 2226 glDisable GL_TEXTURE_2D;
1438 glDisable GL_BLEND;
1439 2227
1440 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1441} 2229}
1442 2230
1443############################################################################# 2231#############################################################################
1444 2232
1445package CFClient::UI::CheckBox; 2233package CFPlus::UI::CheckBox;
1446 2234
1447our @ISA = CFClient::UI::DrawBG::; 2235our @ISA = CFPlus::UI::DrawBG::;
1448 2236
1449my @tex = 2237my @tex =
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2238 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1451 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2239 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1452 2240
1453use CFClient::OpenGL; 2241use CFPlus::OpenGL;
1454 2242
1455sub new { 2243sub new {
1456 my $class = shift; 2244 my $class = shift;
1457 2245
1458 $class->SUPER::new ( 2246 $class->SUPER::new (
1459 padding => 2, 2247 padding_x => 2,
2248 padding_y => 2,
1460 fg => [1, 1, 1], 2249 fg => [1, 1, 1],
1461 active_fg => [1, 1, 0], 2250 active_fg => [1, 1, 0],
2251 bg => [0, 0, 0, 0.2],
2252 active_bg => [1, 1, 1, 0.5],
1462 state => 0, 2253 state => 0,
1463 can_hover => 1, 2254 can_hover => 1,
1464 @_ 2255 @_
1465 ) 2256 )
1466} 2257}
1467 2258
1468sub size_request { 2259sub size_request {
1469 my ($self) = @_; 2260 my ($self) = @_;
1470 2261
1471 ($self->{padding} * 2 + 6) x 2 2262 (6) x 2
1472} 2263}
1473 2264
2265sub toggle {
2266 my ($self) = @_;
2267
2268 $self->{state} = !$self->{state};
2269 $self->emit (changed => $self->{state});
2270 $self->update;
2271}
2272
1474sub button_down { 2273sub invoke_button_down {
1475 my ($self, $ev, $x, $y) = @_; 2274 my ($self, $ev, $x, $y) = @_;
1476 2275
1477 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2276 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1478 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2277 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1479 $self->{state} = !$self->{state}; 2278 $self->toggle;
1480 $self->emit (changed => $self->{state}); 2279 } else {
2280 return 0
2281 }
2282
1481 } 2283 1
1482} 2284}
1483 2285
1484sub _draw { 2286sub _draw {
1485 my ($self) = @_; 2287 my ($self) = @_;
1486 2288
1487 $self->SUPER::_draw; 2289 $self->SUPER::_draw;
1488 2290
1489 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2291 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1490 2292
1491 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2293 my ($w, $h) = @$self{qw(w h)};
2294
2295 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1492 2296
1493 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2297 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1494 2298
1495 glEnable GL_BLEND; 2299 my $tex = $self->{state} ? $tex[1] : $tex[0];
2300
1496 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1498
1499 my $tex = $self->{state} ? $tex[1] : $tex[0];
1500
1501 $tex->draw_quad (0, 0, $s, $s); 2302 $tex->draw_quad_alpha (0, 0, $s, $s);
1502
1503 glDisable GL_TEXTURE_2D; 2303 glDisable GL_TEXTURE_2D;
1504 glDisable GL_BLEND;
1505} 2304}
1506 2305
1507############################################################################# 2306#############################################################################
1508 2307
1509package CFClient::UI::Image; 2308package CFPlus::UI::Image;
1510 2309
1511our @ISA = CFClient::UI::Base::; 2310our @ISA = CFPlus::UI::Base::;
1512 2311
1513use CFClient::OpenGL; 2312use CFPlus::OpenGL;
1514use Carp qw/confess/;
1515 2313
1516our %loaded_images; 2314our %texture_cache;
1517 2315
1518sub new { 2316sub new {
1519 my $class = shift; 2317 my $class = shift;
1520 2318
1521 my $self = $class->SUPER::new (can_events => 0, @_); 2319 my $self = $class->SUPER::new (
2320 can_events => 0,
2321 @_,
2322 );
1522 2323
1523 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2324 $self->{path} || $self->{tex}
2325 or Carp::croak "'path' or 'tex' attributes required";
1524 2326
1525 $loaded_images{$self->{image}} ||= 2327 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1526 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2328 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1527 2329
1528 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2330 CFPlus::weaken $texture_cache{$self->{path}};
1529 2331
1530 Scalar::Util::weaken $loaded_images{$self->{image}}; 2332 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1531
1532 $self->{aspect} = $tex->{w} / $tex->{h};
1533 2333
1534 $self 2334 $self
1535} 2335}
1536 2336
2337sub STORABLE_freeze {
2338 my ($self, $cloning) = @_;
2339
2340 $self->{path}
2341 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2342
2343 $self->{path}
2344}
2345
2346sub STORABLE_attach {
2347 my ($self, $cloning, $path) = @_;
2348
2349 $self->new (path => $path)
2350}
2351
1537sub size_request { 2352sub size_request {
1538 my ($self) = @_; 2353 my ($self) = @_;
1539 2354
1540 ($self->{tex}->{w}, $self->{tex}->{h}) 2355 ($self->{tex}{w}, $self->{tex}{h})
1541} 2356}
1542 2357
1543sub _draw { 2358sub _draw {
1544 my ($self) = @_; 2359 my ($self) = @_;
1545 2360
… …
1552 glTranslate 0, -$self->{w}, 0; 2367 glTranslate 0, -$self->{w}, 0;
1553 2368
1554 ($w, $h) = ($h, $w); 2369 ($w, $h) = ($h, $w);
1555 } 2370 }
1556 2371
1557 glEnable GL_BLEND;
1558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1559 glEnable GL_TEXTURE_2D; 2372 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 2374
1562 $tex->draw_quad (0, 0, $w, $h); 2375 $tex->draw_quad (0, 0, $w, $h);
1563 2376
1564 glDisable GL_BLEND;
1565 glDisable GL_TEXTURE_2D; 2377 glDisable GL_TEXTURE_2D;
1566} 2378}
1567 2379
1568############################################################################# 2380#############################################################################
1569 2381
2382package CFPlus::UI::ImageButton;
2383
2384our @ISA = CFPlus::UI::Image::;
2385
2386use CFPlus::OpenGL;
2387
2388my %textures;
2389
2390sub new {
2391 my $class = shift;
2392
2393 my $self = $class->SUPER::new (
2394 padding_x => 4,
2395 padding_y => 4,
2396 fg => [1, 1, 1],
2397 active_fg => [0, 0, 1],
2398 can_hover => 1,
2399 align => 0,
2400 valign => 0,
2401 can_events => 1,
2402 @_
2403 );
2404}
2405
2406sub invoke_button_up {
2407 my ($self, $ev, $x, $y) = @_;
2408
2409 $self->emit ("activate")
2410 if $x >= 0 && $x < $self->{w}
2411 && $y >= 0 && $y < $self->{h};
2412
2413 1
2414}
2415
2416#############################################################################
2417
1570package CFClient::UI::VGauge; 2418package CFPlus::UI::VGauge;
1571 2419
1572our @ISA = CFClient::UI::Base::; 2420our @ISA = CFPlus::UI::Base::;
1573 2421
2422use List::Util qw(min max);
2423
1574use CFClient::OpenGL; 2424use CFPlus::OpenGL;
1575 2425
1576my %tex = ( 2426my %tex = (
1577 food => [ 2427 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2429 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ], 2430 ],
1581 grace => [ 2431 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2432 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1583 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 2433 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1584 ], 2434 ],
1585 hp => [ 2435 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2437 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ], 2438 ],
1589 mana => [ 2439 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2440 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1591 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 2441 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1592 ], 2442 ],
1593); 2443);
1594 2444
1595# eg. VGauge->new (gauge => 'food'), default gauge: food 2445# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new { 2446sub new {
… …
1615} 2465}
1616 2466
1617sub set_max { 2467sub set_max {
1618 my ($self, $max) = @_; 2468 my ($self, $max) = @_;
1619 2469
2470 return if $self->{max_val} == $max;
2471
1620 $self->{max_val} = $max; 2472 $self->{max_val} = $max;
2473 $self->update;
1621} 2474}
1622 2475
1623sub set_value { 2476sub set_value {
1624 my ($self, $val, $max) = @_; 2477 my ($self, $val, $max) = @_;
1625 2478
1626 $self->set_max ($max) 2479 $self->set_max ($max)
1627 if defined $max; 2480 if defined $max;
1628 2481
1629 $max = $self->{max_val}; 2482 return if $self->{val} == $val;
2483
1630 $self->{val} = $val; 2484 $self->{val} = $val;
1631
1632 $self->update; 2485 $self->update;
1633} 2486}
1634 2487
1635sub _draw { 2488sub _draw {
1636 my ($self) = @_; 2489 my ($self) = @_;
1637 2490
1638 my $tex = $tex{$self->{type}}; 2491 my $tex = $tex{$self->{type}};
2492 my ($t1, $t2, $t3) = @$tex;
1639 2493
1640 my ($w, $h) = ($self->{w}, $self->{h}); 2494 my ($w, $h) = ($self->{w}, $self->{h});
1641 2495
1642 if ($self->{vertical}) { 2496 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1; 2497 glRotate 90, 0, 0, 1;
… …
1645 2499
1646 ($w, $h) = ($h, $w); 2500 ($w, $h) = ($h, $w);
1647 } 2501 }
1648 2502
1649 my $ycut = $self->{val} / ($self->{max_val} || 1); 2503 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651 2504
1652 my $t1 = $tex->[0]; 2505 my $ycut1 = max 0, min 1, $ycut;
1653 my $t2 = $tex->[1]; 2506 my $ycut2 = max 0, min 1, $ycut - 1;
2507
2508 my $h1 = $self->{h} * (1 - $ycut1);
2509 my $h2 = $self->{h} * (1 - $ycut2);
2510 my $h3 = $self->{h};
2511
2512 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1654 2513
1655 glEnable GL_BLEND; 2514 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2515 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2516 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 2519
1660 my $h1 = $self->{h} - $ycut * $self->{h};
1661 my $h2 = $ycut * $self->{h};
1662
1663 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2520 glBindTexture GL_TEXTURE_2D, $t1->{name};
1664 glBegin GL_QUADS; 2521 glBegin GL_QUADS;
1665 glTexCoord 0 , 0; glVertex 0 , 0; 2522 glTexCoord 0 , 0; glVertex 0 , 0;
1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2523 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2524 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1668 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2525 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1669 glEnd; 2526 glEnd;
1670 2527
2528 my $ycut1 = List::Util::min 1, $ycut;
1671 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2529 glBindTexture GL_TEXTURE_2D, $t2->{name};
1672 glBegin GL_QUADS; 2530 glBegin GL_QUADS;
1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2531 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2532 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2533 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2534 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1677 glEnd; 2535 glEnd;
2536
2537 if ($t3) {
2538 glBindTexture GL_TEXTURE_2D, $t3->{name};
2539 glBegin GL_QUADS;
2540 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2541 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2542 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2543 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2544 glEnd;
2545 }
1678 2546
1679 glDisable GL_BLEND; 2547 glDisable GL_BLEND;
1680 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
1681} 2549}
1682 2550
1683############################################################################# 2551#############################################################################
1684 2552
1685package CFClient::UI::Gauge; 2553package CFPlus::UI::Gauge;
1686 2554
1687our @ISA = CFClient::UI::VBox::; 2555our @ISA = CFPlus::UI::VBox::;
1688 2556
1689sub new { 2557sub new {
1690 my ($class, %arg) = shift; 2558 my ($class, %arg) = @_;
1691 2559
1692 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
1693 @_, 2561 tooltip => $arg{type},
2562 can_hover => 1,
2563 can_events => 1,
2564 %arg,
1694 ); 2565 );
1695 2566
1696 $self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 2567 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2568 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1697 $self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 2569 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701 2570
1702 $self 2571 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708} 2572}
1709 2573
1710sub set_fontsize { 2574sub set_fontsize {
1711 my ($self, $fsize) = @_; 2575 my ($self, $fsize) = @_;
1712 2576
1713 $self->{value}->set_fontsize ($fsize); 2577 $self->{value}->set_fontsize ($fsize);
1714 $self->{max} ->set_fontsize ($fsize); 2578 $self->{max} ->set_fontsize ($fsize);
1715} 2579}
1716 2580
2581sub set_max {
2582 my ($self, $max) = @_;
2583
2584 $self->{gauge}->set_max ($max);
2585 $self->{max}->set_text ($max);
2586}
2587
1717sub set_value { 2588sub set_value {
1718 my ($self, $val, $max) = @_; 2589 my ($self, $val, $max) = @_;
1719 2590
1720 $self->set_max ($max) 2591 $self->set_max ($max)
1721 if defined $max; 2592 if defined $max;
1722 2593
1723 $self->{gauge}->set_value ($val, $max); 2594 $self->{gauge}->set_value ($val, $max);
1724 $self->{value}->set_text ($val); 2595 $self->{value}->set_text ($val);
1725} 2596}
1726 2597
1727sub set_max {
1728 my ($self, $max) = @_;
1729
1730 $self->{gauge}->set_max ($max);
1731 $self->{max}->set_text ($max);
1732}
1733
1734############################################################################# 2598#############################################################################
1735 2599
1736package CFClient::UI::Slider; 2600package CFPlus::UI::Slider;
1737 2601
1738use strict; 2602use strict;
1739 2603
1740use CFClient::OpenGL; 2604use CFPlus::OpenGL;
1741 2605
1742our @ISA = CFClient::UI::DrawBG::; 2606our @ISA = CFPlus::UI::DrawBG::;
1743 2607
1744my @tex = 2608my @tex =
1745 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
1746 qw(s1_slider.png s1_slider_bg.png); 2610 qw(s1_slider.png s1_slider_bg.png);
1747 2611
1748sub new { 2612sub new {
1749 my $class = shift; 2613 my $class = shift;
1750 2614
1751 # range [value, low, high, page] 2615 # range [value, low, high, page, unit]
1752 2616
1753 # TODO: 0-width page 2617 # TODO: 0-width page
1754 # TODO: req_w/h are wrong with vertical 2618 # TODO: req_w/h are wrong with vertical
1755 # TODO: calculations are off 2619 # TODO: calculations are off
1756 my $self = $class->SUPER::new ( 2620 my $self = $class->SUPER::new (
1757 fg => [1, 1, 1], 2621 fg => [1, 1, 1],
1758 active_fg => [0, 0, 0], 2622 active_fg => [0, 0, 0],
2623 bg => [0, 0, 0, 0.2],
2624 active_bg => [1, 1, 1, 0.5],
1759 range => [0, 0, 100, 10], 2625 range => [0, 0, 100, 10, 0],
1760 req_w => 20, 2626 min_w => $::WIDTH / 80,
1761 req_h => 20, 2627 min_h => $::WIDTH / 80,
1762 vertical => 0, 2628 vertical => 0,
1763 can_hover => 1, 2629 can_hover => 1,
1764 inner_pad => 5, 2630 inner_pad => 0.02,
1765 @_ 2631 @_
1766 ); 2632 );
1767 2633
2634 $self->set_value ($self->{range}[0]);
2635 $self->update;
2636
1768 $self 2637 $self
1769} 2638}
1770 2639
2640sub set_range {
2641 my ($self, $range) = @_;
2642
2643 ($range, $self->{range}) = ($self->{range}, $range);
2644
2645 if ("@$range" ne "@{$self->{range}}") {
2646 $self->update;
2647 $self->set_value ($self->{range}[0]);
2648 }
2649}
2650
2651sub set_value {
2652 my ($self, $value) = @_;
2653
2654 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2655
2656 $hi = $lo + 1 if $hi <= $lo;
2657
2658 $page = $hi - $lo if $page > $hi - $lo;
2659
2660 $value = $lo if $value < $lo;
2661 $value = $hi - $page if $value > $hi - $page;
2662
2663 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2664 if $unit;
2665
2666 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2667
2668 if ($value != $old_value) {
2669 $self->emit (changed => $value);
2670 $self->update;
2671 }
2672}
2673
1771sub size_request { 2674sub size_request {
1772 my ($self) = @_; 2675 my ($self) = @_;
1773 2676
1774 my $w = $self->{req_w}; 2677 ($self->{req_w}, $self->{req_h})
1775 my $h = $self->{req_h};
1776
1777 $self->{vertical} ? ($h, $w) : ($w, $h)
1778} 2678}
1779 2679
1780sub button_down { 2680sub invoke_button_down {
1781 my ($self, $ev, $x, $y) = @_; 2681 my ($self, $ev, $x, $y) = @_;
1782 2682
1783 $self->SUPER::button_down ($ev, $x, $y); 2683 $self->SUPER::invoke_button_down ($ev, $x, $y);
2684
2685 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2686
1784 $self->mouse_motion ($ev, $x, $y); 2687 $self->invoke_mouse_motion ($ev, $x, $y)
1785} 2688}
1786 2689
1787sub mouse_motion { 2690sub invoke_mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 2691 my ($self, $ev, $x, $y) = @_;
1789 2692
1790 if ($GRAB == $self) { 2693 if ($GRAB == $self) {
2694 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2695
2696 my (undef, $lo, $hi, $page) = @{$self->{range}};
2697
2698 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2699
2700 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2701 } else {
2702 return 0;
2703 }
2704
2705 1
2706}
2707
2708sub invoke_mouse_wheel {
2709 my ($self, $ev) = @_;
2710
2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712
2713 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2714
2715 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2716
2717 ! ! $delta
2718}
2719
2720sub update {
2721 my ($self) = @_;
2722
2723 delete $self->{knob_w};
2724 $self->SUPER::update;
2725}
2726
2727sub _draw {
2728 my ($self) = @_;
2729
2730 unless ($self->{knob_w}) {
2731 $self->set_value ($self->{range}[0]);
2732
1791 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2733 my ($value, $lo, $hi, $page) = @{$self->{range}};
2734 my $range = ($hi - $page - $lo) || 1e-100;
1792 2735
1793 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2736 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1794 2737
1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2738 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2739 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1797 2740
1798 $x -= $inner_pad_px; # substract the padding 2741 $value = ($value - $lo) / $range;
1799 $x = $x * ($hi - $lo) / $inner_w + $lo; 2742 $value = $value * $self->{scale} + $self->{offset};
1800 $x = $lo if $x < $lo;
1801 $x = $hi - $page if $x > $hi - $page;
1802 $self->{range}[0] = $x;
1803 2743
1804 $self->emit (changed => $x); 2744 $self->{knob_x} = $value - $knob_w * 0.5;
1805 $self->update; 2745 $self->{knob_w} = $knob_w;
1806 } 2746 }
1807}
1808
1809# the inner_* stuff is for generating a padding for the slider handle,
1810# so that the handle doesn't leave the texture. This calculation isn't 100%
1811# correct propably, but it does the job for now
1812sub _calc_inner_pad_px {
1813 my ($self, $w) = @_;
1814 ($w / 100) * $self->{inner_pad} # % to pixels
1815}
1816
1817sub _draw {
1818 my ($self) = @_;
1819 2747
1820 $self->SUPER::_draw (); 2748 $self->SUPER::_draw ();
1821 2749
1822 my ($w, $h) = @$self{qw(w h)}; 2750 glScale $self->{w}, $self->{h};
1823 2751
1824 if ($self->{vertical}) { 2752 if ($self->{vertical}) {
1825 # draw a vertical slider like a rotated horizontal slider 2753 # draw a vertical slider like a rotated horizontal slider
1826 2754
2755 glTranslate 1, 0, 0;
1827 glRotate 90, 0, 0, 1; 2756 glRotate 90, 0, 0, 1;
1828 glTranslate 0, -$self->{w}, 0;
1829
1830 ($w, $h) = ($h, $w);
1831 } 2757 }
1832 2758
1833 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2759 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1834 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2760 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1835 2761
1836 my ($value, $lo, $hi, $page) = @{$self->{range}};
1837
1838 $hi = $value + 1 if $lo == $hi;
1839
1840 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1841 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1842
1843 $page = int $page * $inner_w / ($hi - $lo);
1844 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1845
1846 $w -= $page;
1847 $page &= ~1;
1848 glTranslate $page * 0.5, 0, 0;
1849 $page ||= 2;
1850
1851 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1852 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1853
1854 glEnable GL_BLEND;
1855 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1856 glEnable GL_TEXTURE_2D; 2762 glEnable GL_TEXTURE_2D;
1857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1858 2764
1859 # draw background 2765 # draw background
1860 $tex[1]->draw_quad (0, 0, $w, $h); 2766 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1861 2767
1862 # draw handle 2768 # draw handle
1863 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2769 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1864 2770
1865 glDisable GL_BLEND;
1866 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
1867} 2772}
1868 2773
1869############################################################################# 2774#############################################################################
1870 2775
1871package CFClient::UI::TextView; 2776package CFPlus::UI::ValSlider;
1872 2777
1873our @ISA = CFClient::UI::HBox::; 2778our @ISA = CFPlus::UI::HBox::;
1874 2779
2780sub new {
2781 my ($class, %arg) = @_;
2782
2783 my $range = delete $arg{range};
2784
2785 my $self = $class->SUPER::new (
2786 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2787 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2788 to_value => sub { shift },
2789 from_value => sub { shift },
2790 %arg,
2791 );
2792
2793 $self->{slider}->connect (changed => sub {
2794 my ($self, $value) = @_;
2795 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2796 $self->{parent}->emit (changed => $value);
2797 });
2798
2799# $self->{entry}->connect (changed => sub {
2800# my ($self, $value) = @_;
2801# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2802# $self->{parent}->emit (changed => $value);
2803# });
2804
2805 $self->add ($self->{slider}, $self->{entry});
2806
2807 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2808
2809 $self
2810}
2811
2812sub set_range { shift->{slider}->set_range (@_) }
2813sub set_value { shift->{slider}->set_value (@_) }
2814
2815#############################################################################
2816
2817package CFPlus::UI::TextScroller;
2818
2819our @ISA = CFPlus::UI::HBox::;
2820
1875use CFClient::OpenGL; 2821use CFPlus::OpenGL;
1876 2822
1877sub new { 2823sub new {
1878 my $class = shift; 2824 my $class = shift;
1879 2825
1880 my $self = $class->SUPER::new ( 2826 my $self = $class->SUPER::new (
1881 fontsize => 1, 2827 fontsize => 1,
2828 can_events => 1,
2829 indent => 0,
2830 #font => default_font
1882 @_, 2831 @_,
1883 2832
1884 layout => (new CFClient::Layout), 2833 layout => (new CFPlus::Layout),
1885 par => [], 2834 par => [],
2835 max_par => 0,
1886 height => 0, 2836 height => 0,
1887 children => [ 2837 children => [
1888 (new CFClient::UI::Empty expand => 1), 2838 (new CFPlus::UI::Empty expand => 1),
1889 (new CFClient::UI::Slider vertical => 1), 2839 (new CFPlus::UI::Slider vertical => 1),
1890 ], 2840 ],
1891 ); 2841 );
1892 2842
1893 $self->{children}[1]->connect (changed => sub { 2843 $self->{children}[1]->connect (changed => sub { $self->update });
1894 $self->update;
1895 });
1896 2844
1897 $self 2845 $self
1898} 2846}
1899 2847
1900sub set_fontsize { 2848sub set_fontsize {
… …
1902 2850
1903 $self->{fontsize} = $fontsize; 2851 $self->{fontsize} = $fontsize;
1904 $self->reflow; 2852 $self->reflow;
1905} 2853}
1906 2854
1907sub text_height { 2855sub size_request {
2856 my ($self) = @_;
2857
2858 my ($empty, $slider) = @{ $self->{children} };
2859
2860 local $self->{children} = [$empty, $slider];
2861 $self->SUPER::size_request
2862}
2863
2864sub invoke_size_allocate {
2865 my ($self, $w, $h) = @_;
2866
2867 my ($empty, $slider, @other) = @{ $self->{children} };
2868 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2869
2870 $self->{layout}->set_font ($self->{font}) if $self->{font};
2871 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2872 $self->{layout}->set_width ($empty->{w});
2873 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2874
2875 $self->reflow;
2876
2877 local $self->{children} = [$empty, $slider];
2878 $self->SUPER::invoke_size_allocate ($w, $h)
2879}
2880
2881sub invoke_mouse_wheel {
1908 my ($self, $text) = @_; 2882 my ($self, $ev) = @_;
2883
2884 return 0 unless $ev->{dy}; # only vertical movements
2885
2886 $self->{children}[1]->emit (mouse_wheel => $ev);
2887
2888 1
2889}
2890
2891sub get_layout {
2892 my ($self, $para) = @_;
1909 2893
1910 my $layout = $self->{layout}; 2894 my $layout = $self->{layout};
1911 2895
2896 $layout->set_font ($self->{font}) if $self->{font};
2897 $layout->set_foreground (@{$para->{fg}});
1912 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2898 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $layout->set_width ($self->{w}); 2899 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
1914 $layout->set_text ($text); 2900 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2901 $layout->set_markup ($para->{markup});
2902
2903 $layout->set_shapes (
2904 map
2905 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2906 @{$para->{widget}}
1915 2907 );
1916 ($layout->size)[1] 2908
2909 $layout
1917} 2910}
1918 2911
1919sub reflow { 2912sub reflow {
1920 my ($self) = @_; 2913 my ($self) = @_;
1921 2914
1922 $self->{need_reflow}++; 2915 $self->{need_reflow}++;
1923 $self->update; 2916 $self->update;
1924} 2917}
1925 2918
1926sub size_allocate { 2919sub set_offset {
2920 my ($self, $offset) = @_;
2921
2922 # todo: base offset on lines or so, not on pixels
2923 $self->{children}[1]->set_value ($offset);
2924}
2925
2926sub current_paragraph {
2927 my ($self) = @_;
2928
2929 $self->{top_paragraph} - 1
2930}
2931
2932sub scroll_to {
1927 my ($self, $w, $h) = @_; 2933 my ($self, $para) = @_;
1928 2934
1929 $self->SUPER::size_allocate ($w, $h); 2935 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
1930 2936
1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2937 $self->{scroll_to} = $para;
1932 $self->{layout}->set_width ($self->{children}[0]{w}); 2938 $self->update;
2939}
1933 2940
1934 $self->reflow; 2941sub clear {
2942 my ($self) = @_;
2943
2944 my (undef, undef, @other) = @{ $self->{children} };
2945 $self->remove ($_) for @other;
2946
2947 $self->{par} = [];
2948 $self->{height} = 0;
2949 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1935} 2950}
1936 2951
1937sub add_paragraph { 2952sub add_paragraph {
1938 my ($self, $color, $text) = @_; 2953 my $self = shift;
1939 2954
1940 #TODO: intelligently "reformat" paragraph 2955 for my $para (@_) {
2956 $para = {
2957 fg => [1, 1, 1, 1],
2958 indent => 0,
2959 markup => "",
2960 widget => [],
2961 ref $para ? %$para : (markup => $para),
2962 w => 1e10,
2963 wrapped => 1,
2964 };
1941 2965
1942 my $height = $self->text_height ($text); 2966 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2967 push @{$self->{par}}, $para;
2968 }
1943 2969
2970 if (my $max = $self->{max_par}) {
2971 shift @{$self->{par}} while @{$self->{par}} > $max;
2972 }
2973
2974 $self->{need_reflow}++;
2975 $self->update;
2976}
2977
2978sub scroll_to_bottom {
2979 my ($self) = @_;
2980
2981 $self->{scroll_to} = $#{$self->{par}};
2982 $self->update;
2983}
2984
2985sub force_uptodate {
2986 my ($self) = @_;
2987
2988 if (delete $self->{need_reflow}) {
2989 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2990
2991 my $height = 0;
2992
2993 for my $para (@{$self->{par}}) {
2994 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2995 my $layout = $self->get_layout ($para);
2996 my ($w, $h) = $layout->size;
2997
2998 $para->{w} = $w + $para->{indent};
2999 $para->{h} = $h;
3000 $para->{wrapped} = $layout->has_wrapped;
3001 }
3002
3003 $para->{y} = $height;
3004 $height += $para->{h};
3005 }
3006
1944 $self->{height} += $height; 3007 $self->{height} = $height;
3008 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
1945 3009
1946 push @{$self->{par}}, [$height, $color, $text]; 3010 delete $self->{texture};
3011 }
1947 3012
1948 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3013 if (my $paridx = delete $self->{scroll_to}) {
1949 $self->{children}[1]->update; 3014 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3015 }
1950} 3016}
1951 3017
1952sub update { 3018sub update {
1953 my ($self) = @_; 3019 my ($self) = @_;
1954 3020
… …
1956 3022
1957 return unless $self->{h} > 0; 3023 return unless $self->{h} > 0;
1958 3024
1959 delete $self->{texture}; 3025 delete $self->{texture};
1960 3026
1961 $ROOT->on_refresh ($self, sub { 3027 $ROOT->on_post_alloc ($self => sub {
1962 if (delete $self->{need_reflow}) { 3028 $self->force_uptodate;
1963 my $height = 0;
1964 3029
1965 $height += $_->[0] = $self->text_height ($_->[2]) 3030 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
1966 for @{$self->{par}};
1967 3031
1968 $self->{height} = $height;
1969
1970 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1971
1972 delete $self->{texture};
1973 }
1974
1975 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 3032 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
1976 glClearColor 0, 0, 0, 1; 3033 glClearColor 0, 0, 0, 0;
1977 glClear GL_COLOR_BUFFER_BIT; 3034 glClear GL_COLOR_BUFFER_BIT;
1978 3035
1979 glEnable GL_BLEND; 3036 package CFPlus::UI::Base;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 3037 local ($draw_x, $draw_y, $draw_w, $draw_h) =
1981 glEnable GL_TEXTURE_2D; 3038 (0, 0, $self->{w}, $self->{h});
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 3039
1984 my $top = int $self->{children}[1]{range}[0]; 3040 my $top = int $self->{children}[1]{range}[0];
1985 3041
3042 my $paridx = 0;
3043 my $top_paragraph;
3044 my $top = int $self->{children}[1]{range}[0];
3045
1986 my $y0 = $top; 3046 my $y0 = $top;
1987 my $y1 = $top + $self->{h}; 3047 my $y1 = $top + $H;
1988 3048
1989 my $y = 0;
1990
1991 my $layout = $self->{layout};
1992
1993 for my $par (@{$self->{par}}) { 3049 for my $para (@{$self->{par}}) {
1994 my $h = $par->[0]; 3050 my $h = $para->{h};
3051 my $y = $para->{y};
1995 3052
1996 if ($y0 < $y + $h && $y < $y1) { 3053 if ($y0 < $y + $h && $y < $y1) {
1997 $layout->set_text ($par->[2]); 3054 my $layout = $self->get_layout ($para);
1998 3055
1999 glColor @{ $par->[1] }; 3056 $layout->render ($para->{indent}, $y - $y0);
2000 my ($W, $H) = $layout->size; 3057
2001 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 3058 if (my @w = @{ $para->{widget} }) {
3059 my @s = $layout->get_shapes;
3060
3061 for (@w) {
3062 my ($dx, $dy) = splice @s, 0, 2, ();
3063
3064 $_->{x} = $dx + $para->{indent};
3065 $_->{y} = $dy + $y - $y0;
3066
3067 $_->draw;
3068 }
3069 }
2002 } 3070 }
2003 3071
2004 $y += $h; 3072 $paridx++;
3073 $top_paragraph ||= $paridx if $y >= $top;
2005 } 3074 }
2006 3075
2007 glDisable GL_TEXTURE_2D; 3076 $self->{top_paragraph} = $top_paragraph;
2008 glDisable GL_BLEND;
2009 }; 3077 };
2010 }); 3078 });
2011} 3079}
2012 3080
3081sub reconfigure {
3082 my ($self) = @_;
3083
3084 $self->SUPER::reconfigure;
3085
3086 $_->{w} = 1e10 for @{ $self->{par} };
3087 $self->reflow;
3088}
3089
2013sub _draw { 3090sub _draw {
2014 my ($self) = @_; 3091 my ($self) = @_;
2015 3092
2016 if ($self->{texture}) {
2017 glEnable GL_TEXTURE_2D; 3093 glEnable GL_TEXTURE_2D;
2018 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3094 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2019 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 3095 glColor 0, 0, 0, 1;
3096 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2020 glDisable GL_TEXTURE_2D; 3097 glDisable GL_TEXTURE_2D;
2021 }
2022 3098
2023 $self->{children}[1]->draw; 3099 $self->{children}[1]->draw;
2024
2025} 3100}
2026 3101
2027############################################################################# 3102#############################################################################
2028 3103
2029package CFClient::UI::Animator; 3104package CFPlus::UI::Animator;
2030 3105
2031use CFClient::OpenGL; 3106use CFPlus::OpenGL;
2032 3107
2033our @ISA = CFClient::UI::Bin::; 3108our @ISA = CFPlus::UI::Bin::;
2034 3109
2035sub moveto { 3110sub moveto {
2036 my ($self, $x, $y) = @_; 3111 my ($self, $x, $y) = @_;
2037 3112
2038 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3113 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2066 glPopMatrix; 3141 glPopMatrix;
2067} 3142}
2068 3143
2069############################################################################# 3144#############################################################################
2070 3145
2071package CFClient::UI::Flopper; 3146package CFPlus::UI::Flopper;
2072 3147
2073our @ISA = CFClient::UI::Button::; 3148our @ISA = CFPlus::UI::Button::;
2074 3149
2075sub new { 3150sub new {
2076 my $class = shift; 3151 my $class = shift;
2077 3152
2078 my $self = $class->SUPER::new ( 3153 my $self = $class->SUPER::new (
2079 state => 0, 3154 state => 0,
2080 connect_activate => \&toggle_flopper, 3155 on_activate => \&toggle_flopper,
2081 can_events => 1,
2082 @_ 3156 @_
2083 ); 3157 );
2084 3158
2085 if ($self->{state}) {
2086 $self->{state} = 0;
2087 $self->toggle_flopper;
2088 }
2089
2090 $self 3159 $self
2091} 3160}
2092 3161
2093sub toggle_flopper { 3162sub toggle_flopper {
2094 my ($self) = @_; 3163 my ($self) = @_;
2095 3164
2096 # TODO: use animation 3165 $self->{other}->toggle_visibility;
2097 if ($self->{state} = !$self->{state}) { 3166}
2098 $CFClient::UI::ROOT->add ($self->{other}); 3167
2099 $self->{other}->move ($self->coord2global (0, $self->{h})); 3168#############################################################################
3169
3170package CFPlus::UI::Tooltip;
3171
3172our @ISA = CFPlus::UI::Bin::;
3173
3174use CFPlus::OpenGL;
3175
3176sub new {
3177 my $class = shift;
3178
3179 $class->SUPER::new (
3180 @_,
3181 can_events => 0,
3182 )
3183}
3184
3185sub set_tooltip_from {
3186 my ($self, $widget) = @_;
3187
3188 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3189 if $widget->{tooltip} =~ /^#(.*)$/;
3190
3191 my $tooltip = $widget->{tooltip};
3192
3193 if ($ENV{CFPLUS_DEBUG} & 2) {
3194 $tooltip .= "\n\n" . (ref $widget) . "\n"
3195 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3196 . "req $widget->{req_w} $widget->{req_h}\n"
3197 . "visible $widget->{visible}";
3198 }
3199
3200 $tooltip =~ s/^\n+//;
3201 $tooltip =~ s/\n+$//;
3202
3203 $self->add (new CFPlus::UI::Label
3204 markup => $tooltip,
3205 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3206 fontsize => 0.8,
3207 style => 1, # FLAG_INVERSE
3208 ellipsise => 0,
3209 font => ($widget->{tooltip_font} || $::FONT_PROP),
3210 );
3211}
3212
3213sub size_request {
3214 my ($self) = @_;
3215
3216 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
3217
3218 ($w + 4, $h + 4)
3219}
3220
3221sub invoke_size_allocate {
3222 my ($self, $w, $h) = @_;
3223
3224 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3225}
3226
3227sub invoke_visibility_change {
3228 my ($self, $visible) = @_;
3229
3230 return unless $visible;
3231
3232 $self->{root}->on_post_alloc ("move_$self" => sub {
3233 my $widget = $self->{owner}
3234 or return;
3235
3236 if ($widget->{visible}) {
3237 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3238
3239 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3240 if $x + $self->{w} > $self->{root}{w};
3241
3242 $self->move_abs ($x, $y);
3243 } else {
3244 $self->hide;
3245 }
3246 });
3247}
3248
3249sub _draw {
3250 my ($self) = @_;
3251
3252 glTranslate 0.375, 0.375;
3253
3254 my ($w, $h) = @$self{qw(w h)};
3255
3256 glColor 1, 0.8, 0.4;
3257 glBegin GL_QUADS;
3258 glVertex 0 , 0;
3259 glVertex 0 , $h;
3260 glVertex $w, $h;
3261 glVertex $w, 0;
3262 glEnd;
3263
3264 glColor 0, 0, 0;
3265 glBegin GL_LINE_LOOP;
3266 glVertex 0 , 0;
3267 glVertex 0 , $h;
3268 glVertex $w, $h;
3269 glVertex $w, 0;
3270 glEnd;
3271
3272 glTranslate 2 - 0.375, 2 - 0.375;
3273
3274 $self->SUPER::_draw;
3275}
3276
3277#############################################################################
3278
3279package CFPlus::UI::Face;
3280
3281our @ISA = CFPlus::UI::DrawBG::;
3282
3283use CFPlus::OpenGL;
3284
3285sub new {
3286 my $class = shift;
3287
3288 my $self = $class->SUPER::new (
3289 aspect => 1,
3290 can_events => 0,
3291 @_,
3292 );
3293
3294 if ($self->{anim} && $self->{animspeed}) {
3295 CFPlus::weaken (my $widget = $self);
3296
3297 $self->{timer} = Event->timer (
3298 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3299 hard => 1,
3300 interval => $self->{animspeed},
3301 cb => sub {
3302 ++$widget->{frame};
3303 $widget->update;
3304 },
3305 );
3306 }
3307
3308 $self
3309}
3310
3311sub size_request {
3312 (32, 8)
3313}
3314
3315sub update {
3316 my ($self) = @_;
3317
3318 return unless $self->{visible};
3319
3320 $self->SUPER::update;
3321}
3322
3323sub _draw {
3324 my ($self) = @_;
3325
3326 return unless $::CONN;
3327
3328 $self->SUPER::_draw;
3329
3330 my $face;
3331
3332 if ($self->{frame}) {
3333 my $anim = $::CONN->{anim}[$self->{anim}];
3334
3335 $face = $anim->[ $self->{frame} % @$anim ]
3336 if $anim && @$anim;
3337 }
3338
3339 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3340
3341 if ($tex) {
3342 glEnable GL_TEXTURE_2D;
3343 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3344 glColor 0, 0, 0, 1;
3345 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3346 glDisable GL_TEXTURE_2D;
3347 }
3348}
3349
3350sub destroy {
3351 my ($self) = @_;
3352
3353 $self->{timer}->cancel
3354 if $self->{timer};
3355
3356 $self->SUPER::destroy;
3357}
3358
3359#############################################################################
3360
3361package CFPlus::UI::Buttonbar;
3362
3363our @ISA = CFPlus::UI::HBox::;
3364
3365# TODO: should actually wrap buttons and other goodies.
3366
3367#############################################################################
3368
3369package CFPlus::UI::Menu;
3370
3371our @ISA = CFPlus::UI::Toplevel::;
3372
3373use CFPlus::OpenGL;
3374
3375sub new {
3376 my $class = shift;
3377
3378 my $self = $class->SUPER::new (
3379 items => [],
3380 z => 100,
3381 @_,
3382 );
3383
3384 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3385
3386 for my $item (@{ $self->{items} }) {
3387 my ($widget, $cb, $tooltip) = @$item;
3388
3389 # handle various types of items, only text for now
3390 if (!ref $widget) {
3391 if ($widget =~ /\t/) {
3392 my ($left, $right) = split /\t/, $widget, 2;
3393
3394 $widget = new CFPlus::UI::HBox
3395 can_hover => 1,
3396 can_events => 1,
3397 tooltip => $tooltip,
3398 children => [
3399 (new CFPlus::UI::Label markup => $left, expand => 1),
3400 (new CFPlus::UI::Label markup => $right, align => +1),
3401 ],
3402 ;
3403
3404 } else {
3405 $widget = new CFPlus::UI::Label
3406 can_hover => 1,
3407 can_events => 1,
3408 markup => $widget,
3409 tooltip => $tooltip;
3410 }
3411 }
3412
3413 $self->{item}{$widget} = $item;
3414
3415 $self->{vbox}->add ($widget);
3416 }
3417
3418 $self
3419}
3420
3421# popup given the event (must be a mouse button down event currently)
3422sub popup {
3423 my ($self, $ev) = @_;
3424
3425 $self->emit ("popdown");
3426
3427 # maybe save $GRAB? must be careful about events...
3428 $GRAB = $self;
3429 $self->{button} = $ev->{button};
3430
3431 $self->show;
3432 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3433}
3434
3435sub invoke_mouse_motion {
3436 my ($self, $ev, $x, $y) = @_;
3437
3438 # TODO: should use vbox->find_widget or so
3439 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3440 $self->{hover} = $self->{item}{$HOVER};
3441
3442 0
3443}
3444
3445sub invoke_button_up {
3446 my ($self, $ev, $x, $y) = @_;
3447
3448 if ($ev->{button} == $self->{button}) {
3449 undef $GRAB;
3450 $self->hide;
3451
2100 $self->emit ("open"); 3452 $self->emit ("popdown");
3453 $self->{hover}[1]->() if $self->{hover};
2101 } else { 3454 } else {
2102 $CFClient::UI::ROOT->remove ($self->{other}); 3455 return 0
2103 $self->emit ("close"); 3456 }
3457
2104 } 3458 1
2105
2106 $self->emit (changed => $self->{state});
2107} 3459}
2108 3460
2109############################################################################# 3461#############################################################################
2110 3462
2111package CFClient::UI::Root; 3463package CFPlus::UI::Multiplexer;
2112 3464
2113our @ISA = CFClient::UI::Container::; 3465our @ISA = CFPlus::UI::Container::;
2114 3466
2115use CFClient::OpenGL; 3467sub new {
3468 my $class = shift;
2116 3469
2117sub check_size { 3470 my $self = $class->SUPER::new (
3471 @_,
3472 );
3473
3474 $self->{current} = $self->{children}[0]
3475 if @{ $self->{children} };
3476
3477 $self
3478}
3479
3480sub add {
2118 my ($self) = @_; 3481 my ($self, @widgets) = @_;
2119 3482
2120 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3483 $self->SUPER::add (@widgets);
3484
3485 $self->{current} = $self->{children}[0]
3486 if @{ $self->{children} };
3487}
3488
3489sub get_current_page {
3490 my ($self) = @_;
3491
3492 $self->{current}
3493}
3494
3495sub set_current_page {
3496 my ($self, $page_or_widget) = @_;
3497
3498 my $widget = ref $page_or_widget
3499 ? $page_or_widget
3500 : $self->{children}[$page_or_widget];
3501
3502 $self->{current} = $widget;
3503 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3504
3505 $self->emit (page_changed => $self->{current});
3506
3507 $self->realloc;
3508}
3509
3510sub visible_children {
3511 $_[0]{current}
2121} 3512}
2122 3513
2123sub size_request { 3514sub size_request {
2124 ($::WIDTH, $::HEIGHT) 3515 my ($self) = @_;
2125}
2126 3516
3517 $self->{current}->size_request
3518}
3519
3520sub invoke_size_allocate {
3521 my ($self, $w, $h) = @_;
3522
3523 $self->{current}->configure (0, 0, $w, $h);
3524
3525 1
3526}
3527
3528sub _draw {
3529 my ($self) = @_;
3530
3531 $self->{current}->draw;
3532}
3533
3534#############################################################################
3535
3536package CFPlus::UI::Notebook;
3537
3538our @ISA = CFPlus::UI::VBox::;
3539
3540sub new {
3541 my $class = shift;
3542
3543 my $self = $class->SUPER::new (
3544 buttonbar => (new CFPlus::UI::Buttonbar),
3545 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3546 # filter => # will be put between multiplexer and $self
3547 @_,
3548 );
3549
3550 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3551 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3552
3553 $self
3554}
3555
3556sub add {
3557 my ($self, $title, $widget, $tooltip) = @_;
3558
3559 CFPlus::weaken $self;
3560
3561 $self->{buttonbar}->add (new CFPlus::UI::Button
3562 markup => $title,
3563 tooltip => $tooltip,
3564 on_activate => sub { $self->set_current_page ($widget) },
3565 );
3566
3567 $self->{multiplexer}->add ($widget);
3568}
3569
3570sub get_current_page {
3571 my ($self) = @_;
3572
3573 $self->{multiplexer}->get_current_page
3574}
3575
3576sub set_current_page {
3577 my ($self, $page) = @_;
3578
3579 $self->{multiplexer}->set_current_page ($page);
3580 $self->emit (page_changed => $self->{multiplexer}{current});
3581}
3582
3583#############################################################################
3584
3585package CFPlus::UI::Selector;
3586
3587use utf8;
3588
3589our @ISA = CFPlus::UI::Button::;
3590
3591sub new {
3592 my $class = shift;
3593
3594 my $self = $class->SUPER::new (
3595 options => [], # [value, title, longdesc], ...
3596 value => undef,
3597 @_,
3598 );
3599
3600 $self->_set_value ($self->{value});
3601
3602 $self
3603}
3604
3605sub invoke_button_down {
3606 my ($self, $ev) = @_;
3607
3608 my @menu_items;
3609
3610 for (@{ $self->{options} }) {
3611 my ($value, $title, $tooltip) = @$_;
3612
3613 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3614 }
3615
3616 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3617}
3618
3619sub _set_value {
3620 my ($self, $value) = @_;
3621
3622 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3623 or return;
3624
3625 $self->{value} = $item->[0];
3626 $self->set_markup ("$item->[1] ⇓");
3627 $self->set_tooltip ($item->[2]);
3628}
3629
3630sub set_value {
3631 my ($self, $value) = @_;
3632
3633 return unless $self->{value} ne $value;
3634
3635 $self->_set_value ($value);
3636 $self->emit (changed => $value);
3637}
3638
3639#############################################################################
3640
3641package CFPlus::UI::Statusbox;
3642
3643our @ISA = CFPlus::UI::VBox::;
3644
3645sub new {
3646 my $class = shift;
3647
3648 my $self = $class->SUPER::new (
3649 fontsize => 0.8,
3650 @_,
3651 );
3652
3653 CFPlus::weaken (my $this = $self);
3654
3655 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3656
3657 $self
3658}
3659
3660sub reorder {
3661 my ($self) = @_;
3662 my $NOW = Time::HiRes::time;
3663
3664 # freeze display when hovering over any label
3665 return if $CFPlus::UI::TOOLTIP->{owner}
3666 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3667 values %{ $self->{item} };
3668
3669 while (my ($k, $v) = each %{ $self->{item} }) {
3670 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3671 }
3672
3673 my @widgets;
3674
3675 my @items = sort {
3676 $a->{pri} <=> $b->{pri}
3677 or $b->{id} <=> $a->{id}
3678 } values %{ $self->{item} };
3679
3680 $self->{timer}->interval (1);
3681
3682 my $count = 10 + 1;
3683 for my $item (@items) {
3684 last unless --$count;
3685
3686 my $label = $item->{label} ||= do {
3687 # TODO: doesn't handle markup well (read as: at all)
3688 my $short = $item->{count} > 1
3689 ? "<b>$item->{count} ×</b> $item->{text}"
3690 : $item->{text};
3691
3692 for ($short) {
3693 s/^\s+//;
3694 s/\s+/ /g;
3695 }
3696
3697 new CFPlus::UI::Label
3698 markup => $short,
3699 tooltip => $item->{tooltip},
3700 tooltip_font => $::FONT_PROP,
3701 tooltip_width => 0.67,
3702 fontsize => $item->{fontsize} || $self->{fontsize},
3703 max_w => $::WIDTH * 0.44,
3704 fg => [@{ $item->{fg} }],
3705 can_events => 1,
3706 can_hover => 1
3707 };
3708
3709 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3710 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3711 $label->update;
3712 $label->set_max_size (undef, $label->{req_h} * $diff)
3713 if $diff < 1;
3714 $self->{timer}->interval (1/30);
3715 } else {
3716 $label->{fg}[3] = $item->{fg}[3] || 1;
3717 }
3718
3719 push @widgets, $label;
3720 }
3721
3722 $self->clear;
3723 $self->SUPER::add (reverse @widgets);
3724}
3725
3726sub add {
3727 my ($self, $text, %arg) = @_;
3728
3729 $text =~ s/^\s+//;
3730 $text =~ s/\s+$//;
3731
3732 return unless $text;
3733
3734 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3735
3736 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3737
3738 if (my $item = $self->{item}{$group}) {
3739 if ($item->{text} eq $text) {
3740 $item->{count}++;
3741 } else {
3742 $item->{count} = 1;
3743 $item->{text} = $item->{tooltip} = $text;
3744 }
3745 $item->{id} += 0.2;#d#
3746 $item->{timeout} = $timeout;
3747 delete $item->{label};
3748 } else {
3749 $self->{item}{$group} = {
3750 id => ++$self->{id},
3751 text => $text,
3752 timeout => $timeout,
3753 tooltip => $text,
3754 fg => [0.8, 0.8, 0.8, 0.8],
3755 pri => 0,
3756 count => 1,
3757 %arg,
3758 };
3759 }
3760
3761 $ROOT->on_refresh (reorder => sub {
3762 $self->reorder;
3763 });
3764}
3765
2127sub configure { 3766sub reconfigure {
3767 my ($self) = @_;
3768
3769 delete $_->{label}
3770 for values %{ $self->{item} || {} };
3771
3772 $self->reorder;
3773 $self->SUPER::reconfigure;
3774}
3775
3776sub destroy {
3777 my ($self) = @_;
3778
3779 $self->{timer}->cancel;
3780
3781 $self->SUPER::destroy;
3782}
3783
3784#############################################################################
3785
3786package CFPlus::UI::Root;
3787
3788our @ISA = CFPlus::UI::Container::;
3789
3790use List::Util qw(min max);
3791
3792use CFPlus::OpenGL;
3793
3794sub new {
3795 my $class = shift;
3796
3797 my $self = $class->SUPER::new (
3798 visible => 1,
3799 @_,
3800 );
3801
3802 CFPlus::weaken ($self->{root} = $self);
3803
3804 $self
3805}
3806
3807sub size_request {
3808 my ($self) = @_;
3809
3810 ($self->{w}, $self->{h})
3811}
3812
3813sub _to_pixel {
3814 my ($coord, $size, $max) = @_;
3815
3816 $coord =
3817 $coord eq "center" ? ($max - $size) * 0.5
3818 : $coord eq "max" ? $max
3819 : $coord;
3820
3821 $coord = 0 if $coord < 0;
3822 $coord = $max - $size if $coord > $max - $size;
3823
3824 int $coord + 0.5
3825}
3826
3827sub invoke_size_allocate {
2128 my ($self, $x, $y, $w, $h) = @_; 3828 my ($self, $w, $h) = @_;
2129 3829
2130 $self->SUPER::configure ($x, $y, $w, $h);
2131
2132 for my $child (@{$self->{children}}) { 3830 for my $child ($self->children) {
2133 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3831 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2134 3832
2135 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3833 $X = $child->{force_x} if exists $child->{force_x};
2136 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3834 $Y = $child->{force_y} if exists $child->{force_y};
3835
3836 $X = _to_pixel $X, $W, $self->{w};
3837 $Y = _to_pixel $Y, $H, $self->{h};
3838
2137 $child->configure ($X, $Y, $W,$H); 3839 $child->configure ($X, $Y, $W, $H);
3840 }
3841
2138 } 3842 1
2139} 3843}
2140 3844
2141sub _topleft { 3845sub coord2local {
2142 my ($self, $x, $y) = @_; 3846 my ($self, $x, $y) = @_;
2143 3847
2144 ($x, $y) 3848 ($x, $y)
2145} 3849}
2146 3850
3851sub coord2global {
3852 my ($self, $x, $y) = @_;
3853
3854 ($x, $y)
3855}
3856
2147sub update { 3857sub update {
2148 my ($self) = @_; 3858 my ($self) = @_;
2149 3859
2150 $self->check_size; 3860 $::WANT_REFRESH++;
2151 ::refresh ();
2152} 3861}
2153 3862
2154sub add { 3863sub add {
2155 my ($self, $child) = @_; 3864 my ($self, @children) = @_;
2156 3865
2157 # integerize window positions 3866 $_->{is_toplevel} = 1
2158 $child->{x} = int $child->{x}; 3867 for @children;
2159 $child->{y} = int $child->{y};
2160 3868
2161 $self->SUPER::add ($child); 3869 $self->SUPER::add (@children);
3870}
3871
3872sub remove {
3873 my ($self, @children) = @_;
3874
3875 $self->SUPER::remove (@children);
3876
3877 delete $self->{is_toplevel}
3878 for @children;
3879
3880 while (@children) {
3881 my $w = pop @children;
3882 push @children, $w->children;
3883 $w->set_invisible;
3884 }
2162} 3885}
2163 3886
2164sub on_refresh { 3887sub on_refresh {
2165 my ($self, $id, $cb) = @_; 3888 my ($self, $id, $cb) = @_;
2166 3889
2167 $self->{refresh_hook}{$id} = $cb; 3890 $self->{refresh_hook}{$id} = $cb;
2168} 3891}
2169 3892
3893sub on_post_alloc {
3894 my ($self, $id, $cb) = @_;
3895
3896 $self->{post_alloc_hook}{$id} = $cb;
3897}
3898
2170sub draw { 3899sub draw {
2171 my ($self) = @_; 3900 my ($self) = @_;
2172 3901
2173 while (my $rcb = delete $self->{refresh_hook}) { 3902 while ($self->{refresh_hook}) {
2174 $_->() for values %$rcb; 3903 $_->()
3904 for values %{delete $self->{refresh_hook}};
2175 } 3905 }
3906
3907 if ($self->{realloc}) {
3908 my %queue;
3909 my @queue;
3910 my $widget;
3911
3912 outer:
3913 while () {
3914 if (my $realloc = delete $self->{realloc}) {
3915 for $widget (values %$realloc) {
3916 $widget->{visible} or next; # do not resize invisible widgets
3917
3918 $queue{$widget+0}++ and next; # duplicates are common
3919
3920 push @{ $queue[$widget->{visible}] }, $widget;
3921 }
3922 }
3923
3924 while () {
3925 @queue or last outer;
3926
3927 $widget = pop @{ $queue[-1] || [] }
3928 and last;
3929
3930 pop @queue;
3931 }
3932
3933 delete $queue{$widget+0};
3934
3935 my ($w, $h) = $widget->size_request;
3936
3937 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3938 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3939
3940 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942
3943 $w = $widget->{force_w} if exists $widget->{force_w};
3944 $h = $widget->{force_h} if exists $widget->{force_h};
3945
3946 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3947 || delete $widget->{force_realloc}) {
3948 $widget->{req_w} = $w;
3949 $widget->{req_h} = $h;
3950
3951 $self->{size_alloc}{$widget+0} = $widget;
3952
3953 if (my $parent = $widget->{parent}) {
3954 $self->{realloc}{$parent+0} = $parent
3955 unless $queue{$parent+0};
3956
3957 $parent->{force_size_alloc} = 1;
3958 $self->{size_alloc}{$parent+0} = $parent;
3959 }
3960 }
3961
3962 delete $self->{realloc}{$widget+0};
3963 }
3964 }
3965
3966 while (my $size_alloc = delete $self->{size_alloc}) {
3967 my @queue = sort { $b->{visible} <=> $a->{visible} }
3968 values %$size_alloc;
3969
3970 while () {
3971 my $widget = pop @queue || last;
3972
3973 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3974
3975 $w = 0 if $w < 0;
3976 $h = 0 if $h < 0;
3977
3978 $w = max $widget->{min_w}, $w;
3979 $h = max $widget->{min_h}, $h;
3980
3981# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3982# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3983
3984 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3985 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3986
3987 $w = int $w + 0.5;
3988 $h = int $h + 0.5;
3989
3990 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3991 $widget->{old_w} = $widget->{w};
3992 $widget->{old_h} = $widget->{h};
3993
3994 $widget->{w} = $w;
3995 $widget->{h} = $h;
3996
3997 $widget->emit (size_allocate => $w, $h);
3998 }
3999 }
4000 }
4001
4002 while ($self->{post_alloc_hook}) {
4003 $_->()
4004 for values %{delete $self->{post_alloc_hook}};
4005 }
4006
2176 4007
2177 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4008 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2178 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4009 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2179 glClear GL_COLOR_BUFFER_BIT; 4010 glClear GL_COLOR_BUFFER_BIT;
2180 4011
2181 glMatrixMode GL_PROJECTION; 4012 glMatrixMode GL_PROJECTION;
2182 glLoadIdentity; 4013 glLoadIdentity;
2183 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4014 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2184 glMatrixMode GL_MODELVIEW; 4015 glMatrixMode GL_MODELVIEW;
2185 glLoadIdentity; 4016 glLoadIdentity;
2186 4017
4018 {
4019 package CFPlus::UI::Base;
4020
4021 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4022 (0, 0, $self->{w}, $self->{h});
4023
2187 $self->_draw; 4024 $self->_draw;
4025 }
2188} 4026}
2189 4027
2190############################################################################# 4028#############################################################################
2191 4029
2192package CFClient::UI; 4030package CFPlus::UI;
2193 4031
2194$ROOT = new CFClient::UI::Root; 4032$ROOT = new CFPlus::UI::Root;
4033$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2195 4034
21961 40351
2197 4036

Diff Legend

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