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

Diff Legend

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