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.174 by root, Tue Apr 25 11:18:49 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

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

Diff Legend

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