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

Diff Legend

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