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

Diff Legend

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