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

Diff Legend

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