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

Diff Legend

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