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

Diff Legend

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