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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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