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.149 by root, Sat Apr 22 23:11:32 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines