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

Diff Legend

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