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

Diff Legend

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