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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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