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

Diff Legend

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