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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

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

Diff Legend

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