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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC

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

Diff Legend

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