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.393 by root, Sat Jul 21 13:41:46 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
… …
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 1107#TODO# update range on size_allocate depending on child?
839# update viewport offset on scroll 1108
1109sub add {
1110 my ($self, $widget) = @_;
1111
1112 $self->{vp}->add ($self->{child} = $widget);
1113}
1114
1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) {
1125 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider});
1127 }
1128
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) {
1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144}
1145
1146sub invoke_mouse_wheel {
1147 my ($self, $ev) = @_;
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev)
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev)
1153 if $ev->{dx};
1154
1155 1
1156}
1157
1158sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_;
1160
1161 if ($ev->{button} == 2) {
1162 $self->grab_focus;
1163
1164 my $ox = $self->{vp}{view_x} + $ev->{x};
1165 my $oy = $self->{vp}{view_y} + $ev->{y};
1166
1167 $self->{motion} = sub {
1168 my ($ev, $x, $y) = @_;
1169
1170 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1171 $self->update;
1172 };
1173
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_button_up {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if (delete $self->{motion}) {
1184 return 1;
1185 }
1186
1187 0
1188}
1189
1190sub invoke_mouse_motion {
1191 my ($self, $ev, $x, $y) = @_;
1192
1193 if ($self->{motion}) {
1194 $self->{motion}->($ev, $x, $y);
1195 return 1;
1196 }
1197
1198 0
1199}
1200
1201sub invoke_size_allocate {
1202 my ($self, $w, $h) = @_;
1203
1204 $self->update_slider;
1205 $self->SUPER::invoke_size_allocate ($w, $h)
1206}
840 1207
841############################################################################# 1208#############################################################################
842 1209
843package CFClient::UI::Frame; 1210package CFPlus::UI::Frame;
844 1211
845our @ISA = CFClient::UI::Bin::; 1212our @ISA = CFPlus::UI::Bin::;
846 1213
847use CFClient::OpenGL; 1214use CFPlus::OpenGL;
848 1215
849sub new { 1216sub new {
850 my $class = shift; 1217 my $class = shift;
851 1218
852 $class->SUPER::new ( 1219 $class->SUPER::new (
… …
860 1227
861 if ($self->{bg}) { 1228 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1229 my ($w, $h) = @$self{qw(w h)};
863 1230
864 glEnable GL_BLEND; 1231 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1232 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1233 glColor_premultiply @{ $self->{bg} };
867 1234
868 glBegin GL_QUADS; 1235 glBegin GL_QUADS;
869 glVertex 0 , 0; 1236 glVertex 0 , 0;
870 glVertex 0 , $h; 1237 glVertex 0 , $h;
871 glVertex $w, $h; 1238 glVertex $w, $h;
… …
878 $self->SUPER::_draw; 1245 $self->SUPER::_draw;
879} 1246}
880 1247
881############################################################################# 1248#############################################################################
882 1249
883package CFClient::UI::FancyFrame; 1250package CFPlus::UI::FancyFrame;
884 1251
885our @ISA = CFClient::UI::Bin::; 1252our @ISA = CFPlus::UI::Bin::;
886 1253
887use CFClient::OpenGL; 1254use 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 1255
893sub new { 1256sub new {
894 my $class = shift; 1257 my ($class, %arg) = @_;
895 1258
896 # TODO: user_x, user_y, overwrite moveto? 1259 if ((exists $arg{label}) && !ref $arg{label}) {
1260 $arg{label} = new CFPlus::UI::Label
1261 align => 1,
1262 valign => 0,
1263 text => $arg{label},
1264 fontsize => ($arg{border} || 0.8) * 0.75;
1265 }
897 1266
898 my $self = $class->SUPER::new ( 1267 my $self = $class->SUPER::new (
1268 # label => "",
899 bg => [1, 1, 1, 1], 1269 fg => [0.6, 0.3, 0.1],
900 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1270 border => 0.8,
902 toplevel => 1, 1271 style => 'single',
903 can_events => 1, 1272 %arg,
904 @_
905 ); 1273 );
906 1274
907 $self->{title} &&= new CFClient::UI::Label
908 align => 0,
909 valign => 1,
910 text => $self->{title},
911 fontsize => $self->{border};
912
913 $self 1275 $self
1276}
1277
1278sub add {
1279 my ($self, @widgets) = @_;
1280
1281 $self->SUPER::add (@widgets);
1282 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
914} 1283}
915 1284
916sub border { 1285sub border {
917 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
918} 1287}
919 1288
920sub size_request { 1289sub size_request {
921 my ($self) = @_; 1290 my ($self) = @_;
1291
1292 ($self->{label_w}, undef) = $self->{label}->size_request
1293 if $self->{label};
922 1294
923 my ($w, $h) = $self->SUPER::size_request; 1295 my ($w, $h) = $self->SUPER::size_request;
924 1296
925 ( 1297 (
926 $w + $self->border * 2, 1298 $w + $self->border * 2,
927 $h + $self->border * 2, 1299 $h + $self->border * 2,
928 ) 1300 )
929} 1301}
930 1302
931sub size_allocate { 1303sub invoke_size_allocate {
932 my ($self, $w, $h) = @_; 1304 my ($self, $w, $h) = @_;
933 1305
934 $h -= List::Util::max 0, $self->border * 2; 1306 my $border = $self->border;
1307
935 $w -= List::Util::max 0, $self->border * 2; 1308 $w -= List::Util::max 0, $border * 2;
1309 $h -= List::Util::max 0, $border * 2;
936 1310
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1311 if (my $label = $self->{label}) {
938 if $self->{title}; 1312 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1313 $label->{h} = List::Util::min $h, $border;
1314 $label->invoke_size_allocate ($label->{w}, $label->{h});
1315 }
939 1316
940 $self->child->configure ($self->border, $self->border, $w, $h); 1317 $self->child->configure ($border, $border, $w, $h);
941}
942 1318
1319 1
1320}
1321
1322sub _draw {
1323 my ($self) = @_;
1324
1325 my $child = $self->{children}[0];
1326
1327 my $border = $self->border;
1328 my ($w, $h) = ($self->{w}, $self->{h});
1329
1330 $child->draw;
1331
1332 glColor @{$self->{fg}};
1333 glBegin GL_LINE_STRIP;
1334 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1335 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1336 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1337 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1338 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1339 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1340 glEnd;
1341
1342 if ($self->{label}) {
1343 glTranslate $border * 2, 0;
1344 $self->{label}->_draw;
1345 }
1346}
1347
1348#############################################################################
1349
1350package CFPlus::UI::Toplevel;
1351
1352our @ISA = CFPlus::UI::Bin::;
1353
1354use CFPlus::OpenGL;
1355
1356my $bg =
1357 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1358 mipmap => 1, wrap => 1;
1359
1360my @border =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1363
1364my @icon =
1365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1366 qw(x1_move.png x1_resize.png);
1367
1368sub new {
1369 my ($class, %arg) = @_;
1370
1371 my $self = $class->SUPER::new (
1372 bg => [1, 1, 1, 1],
1373 border_bg => [1, 1, 1, 1],
1374 border => 0.6,
1375 can_events => 1,
1376 min_w => 64,
1377 min_h => 32,
1378 %arg,
1379 );
1380
1381 $self->{title_widget} = new CFPlus::UI::Label
1382 align => 0,
1383 valign => 1,
1384 text => $self->{title},
1385 fontsize => $self->{border},
1386 if exists $self->{title};
1387
1388 if ($self->{has_close_button}) {
1389 $self->{close_button} =
1390 new CFPlus::UI::ImageButton
1391 path => 'x1_close.png',
1392 on_activate => sub { $self->emit ("delete") };
1393
1394 $self->CFPlus::UI::Container::add ($self->{close_button});
1395 }
1396
1397 $self
1398}
1399
1400sub add {
1401 my ($self, @widgets) = @_;
1402
1403 $self->SUPER::add (@widgets);
1404 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1405 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1406}
1407
1408sub border {
1409 int $_[0]{border} * $::FONTSIZE
1410}
1411
1412sub size_request {
1413 my ($self) = @_;
1414
1415 $self->{title_widget}->size_request
1416 if $self->{title_widget};
1417
1418 $self->{close_button}->size_request
1419 if $self->{close_button};
1420
1421 my ($w, $h) = $self->SUPER::size_request;
1422
1423 (
1424 $w + $self->border * 2,
1425 $h + $self->border * 2,
1426 )
1427}
1428
1429sub invoke_size_allocate {
1430 my ($self, $w, $h) = @_;
1431
1432 if ($self->{title_widget}) {
1433 $self->{title_widget}{w} = $w;
1434 $self->{title_widget}{h} = $h;
1435 $self->{title_widget}->invoke_size_allocate ($w, $h);
1436 }
1437
1438 my $border = $self->border;
1439
1440 $h -= List::Util::max 0, $border * 2;
1441 $w -= List::Util::max 0, $border * 2;
1442
1443 $self->child->configure ($border, $border, $w, $h);
1444
1445 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1446 if $self->{close_button};
1447
1448 1
1449}
1450
1451sub invoke_delete {
1452 my ($self) = @_;
1453
1454 $self->hide;
1455
1456 1
1457}
1458
943sub button_down { 1459sub invoke_button_down {
944 my ($self, $ev, $x, $y) = @_; 1460 my ($self, $ev, $x, $y) = @_;
945 1461
946 my ($w, $h) = @$self{qw(w h)}; 1462 my ($w, $h) = @$self{qw(w h)};
947 my $border = $self->border; 1463 my $border = $self->border;
948 1464
… …
961 my ($ev, $x, $y) = @_; 1477 my ($ev, $x, $y) = @_;
962 1478
963 my $dx = $ev->{x} - $ox; 1479 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1480 my $dy = $ev->{y} - $oy;
965 1481
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1482 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1483 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1484
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1485 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1486 $self->realloc;
970 }; 1487 };
971 1488
972 } elsif ($lr ^ $td) { 1489 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1490 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1491 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1493 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1494 my ($ev, $x, $y) = @_;
978 1495
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1496 ($x, $y) = ($ev->{x}, $ev->{y});
980 1497
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1498 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1499 # HACK: the next line is required to enforce placement
1500 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1501 };
1502 } else {
1503 return 0;
1504 }
1505
984 } 1506 1
985} 1507}
986 1508
987sub button_up { 1509sub invoke_button_up {
988 my ($self, $ev, $x, $y) = @_; 1510 my ($self, $ev, $x, $y) = @_;
989 1511
990 delete $self->{motion}; 1512 ! ! delete $self->{motion}
991} 1513}
992 1514
993sub mouse_motion { 1515sub invoke_mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1516 my ($self, $ev, $x, $y) = @_;
995 1517
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1518 $self->{motion}->($ev, $x, $y) if $self->{motion};
1519
1520 ! ! $self->{motion}
1521}
1522
1523sub invoke_visibility_change {
1524 my ($self, $visible) = @_;
1525
1526 delete $self->{motion} unless $visible;
1527
1528 0
997} 1529}
998 1530
999sub _draw { 1531sub _draw {
1000 my ($self) = @_; 1532 my ($self) = @_;
1001 1533
1534 my $child = $self->{children}[0];
1535
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1536 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1537 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1538
1005 glEnable GL_TEXTURE_2D; 1539 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1540 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1541
1008 my $border = $self->border; 1542 my $border = $self->border;
1009 1543
1010 glColor @{ $self->{border_bg} }; 1544 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1545 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1546 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1547 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1548 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1549
1550 # move
1551 my $w2 = ($w - $border) * .5;
1552 my $h2 = ($h - $border) * .5;
1553 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1556
1557 # resize
1558 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1559 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1560 unless $self->{has_close_button};
1561 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1562 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1015 1563
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1564 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1565 glColor @{ $self->{bg} };
1018 1566
1019 # TODO: repeat texture not scale 1567 # TODO: repeat texture not scale
1568 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1569 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1570 $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); 1571 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1572 }
1030 1573
1031 glDisable GL_TEXTURE_2D; 1574 glDisable GL_TEXTURE_2D;
1032 1575
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1576 $child->draw;
1577
1578 if ($self->{title_widget}) {
1579 glTranslate 0, $border - $self->{h};
1580 $self->{title_widget}->_draw;
1581
1582 glTranslate 0, - ($border - $self->{h});
1583 }
1584
1585 $self->{close_button}->draw
1586 if $self->{close_button};
1036} 1587}
1037 1588
1038############################################################################# 1589#############################################################################
1039 1590
1040package CFClient::UI::Table; 1591package CFPlus::UI::Table;
1041 1592
1042our @ISA = CFClient::UI::Base::; 1593our @ISA = CFPlus::UI::Container::;
1043 1594
1044use List::Util qw(max sum); 1595use List::Util qw(max sum);
1045 1596
1046use CFClient::OpenGL; 1597use CFPlus::OpenGL;
1047 1598
1048sub new { 1599sub new {
1049 my $class = shift; 1600 my $class = shift;
1050 1601
1051 $class->SUPER::new ( 1602 $class->SUPER::new (
1052 col_expand => [], 1603 col_expand => [],
1604 row_expand => [],
1053 @_ 1605 @_,
1054 ) 1606 )
1055} 1607}
1056 1608
1057sub add { 1609sub 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) = @_; 1610 my ($self, @widgets) = @_;
1611
1612 for my $child (@widgets) {
1613 $child->{rowspan} ||= 1;
1614 $child->{colspan} ||= 1;
1615 }
1616
1617 $self->SUPER::add (@widgets);
1618}
1619
1620sub add_at {
1621 my $self = shift;
1622
1623 my @widgets;
1624
1625 while (@_) {
1626 my ($col, $row, $child) = splice @_, 0, 3, ();
1627
1628 $child->{row} = $row;
1629 $child->{col} = $col;
1630
1631 push @widgets, $child;
1632 }
1633
1634 $self->add (@widgets);
1635}
1636
1637sub get_wh {
1638 my ($self) = @_;
1639
1640 my (@w, @h);
1073 1641
1074 my @children = $self->children; 1642 my @children = $self->children;
1075 delete $self->{children}; 1643
1644 # first pass, columns
1645 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647
1648 my $sw = sum @w[$c .. $c + $cs - 1];
1649
1650 if ($w > $sw) {
1651 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1652 }
1076 1653 }
1077 for (@children) {
1078 delete $_->{parent};
1079 $_->hide;
1080 }
1081 1654
1082 $self->update; 1655 # second pass, rows
1083} 1656 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)}; 1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1098 1658
1099 $w[$x] = max $w[$x], $w; 1659 my $sh = sum @h[$r .. $r + $rs - 1];
1100 $h[$y] = max $h[$y], $h; 1660
1661 if ($h > $sh) {
1662 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1101 } 1663 }
1102 } 1664 }
1103 1665
1104 (\@w, \@h) 1666 (\@w, \@h)
1105} 1667}
… …
1113 (sum @$ws), 1675 (sum @$ws),
1114 (sum @$hs), 1676 (sum @$hs),
1115 ) 1677 )
1116} 1678}
1117 1679
1118sub size_allocate { 1680sub invoke_size_allocate {
1119 my ($self, $w, $h) = @_; 1681 my ($self, $w, $h) = @_;
1120 1682
1121 my ($ws, $hs) = $self->get_wh; 1683 my ($ws, $hs) = $self->get_wh;
1122 1684
1123 my $req_w = sum @$ws; 1685 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1686 my $req_h = (sum @$hs) || 1;
1125 1687
1126 # TODO: nicer code && do row_expand 1688 # now linearly scale the rows/columns to the allocated size
1127 my @col_expand = @{$self->{col_expand}}; 1689 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1690 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1691 my $col_expand = (sum @col_expand) || 1;
1130 1692
1131 # linearly scale sizes
1132 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1693 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1133 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1134 1694
1135 CFClient::UI::harmonize $ws; 1695 CFPlus::UI::harmonize $ws;
1696
1697 my @row_expand = @{$self->{row_expand}};
1698 @row_expand = (1) x @$ws unless @row_expand;
1699 my $row_expand = (sum @row_expand) || 1;
1700
1701 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1702
1136 CFClient::UI::harmonize $hs; 1703 CFPlus::UI::harmonize $hs;
1137 1704
1138 my $y; 1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1139 1707
1140 for my $r (0 .. $#{$self->{children}}) { 1708 for my $widget ($self->children) {
1141 my $row = $self->{children}[$r] 1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1142 or next;
1143 1710
1144 my $x = 0; 1711 $widget->configure (
1145 my $row_h = $hs->[$r]; 1712 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1146 1714 );
1147 for my $c (0 .. $#$row) { 1715 }
1148 my $col_w = $ws->[$c];
1149 1716
1150 if (my $widget = $row->[$c]) { 1717 1
1151 $widget->configure ($x, $y, $col_w, $row_h); 1718}
1152 }
1153 1719
1154 $x += $col_w; 1720#############################################################################
1721
1722package CFPlus::UI::Fixed;
1723
1724use List::Util qw(min max);
1725
1726our @ISA = CFPlus::UI::Container::;
1727
1728sub add {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child);
1733}
1734
1735sub _scale($$$) {
1736 my ($mode, $val, $max) = @_;
1737
1738 $mode eq "abs" ? $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741}
1742
1743sub size_request {
1744 my ($self) = @_;
1745
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747
1748 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) {
1750 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1751
1752 if ($pos eq "abs") {
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1155 } 1758 }
1156
1157 $y += $row_h;
1158 } 1759 }
1159 1760
1160} 1761 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1;
1161 1763
1162sub find_widget { 1764 # now layout remaining widgets
1765 for my $child ($self->visible_children) {
1766 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1767
1768 if ($pos ne "abs") {
1769 $x = _scale $pos, $x, $W;
1770 $y = _scale $pos, $x, $H;
1771 $w = _scale $size, $w, $child->{req_w};
1772 $h = _scale $size, $h, $child->{req_h};
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1776 }
1777 }
1778
1779 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1;
1781
1782 ($W, $H)
1783}
1784
1785sub invoke_size_allocate {
1163 my ($self, $x, $y) = @_; 1786 my ($self, $W, $H) = @_;
1164 1787
1165 $x -= $self->{x}; 1788 for my $child ($self->visible_children) {
1166 $y -= $self->{y}; 1789 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1167 1790
1168 my $res; 1791 $x = _scale $pos, $x, $W;
1792 $y = _scale $pos, $x, $H;
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1169 1795
1170 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1796 $child->configure ($x, $y, $w, $h);
1171 $res = $_->find_widget ($x, $y) 1797 }
1172 and return $res; 1798
1173 } 1799 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} 1800}
1185 1801
1186############################################################################# 1802#############################################################################
1187 1803
1188package CFClient::UI::HBox; 1804package CFPlus::UI::Box;
1189 1805
1190# TODO: wrap into common Box base class
1191
1192our @ISA = CFClient::UI::Container::; 1806our @ISA = CFPlus::UI::Container::;
1193 1807
1194sub size_request { 1808sub size_request {
1195 my ($self) = @_; 1809 my ($self) = @_;
1196 1810
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1811 $self->{vertical}
1812 ? (
1813 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1814 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1815 )
1816 : (
1817 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1818 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1819 )
1820}
1198 1821
1822sub invoke_size_allocate {
1823 my ($self, $w, $h) = @_;
1824
1825 my $space = $self->{vertical} ? $h : $w;
1826 my @children = $self->visible_children;
1827
1828 my @req;
1829
1830 if ($self->{homogeneous}) {
1831 @req = ($space / (@children || 1)) x @children;
1832 } else {
1833 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1834 my $req = List::Util::sum @req;
1835
1836 if ($req > $space) {
1837 # ah well, not enough space
1838 $_ *= $space / $req for @req;
1839 } else {
1840 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1841
1842 $space = ($space - $req) / $expand; # remaining space to give away
1843
1844 $req[$_] += $space * $children[$_]{expand}
1845 for 0 .. $#children;
1846 }
1199 ( 1847 }
1200 (List::Util::sum map $_->[0], @alloc), 1848
1201 (List::Util::max map $_->[1], @alloc), 1849 CFPlus::UI::harmonize \@req;
1850
1851 my $pos = 0;
1852 for (0 .. $#children) {
1853 my $alloc = $req[$_];
1854 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1855
1856 $pos += $alloc;
1857 }
1858
1859 1
1860}
1861
1862#############################################################################
1863
1864package CFPlus::UI::HBox;
1865
1866our @ISA = CFPlus::UI::Box::;
1867
1868sub new {
1869 my $class = shift;
1870
1871 $class->SUPER::new (
1872 vertical => 0,
1873 @_,
1202 ) 1874 )
1203} 1875}
1204 1876
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############################################################################# 1877#############################################################################
1247 1878
1248package CFClient::UI::VBox; 1879package CFPlus::UI::VBox;
1249 1880
1250# TODO: wrap into common Box base class 1881our @ISA = CFPlus::UI::Box::;
1251 1882
1252our @ISA = CFClient::UI::Container::; 1883sub new {
1884 my $class = shift;
1253 1885
1254sub size_request { 1886 $class->SUPER::new (
1255 my ($self) = @_; 1887 vertical => 1,
1256 1888 @_,
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 ) 1889 )
1263} 1890}
1264 1891
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############################################################################# 1892#############################################################################
1305 1893
1306package CFClient::UI::Label; 1894package CFPlus::UI::Label;
1307 1895
1308our @ISA = CFClient::UI::DrawBG::; 1896our @ISA = CFPlus::UI::DrawBG::;
1309 1897
1310use CFClient::OpenGL; 1898use CFPlus::OpenGL;
1311 1899
1312sub new { 1900sub new {
1313 my ($class, %arg) = @_; 1901 my ($class, %arg) = @_;
1314 1902
1315 my $self = $class->SUPER::new ( 1903 my $self = $class->SUPER::new (
… …
1318 #active_bg => none 1906 #active_bg => none
1319 #font => default_font 1907 #font => default_font
1320 #text => initial text 1908 #text => initial text
1321 #markup => initial narkup 1909 #markup => initial narkup
1322 #max_w => maximum pixel width 1910 #max_w => maximum pixel width
1911 #style => 0, # render flags
1323 ellipsise => 3, # end 1912 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1913 layout => (new CFPlus::Layout),
1325 fontsize => 1, 1914 fontsize => 1,
1326 align => -1, 1915 align => -1,
1327 valign => -1, 1916 valign => -1,
1328 padding => 2, 1917 padding_x => 2,
1918 padding_y => 2,
1329 can_events => 0, 1919 can_events => 0,
1330 %arg 1920 %arg
1331 ); 1921 );
1332 1922
1333 if (exists $self->{template}) { 1923 if (exists $self->{template}) {
1334 my $layout = new CFClient::Layout; 1924 my $layout = new CFPlus::Layout;
1335 $layout->set_text (delete $self->{template}); 1925 $layout->set_text (delete $self->{template});
1336 $self->{template} = $layout; 1926 $self->{template} = $layout;
1337 } 1927 }
1338 1928
1339 if (exists $self->{markup}) { 1929 if (exists $self->{markup}) {
… …
1343 } 1933 }
1344 1934
1345 $self 1935 $self
1346} 1936}
1347 1937
1348sub escape($) {
1349 local $_ = $_[0];
1350
1351 s/&/&amp;/g;
1352 s/>/&gt;/g;
1353 s/</&lt;/g;
1354
1355 $_
1356}
1357
1358sub update { 1938sub update {
1359 my ($self) = @_; 1939 my ($self) = @_;
1360 1940
1361 delete $self->{texture}; 1941 delete $self->{texture};
1362 $self->SUPER::update; 1942 $self->SUPER::update;
1363} 1943}
1364 1944
1945sub realloc {
1946 my ($self) = @_;
1947
1948 delete $self->{ox};
1949 $self->SUPER::realloc;
1950}
1951
1365sub set_text { 1952sub set_text {
1366 my ($self, $text) = @_; 1953 my ($self, $text) = @_;
1367 1954
1368 return if $self->{text} eq "T$text"; 1955 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text"; 1956 $self->{text} = "T$text";
1370 1957
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1958 $self->{layout}->set_text ($text);
1373 1959
1960 delete $self->{size_req};
1961 $self->realloc;
1374 $self->update; 1962 $self->update;
1375 $self->check_size;
1376} 1963}
1377 1964
1378sub set_markup { 1965sub set_markup {
1379 my ($self, $markup) = @_; 1966 my ($self, $markup) = @_;
1380 1967
1381 return if $self->{text} eq "M$markup"; 1968 return if $self->{text} eq "M$markup";
1382 $self->{text} = "M$markup"; 1969 $self->{text} = "M$markup";
1383 1970
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1971 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1972
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387 $self->{layout}->set_markup ($markup); 1973 $self->{layout}->set_markup ($markup);
1388 1974
1975 delete $self->{size_req};
1976 $self->realloc;
1389 $self->update; 1977 $self->update;
1390 $self->check_size;
1391} 1978}
1392 1979
1393sub size_request { 1980sub size_request {
1394 my ($self) = @_; 1981 my ($self) = @_;
1395 1982
1983 $self->{size_req} ||= do {
1396 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1984 $self->{layout}->set_font ($self->{font}) if $self->{font};
1397 $self->{layout}->set_width ($self->{max_w} || -1); 1985 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1986 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1987 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1988 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1989
1402 my ($w, $h) = $self->{layout}->size; 1990 my ($w, $h) = $self->{layout}->size;
1403 1991
1404 if (exists $self->{template}) { 1992 if (exists $self->{template}) {
1405 $self->{template}->set_font ($self->{font}) if $self->{font}; 1993 $self->{template}->set_font ($self->{font}) if $self->{font};
1994 $self->{template}->set_width ($self->{max_w} || -1);
1406 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1995 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1407 1996
1408 my ($w2, $h2) = $self->{template}->size; 1997 my ($w2, $h2) = $self->{template}->size;
1409 1998
1410 $w = List::Util::max $w, $w2; 1999 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 2000 $h = List::Util::max $h, $h2;
2001 }
2002
2003 [$w, $h]
1412 } 2004 };
1413 2005
1414 ( 2006 @{ $self->{size_req} }
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 2007}
1419 2008
2009sub baseline_shift {
2010 $_[0]{layout}->descent
2011}
2012
1420sub size_allocate { 2013sub invoke_size_allocate {
1421 my ($self, $w, $h) = @_; 2014 my ($self, $w, $h) = @_;
1422 2015
2016 delete $self->{ox};
2017
1423 delete $self->{texture}; 2018 delete $self->{texture}
2019 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2020
2021 1
1424} 2022}
1425 2023
1426sub set_fontsize { 2024sub set_fontsize {
1427 my ($self, $fontsize) = @_; 2025 my ($self, $fontsize) = @_;
1428 2026
1429 $self->{fontsize} = $fontsize; 2027 $self->{fontsize} = $fontsize;
2028 delete $self->{size_req};
1430 delete $self->{texture}; 2029 delete $self->{texture};
1431 2030
1432 $self->update; 2031 $self->realloc;
1433 $self->check_size; 2032}
2033
2034sub reconfigure {
2035 my ($self) = @_;
2036
2037 delete $self->{size_req};
2038 delete $self->{texture};
2039
2040 $self->SUPER::reconfigure;
1434} 2041}
1435 2042
1436sub _draw { 2043sub _draw {
1437 my ($self) = @_; 2044 my ($self) = @_;
1438 2045
1439 $self->SUPER::_draw; # draw background, if applicable 2046 $self->SUPER::_draw; # draw background, if applicable
1440 2047
1441 my $tex = $self->{texture} ||= do { 2048 my $size = $self->{texture} ||= do {
1442 $self->{layout}->set_foreground (@{$self->{fg}}); 2049 $self->{layout}->set_foreground (@{$self->{fg}});
1443 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2050 $self->{layout}->set_font ($self->{font}) if $self->{font};
1444 $self->{layout}->set_width ($self->{w}); 2051 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2052 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2053 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2054 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 2055
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2056 [$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 }; 2057 };
1461 2058
1462 glEnable GL_TEXTURE_2D; 2059 unless (exists $self->{ox}) {
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2060 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2061 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2062 : ($self->{w} - $size->[0]) * 0.5);
1464 2063
1465 if ($tex->{format} == GL_ALPHA) { 2064 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1466 glColor @{$self->{fg}}; 2065 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2066 : ($self->{h} - $size->[1]) * 0.5);
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 } 2067 };
1471 2068
1472 glDisable GL_TEXTURE_2D; 2069 my $w = List::Util::min $self->{w} + 4, $size->[0];
2070 my $h = List::Util::min $self->{h} + 2, $size->[1];
2071
2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1473} 2073}
1474 2074
1475############################################################################# 2075#############################################################################
1476 2076
1477package CFClient::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1478 2078
1479our @ISA = CFClient::UI::Label::; 2079our @ISA = CFPlus::UI::Label::;
1480 2080
1481use CFClient::OpenGL; 2081use CFPlus::OpenGL;
1482 2082
1483sub new { 2083sub new {
1484 my $class = shift; 2084 my $class = shift;
1485 2085
1486 $class->SUPER::new ( 2086 $class->SUPER::new (
… …
1490 active_fg => [0, 0, 0], 2090 active_fg => [0, 0, 0],
1491 can_hover => 1, 2091 can_hover => 1,
1492 can_focus => 1, 2092 can_focus => 1,
1493 valign => 0, 2093 valign => 0,
1494 can_events => 1, 2094 can_events => 1,
2095 ellipsise => 0,
1495 #text => ... 2096 #text => ...
2097 #hidden => "*",
1496 @_ 2098 @_
1497 ) 2099 )
1498} 2100}
1499 2101
1500sub _set_text { 2102sub _set_text {
… …
1502 2104
1503 delete $self->{cur_h}; 2105 delete $self->{cur_h};
1504 2106
1505 return if $self->{text} eq $text; 2107 return if $self->{text} eq $text;
1506 2108
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 2109 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 2110 $self->{text} = $text;
1511 2111
1512 $text =~ s/./*/g if $self->{hidden}; 2112 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 2113 $self->{layout}->set_text ("$text ");
2114 delete $self->{size_req};
1514 2115
1515 $self->emit (changed => $self->{text}); 2116 $self->emit (changed => $self->{text});
2117
2118 $self->realloc;
2119 $self->update;
1516} 2120}
1517 2121
1518sub set_text { 2122sub set_text {
1519 my ($self, $text) = @_; 2123 my ($self, $text) = @_;
1520 2124
1521 $self->{cursor} = length $text; 2125 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 2126 $self->_set_text ($text);
1523 $self->update;
1524 $self->check_size;
1525} 2127}
1526 2128
1527sub get_text { 2129sub get_text {
1528 $_[0]{text} 2130 $_[0]{text}
1529} 2131}
… …
1534 my ($w, $h) = $self->SUPER::size_request; 2136 my ($w, $h) = $self->SUPER::size_request;
1535 2137
1536 ($w + 1, $h) # add 1 for cursor 2138 ($w + 1, $h) # add 1 for cursor
1537} 2139}
1538 2140
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 { 2141sub invoke_key_down {
1546 my ($self, $ev) = @_; 2142 my ($self, $ev) = @_;
1547 2143
1548 my $mod = $ev->{mod}; 2144 my $mod = $ev->{mod};
1549 my $sym = $ev->{sym}; 2145 my $sym = $ev->{sym};
1550 my $uni = $ev->{unicode}; 2146 my $uni = $ev->{unicode};
1551 2147
1552 my $text = $self->get_text; 2148 my $text = $self->get_text;
2149
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1553 2151
1554 if ($uni == 8) { 2152 if ($uni == 8) {
1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1556 } elsif ($uni == 127) { 2154 } elsif ($uni == 127) {
1557 substr $text, $self->{cursor}, 1, ""; 2155 substr $text, $self->{cursor}, 1, "";
1558 } elsif ($sym == CFClient::SDLK_LEFT) { 2156 } elsif ($sym == CFPlus::SDLK_LEFT) {
1559 --$self->{cursor} if $self->{cursor}; 2157 --$self->{cursor} if $self->{cursor};
1560 } elsif ($sym == CFClient::SDLK_RIGHT) { 2158 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1561 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2159 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1562 } elsif ($sym == CFClient::SDLK_HOME) { 2160 } elsif ($sym == CFPlus::SDLK_HOME) {
2161 # what a hack
2162 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1
2165 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) {
2167 # uh, again
2168 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1
2171 : length $self->{text};
2172 } elsif ($uni == 21) { # ctrl-u
2173 $text = "";
1563 $self->{cursor} = 0; 2174 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 2175 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 2176 $self->emit ('escape');
1568 } elsif ($uni) { 2177 } elsif ($uni == 0x0d) {
2178 substr $text, $self->{cursor}++, 0, "\012";
2179 } elsif ($uni >= 0x20) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 2180 substr $text, $self->{cursor}++, 0, chr $uni;
2181 } else {
2182 return 0;
1570 } 2183 }
1571 2184
1572 $self->_set_text ($text); 2185 $self->_set_text ($text);
2186
2187 $self->realloc;
1573 $self->update; 2188 $self->update;
1574 $self->check_size;
1575}
1576 2189
2190 1
2191}
2192
1577sub focus_in { 2193sub invoke_focus_in {
1578 my ($self) = @_; 2194 my ($self) = @_;
1579 2195
1580 $self->{last_activity} = $::NOW; 2196 $self->{last_activity} = $::NOW;
1581 2197
1582 $self->SUPER::focus_in; 2198 $self->SUPER::invoke_focus_in
1583} 2199}
1584 2200
1585sub button_down { 2201sub invoke_button_down {
1586 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
1587 2203
1588 $self->SUPER::button_down ($ev, $x, $y); 2204 $self->SUPER::invoke_button_down ($ev, $x, $y);
1589 2205
1590 my $idx = $self->{layout}->xy_to_index ($x, $y); 2206 my $idx = $self->{layout}->xy_to_index ($x, $y);
1591 2207
1592 # byte-index to char-index 2208 # byte-index to char-index
1593 my $text = $self->{text}; 2209 my $text = $self->{text};
1594 utf8::encode $text; 2210 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 2211 $self->{cursor} = length $text;
1596 2212
1597 $self->_set_text ($self->{text}); 2213 $self->_set_text ($self->{text});
1598 $self->update; 2214 $self->update;
2215
2216 1
1599} 2217}
1600 2218
1601sub mouse_motion { 2219sub invoke_mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 2220 my ($self, $ev, $x, $y) = @_;
1603# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2221# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2222
2223 1
1604} 2224}
1605 2225
1606sub _draw { 2226sub _draw {
1607 my ($self) = @_; 2227 my ($self) = @_;
1608 2228
1609 local $self->{fg} = $self->{fg}; 2229 local $self->{fg} = $self->{fg};
1610 2230
1611 if ($FOCUS == $self) { 2231 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 2232 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 2233 $self->{fg} = $self->{active_fg};
1614 } else { 2234 } else {
1615 glColor @{$self->{bg}}; 2235 glColor_premultiply @{$self->{bg}};
1616 } 2236 }
1617 2237
1618 glEnable GL_BLEND; 2238 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 2240 glBegin GL_QUADS;
1621 glVertex 0 , 0; 2241 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 2242 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 2243 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 2244 glVertex $self->{w}, 0;
… …
1635 utf8::encode $text; 2255 utf8::encode $text;
1636 2256
1637 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1638 } 2258 }
1639 2259
1640 glColor @{$self->{fg}};
1641 glBegin GL_LINES; 2260 glBegin GL_LINES;
1642 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2261 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}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1644 glEnd; 2263 glEnd;
1645 } 2264 }
1646} 2265}
1647 2266
2267#############################################################################
2268
1648package CFClient::UI::Entry; 2269package CFPlus::UI::Entry;
1649 2270
1650our @ISA = CFClient::UI::EntryBase::; 2271our @ISA = CFPlus::UI::EntryBase::;
1651 2272
1652use CFClient::OpenGL; 2273use CFPlus::OpenGL;
1653 2274
1654sub key_down { 2275sub invoke_key_down {
1655 my ($self, $ev) = @_; 2276 my ($self, $ev) = @_;
1656 2277
1657 my $sym = $ev->{sym}; 2278 my $sym = $ev->{sym};
1658 2279
1659 if ($sym == 13) { 2280 if ($ev->{uni} == 0x0d || $sym == 13) {
1660 unshift @{$self->{history}}, 2281 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 2282 my $txt = $self->get_text;
2283
1662 $self->{history_pointer} = -1; 2284 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 2285 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 2286 $self->emit (activate => $txt);
1665 $self->update; 2287 $self->update;
1666 2288
1667 } elsif ($sym == CFClient::SDLK_UP) { 2289 } elsif ($sym == CFPlus::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 2290 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 2291 $self->{history_saveback} = $self->get_text;
1670 } 2292 }
1671 if (@{$self->{history} || []} > 0) { 2293 if (@{$self->{history} || []} > 0) {
1672 $self->{history_pointer}++; 2294 $self->{history_pointer}++;
… …
1674 $self->{history_pointer} = @{$self->{history} || []} - 1; 2296 $self->{history_pointer} = @{$self->{history} || []} - 1;
1675 } 2297 }
1676 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2298 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1677 } 2299 }
1678 2300
1679 } elsif ($sym == CFClient::SDLK_DOWN) { 2301 } elsif ($sym == CFPlus::SDLK_DOWN) {
1680 $self->{history_pointer}--; 2302 $self->{history_pointer}--;
1681 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2303 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1682 2304
1683 if ($self->{history_pointer} >= 0) { 2305 if ($self->{history_pointer} >= 0) {
1684 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2306 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1685 } else { 2307 } else {
1686 $self->set_text ($self->{history_saveback}); 2308 $self->set_text ($self->{history_saveback});
1687 } 2309 }
1688 2310
1689 } else { 2311 } else {
1690 $self->SUPER::key_down ($ev); 2312 return $self->SUPER::invoke_key_down ($ev)
2313 }
2314
1691 } 2315 1
1692
1693} 2316}
1694 2317
1695############################################################################# 2318#############################################################################
1696 2319
2320package CFPlus::UI::TextEdit;
2321
2322our @ISA = CFPlus::UI::EntryBase::;
2323
2324use CFPlus::OpenGL;
2325
2326sub move_cursor_ver {
2327 my ($self, $dy) = @_;
2328
2329 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2330
2331 $y += $dy;
2332
2333 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2334 $self->{cursor} = $index;
2335 delete $self->{cur_h};
2336 $self->update;
2337 return;
2338 }
2339}
2340
2341sub invoke_key_down {
2342 my ($self, $ev) = @_;
2343
2344 my $sym = $ev->{sym};
2345
2346 if ($sym == CFPlus::SDLK_UP) {
2347 $self->move_cursor_ver (-1);
2348 } elsif ($sym == CFPlus::SDLK_DOWN) {
2349 $self->move_cursor_ver (+1);
2350 } else {
2351 return $self->SUPER::invoke_key_down ($ev)
2352 }
2353
2354 1
2355}
2356
2357#############################################################################
2358
1697package CFClient::UI::Button; 2359package CFPlus::UI::Button;
1698 2360
1699our @ISA = CFClient::UI::Label::; 2361our @ISA = CFPlus::UI::Label::;
1700 2362
1701use CFClient::OpenGL; 2363use CFPlus::OpenGL;
1702 2364
1703my @tex = 2365my @tex =
1704 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2366 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1705 qw(b1_button_active.png); 2367 qw(b1_button_inactive.png b1_button_active.png);
1706 2368
1707sub new { 2369sub new {
1708 my $class = shift; 2370 my $class = shift;
1709 2371
1710 $class->SUPER::new ( 2372 $class->SUPER::new (
1711 padding => 4, 2373 padding_x => 4,
2374 padding_y => 4,
1712 fg => [1, 1, 1], 2375 fg => [1.0, 1.0, 1.0],
1713 active_fg => [0, 0, 1], 2376 active_fg => [0.8, 0.8, 0.8],
1714 can_hover => 1, 2377 can_hover => 1,
1715 align => 0, 2378 align => 0,
1716 valign => 0, 2379 valign => 0,
1717 can_events => 1, 2380 can_events => 1,
1718 @_ 2381 @_
1719 ) 2382 )
1720} 2383}
1721 2384
1722sub button_up { 2385sub invoke_button_up {
1723 my ($self, $ev, $x, $y) = @_; 2386 my ($self, $ev, $x, $y) = @_;
1724 2387
2388 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 2389 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 2390 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 2391
1728 } 2392 1
1729} 2393}
1730 2394
1731sub _draw { 2395sub _draw {
1732 my ($self) = @_; 2396 my ($self) = @_;
1733 2397
1734 local $self->{fg} = $self->{fg}; 2398 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736 if ($GRAB == $self) {
1737 $self->{fg} = $self->{active_fg};
1738 }
1739 2399
1740 glEnable GL_TEXTURE_2D; 2400 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 glColor 0, 0, 0, 1; 2402 glColor 0, 0, 0, 1;
1743 2403
2404 my $tex = $tex[$GRAB == $self];
1744 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2405 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1745 2406
1746 glDisable GL_TEXTURE_2D; 2407 glDisable GL_TEXTURE_2D;
1747 2408
1748 $self->SUPER::_draw; 2409 $self->SUPER::_draw;
1749} 2410}
1750 2411
1751############################################################################# 2412#############################################################################
1752 2413
1753package CFClient::UI::CheckBox; 2414package CFPlus::UI::CheckBox;
1754 2415
1755our @ISA = CFClient::UI::DrawBG::; 2416our @ISA = CFPlus::UI::DrawBG::;
1756 2417
1757my @tex = 2418my @tex =
1758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2419 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1759 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2420 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1760 2421
1761use CFClient::OpenGL; 2422use CFPlus::OpenGL;
1762 2423
1763sub new { 2424sub new {
1764 my $class = shift; 2425 my $class = shift;
1765 2426
1766 $class->SUPER::new ( 2427 $class->SUPER::new (
1767 padding => 2, 2428 padding_x => 2,
2429 padding_y => 2,
1768 fg => [1, 1, 1], 2430 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 2431 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 2432 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 2433 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 2434 state => 0,
… …
1776} 2438}
1777 2439
1778sub size_request { 2440sub size_request {
1779 my ($self) = @_; 2441 my ($self) = @_;
1780 2442
1781 ($self->{padding} * 2 + 6) x 2 2443 (6) x 2
1782} 2444}
1783 2445
2446sub toggle {
2447 my ($self) = @_;
2448
2449 $self->{state} = !$self->{state};
2450 $self->emit (changed => $self->{state});
2451 $self->update;
2452}
2453
1784sub button_down { 2454sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 2455 my ($self, $ev, $x, $y) = @_;
1786 2456
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2457 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2458 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 2459 $self->toggle;
1790 $self->emit (changed => $self->{state}); 2460 } else {
2461 return 0
2462 }
2463
1791 } 2464 1
1792} 2465}
1793 2466
1794sub _draw { 2467sub _draw {
1795 my ($self) = @_; 2468 my ($self) = @_;
1796 2469
1797 $self->SUPER::_draw; 2470 $self->SUPER::_draw;
1798 2471
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2472 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 2473
1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2474 my ($w, $h) = @$self{qw(w h)};
2475
2476 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802 2477
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2478 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 2479
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2480 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 2481
… …
1809 glDisable GL_TEXTURE_2D; 2484 glDisable GL_TEXTURE_2D;
1810} 2485}
1811 2486
1812############################################################################# 2487#############################################################################
1813 2488
1814package CFClient::UI::Image; 2489package CFPlus::UI::Image;
1815 2490
1816our @ISA = CFClient::UI::Base::; 2491our @ISA = CFPlus::UI::Base::;
1817 2492
1818use CFClient::OpenGL; 2493use CFPlus::OpenGL;
1819use Carp qw/confess/;
1820 2494
1821our %loaded_images; 2495our %texture_cache;
1822 2496
1823sub new { 2497sub new {
1824 my $class = shift; 2498 my $class = shift;
1825 2499
1826 my $self = $class->SUPER::new (can_events => 0, @_); 2500 my $self = $class->SUPER::new (
2501 can_events => 0,
2502 @_,
2503 );
1827 2504
1828 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2505 $self->{path} || $self->{tex}
2506 or Carp::croak "'path' or 'tex' attributes required";
1829 2507
1830 $loaded_images{$self->{image}} ||= 2508 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1831 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2509 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1832 2510
1833 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2511 CFPlus::weaken $texture_cache{$self->{path}};
1834 2512
1835 Scalar::Util::weaken $loaded_images{$self->{image}}; 2513 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1836
1837 $self->{aspect} = $tex->{w} / $tex->{h};
1838 2514
1839 $self 2515 $self
1840} 2516}
1841 2517
2518sub STORABLE_freeze {
2519 my ($self, $cloning) = @_;
2520
2521 $self->{path}
2522 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2523
2524 $self->{path}
2525}
2526
2527sub STORABLE_attach {
2528 my ($self, $cloning, $path) = @_;
2529
2530 $self->new (path => $path)
2531}
2532
1842sub size_request { 2533sub size_request {
1843 my ($self) = @_; 2534 my ($self) = @_;
1844 2535
1845 ($self->{tex}->{w}, $self->{tex}->{h}) 2536 ($self->{tex}{w}, $self->{tex}{h})
1846} 2537}
1847 2538
1848sub _draw { 2539sub _draw {
1849 my ($self) = @_; 2540 my ($self) = @_;
1850 2541
… …
1860 } 2551 }
1861 2552
1862 glEnable GL_TEXTURE_2D; 2553 glEnable GL_TEXTURE_2D;
1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1864 2555
1865 $tex->draw_quad_alpha (0, 0, $w, $h); 2556 $tex->draw_quad (0, 0, $w, $h);
1866 2557
1867 glDisable GL_TEXTURE_2D; 2558 glDisable GL_TEXTURE_2D;
1868} 2559}
1869 2560
1870############################################################################# 2561#############################################################################
1871 2562
2563package CFPlus::UI::ImageButton;
2564
2565our @ISA = CFPlus::UI::Image::;
2566
2567use CFPlus::OpenGL;
2568
2569my %textures;
2570
2571sub new {
2572 my $class = shift;
2573
2574 my $self = $class->SUPER::new (
2575 padding_x => 4,
2576 padding_y => 4,
2577 fg => [1, 1, 1],
2578 active_fg => [0, 0, 1],
2579 can_hover => 1,
2580 align => 0,
2581 valign => 0,
2582 can_events => 1,
2583 @_
2584 );
2585}
2586
2587sub invoke_button_up {
2588 my ($self, $ev, $x, $y) = @_;
2589
2590 $self->emit ("activate")
2591 if $x >= 0 && $x < $self->{w}
2592 && $y >= 0 && $y < $self->{h};
2593
2594 1
2595}
2596
2597#############################################################################
2598
1872package CFClient::UI::VGauge; 2599package CFPlus::UI::VGauge;
1873 2600
1874our @ISA = CFClient::UI::Base::; 2601our @ISA = CFPlus::UI::Base::;
1875 2602
1876use List::Util qw(min max); 2603use List::Util qw(min max);
1877 2604
1878use CFClient::OpenGL; 2605use CFPlus::OpenGL;
1879 2606
1880my %tex = ( 2607my %tex = (
1881 food => [ 2608 food => [
1882 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1883 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1884 ], 2611 ],
1885 grace => [ 2612 grace => [
1886 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2613 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/ 2614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1888 ], 2615 ],
1889 hp => [ 2616 hp => [
1890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2617 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1891 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1892 ], 2619 ],
1893 mana => [ 2620 mana => [
1894 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 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/ 2622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1896 ], 2623 ],
1897); 2624);
1898 2625
1899# eg. VGauge->new (gauge => 'food'), default gauge: food 2626# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1959 my $ycut1 = max 0, min 1, $ycut; 2686 my $ycut1 = max 0, min 1, $ycut;
1960 my $ycut2 = max 0, min 1, $ycut - 1; 2687 my $ycut2 = max 0, min 1, $ycut - 1;
1961 2688
1962 my $h1 = $self->{h} * (1 - $ycut1); 2689 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2); 2690 my $h2 = $self->{h} * (1 - $ycut2);
2691 my $h3 = $self->{h};
2692
2693 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1964 2694
1965 glEnable GL_BLEND; 2695 glEnable GL_BLEND;
1966 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2696 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2697 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1967 glEnable GL_TEXTURE_2D; 2698 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2700
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2701 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2702 glBegin GL_QUADS;
… …
1986 2717
1987 if ($t3) { 2718 if ($t3) {
1988 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2719 glBindTexture GL_TEXTURE_2D, $t3->{name};
1989 glBegin GL_QUADS; 2720 glBegin GL_QUADS;
1990 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2721 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1991 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2722 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1992 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2723 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1993 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2724 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1994 glEnd; 2725 glEnd;
1995 } 2726 }
1996 2727
1997 glDisable GL_BLEND; 2728 glDisable GL_BLEND;
1998 glDisable GL_TEXTURE_2D; 2729 glDisable GL_TEXTURE_2D;
1999} 2730}
2000 2731
2001############################################################################# 2732#############################################################################
2002 2733
2003package CFClient::UI::Gauge; 2734package CFPlus::UI::Gauge;
2004 2735
2005our @ISA = CFClient::UI::VBox::; 2736our @ISA = CFPlus::UI::VBox::;
2006 2737
2007sub new { 2738sub new {
2008 my ($class, %arg) = @_; 2739 my ($class, %arg) = @_;
2009 2740
2010 my $self = $class->SUPER::new ( 2741 my $self = $class->SUPER::new (
… …
2012 can_hover => 1, 2743 can_hover => 1,
2013 can_events => 1, 2744 can_events => 1,
2014 %arg, 2745 %arg,
2015 ); 2746 );
2016 2747
2017 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2748 $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); 2749 $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"); 2750 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2020 2751
2021 $self 2752 $self
2022} 2753}
2023 2754
2024sub set_fontsize { 2755sub set_fontsize {
… …
2045 $self->{value}->set_text ($val); 2776 $self->{value}->set_text ($val);
2046} 2777}
2047 2778
2048############################################################################# 2779#############################################################################
2049 2780
2050package CFClient::UI::Slider; 2781package CFPlus::UI::Slider;
2051 2782
2052use strict; 2783use strict;
2053 2784
2054use CFClient::OpenGL; 2785use CFPlus::OpenGL;
2055 2786
2056our @ISA = CFClient::UI::DrawBG::; 2787our @ISA = CFPlus::UI::DrawBG::;
2057 2788
2058my @tex = 2789my @tex =
2059 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2790 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2060 qw(s1_slider.png s1_slider_bg.png); 2791 qw(s1_slider.png s1_slider_bg.png);
2061 2792
2062sub new { 2793sub new {
2063 my $class = shift; 2794 my $class = shift;
2064 2795
… …
2071 fg => [1, 1, 1], 2802 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2803 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2804 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2805 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10, 0], 2806 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2807 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2808 min_h => $::WIDTH / 80,
2078 vertical => 0, 2809 vertical => 0,
2079 can_hover => 1, 2810 can_hover => 1,
2080 inner_pad => 0.02, 2811 inner_pad => 0.02,
2081 @_ 2812 @_
2082 ); 2813 );
… …
2088} 2819}
2089 2820
2090sub set_range { 2821sub set_range {
2091 my ($self, $range) = @_; 2822 my ($self, $range) = @_;
2092 2823
2093 $self->{range} = $range; 2824 ($range, $self->{range}) = ($self->{range}, $range);
2094 2825
2826 if ("@$range" ne "@{$self->{range}}") {
2095 $self->update; 2827 $self->update;
2828 $self->set_value ($self->{range}[0]);
2829 }
2096} 2830}
2097 2831
2098sub set_value { 2832sub set_value {
2099 my ($self, $value) = @_; 2833 my ($self, $value) = @_;
2100 2834
… …
2119} 2853}
2120 2854
2121sub size_request { 2855sub size_request {
2122 my ($self) = @_; 2856 my ($self) = @_;
2123 2857
2124 my $w = $self->{req_w}; 2858 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2859}
2129 2860
2130sub button_down { 2861sub invoke_button_down {
2131 my ($self, $ev, $x, $y) = @_; 2862 my ($self, $ev, $x, $y) = @_;
2132 2863
2133 $self->SUPER::button_down ($ev, $x, $y); 2864 $self->SUPER::invoke_button_down ($ev, $x, $y);
2134 2865
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2866 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136 2867
2137 $self->mouse_motion ($ev, $x, $y); 2868 $self->invoke_mouse_motion ($ev, $x, $y)
2138} 2869}
2139 2870
2140sub mouse_motion { 2871sub invoke_mouse_motion {
2141 my ($self, $ev, $x, $y) = @_; 2872 my ($self, $ev, $x, $y) = @_;
2142 2873
2143 if ($GRAB == $self) { 2874 if ($GRAB == $self) {
2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2875 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2145 2876
2146 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2877 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147 2878
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2879 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149 2880
2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2881 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2882 } else {
2883 return 0;
2884 }
2885
2151 } 2886 1
2887}
2888
2889sub invoke_mouse_wheel {
2890 my ($self, $ev) = @_;
2891
2892 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2893
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2895
2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2897
2898 ! ! $delta
2152} 2899}
2153 2900
2154sub update { 2901sub update {
2155 my ($self) = @_; 2902 my ($self) = @_;
2156 2903
2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2904 delete $self->{knob_w};
2905 $self->SUPER::update;
2906}
2907
2908sub _draw {
2909 my ($self) = @_;
2910
2911 unless ($self->{knob_w}) {
2158 $self->set_value ($self->{range}[0]); 2912 $self->set_value ($self->{range}[0]);
2159 2913
2160 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2914 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100; 2915 my $range = ($hi - $page - $lo) || 1e-100;
2162 2916
… …
2168 $value = ($value - $lo) / $range; 2922 $value = ($value - $lo) / $range;
2169 $value = $value * $self->{scale} + $self->{offset}; 2923 $value = $value * $self->{scale} + $self->{offset};
2170 2924
2171 $self->{knob_x} = $value - $knob_w * 0.5; 2925 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $knob_w; 2926 $self->{knob_w} = $knob_w;
2173 }); 2927 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2928
2181 $self->SUPER::_draw (); 2929 $self->SUPER::_draw ();
2182 2930
2183 glScale $self->{w}, $self->{h}; 2931 glScale $self->{w}, $self->{h};
2184 2932
… …
2204 glDisable GL_TEXTURE_2D; 2952 glDisable GL_TEXTURE_2D;
2205} 2953}
2206 2954
2207############################################################################# 2955#############################################################################
2208 2956
2209package CFClient::UI::ValSlider; 2957package CFPlus::UI::ValSlider;
2210 2958
2211our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2212 2960
2213sub new { 2961sub new {
2214 my ($class, %arg) = @_; 2962 my ($class, %arg) = @_;
2215 2963
2216 my $range = delete $arg{range}; 2964 my $range = delete $arg{range};
2217 2965
2218 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2967 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2968 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift }, 2969 to_value => sub { shift },
2222 from_value => sub { shift }, 2970 from_value => sub { shift },
2223 %arg, 2971 %arg,
2224 ); 2972 );
2225 2973
… …
2245sub set_range { shift->{slider}->set_range (@_) } 2993sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) } 2994sub set_value { shift->{slider}->set_value (@_) }
2247 2995
2248############################################################################# 2996#############################################################################
2249 2997
2250package CFClient::UI::TextView; 2998package CFPlus::UI::TextScroller;
2251 2999
2252our @ISA = CFClient::UI::HBox::; 3000our @ISA = CFPlus::UI::HBox::;
2253 3001
2254use CFClient::OpenGL; 3002use CFPlus::OpenGL;
2255 3003
2256sub new { 3004sub new {
2257 my $class = shift; 3005 my $class = shift;
2258 3006
2259 my $self = $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
2260 fontsize => 1, 3008 fontsize => 1,
2261 can_events => 0, 3009 can_events => 1,
3010 indent => 0,
2262 #font => default_font 3011 #font => default_font
2263 @_, 3012 @_,
2264 3013
2265 layout => (new CFClient::Layout 1), 3014 layout => (new CFPlus::Layout),
2266 par => [], 3015 par => [],
3016 max_par => 0,
2267 height => 0, 3017 height => 0,
2268 children => [ 3018 children => [
2269 (new CFClient::UI::Empty expand => 1), 3019 (new CFPlus::UI::Empty expand => 1),
2270 (new CFClient::UI::Slider vertical => 1), 3020 (new CFPlus::UI::Slider vertical => 1),
2271 ], 3021 ],
2272 ); 3022 );
2273 3023
2274 $self->{children}[1]->connect (changed => sub { $self->update }); 3024 $self->{children}[1]->connect (changed => sub { $self->update });
2275 3025
… …
2281 3031
2282 $self->{fontsize} = $fontsize; 3032 $self->{fontsize} = $fontsize;
2283 $self->reflow; 3033 $self->reflow;
2284} 3034}
2285 3035
3036sub size_request {
3037 my ($self) = @_;
3038
3039 my ($empty, $slider) = @{ $self->{children} };
3040
3041 local $self->{children} = [$empty, $slider];
3042 $self->SUPER::size_request
3043}
3044
2286sub size_allocate { 3045sub invoke_size_allocate {
2287 my ($self, $w, $h) = @_; 3046 my ($self, $w, $h) = @_;
2288 3047
2289 $self->SUPER::size_allocate ($w, $h); 3048 my ($empty, $slider, @other) = @{ $self->{children} };
3049 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2290 3050
2291 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3051 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3052 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 3053 $self->{layout}->set_width ($empty->{w});
3054 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2294 3055
2295 $self->reflow; 3056 $self->reflow;
2296}
2297 3057
2298sub text_size { 3058 local $self->{children} = [$empty, $slider];
3059 $self->SUPER::invoke_size_allocate ($w, $h)
3060}
3061
3062sub invoke_mouse_wheel {
2299 my ($self, $text, $indent) = @_; 3063 my ($self, $ev) = @_;
3064
3065 return 0 unless $ev->{dy}; # only vertical movements
3066
3067 $self->{children}[1]->emit (mouse_wheel => $ev);
3068
3069 1
3070}
3071
3072sub get_layout {
3073 my ($self, $para) = @_;
2300 3074
2301 my $layout = $self->{layout}; 3075 my $layout = $self->{layout};
2302 3076
3077 $layout->set_font ($self->{font}) if $self->{font};
3078 $layout->set_foreground (@{$para->{fg}});
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3079 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 3080 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3081 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2305 $layout->set_markup ($text); 3082 $layout->set_markup ($para->{markup});
3083
3084 $layout->set_shapes (
3085 map
3086 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3087 @{$para->{widget}}
2306 3088 );
3089
2307 $layout->size 3090 $layout
2308} 3091}
2309 3092
2310sub reflow { 3093sub reflow {
2311 my ($self) = @_; 3094 my ($self) = @_;
2312 3095
… …
2319 3102
2320 # todo: base offset on lines or so, not on pixels 3103 # todo: base offset on lines or so, not on pixels
2321 $self->{children}[1]->set_value ($offset); 3104 $self->{children}[1]->set_value ($offset);
2322} 3105}
2323 3106
3107sub current_paragraph {
3108 my ($self) = @_;
3109
3110 $self->{top_paragraph} - 1
3111}
3112
3113sub scroll_to {
3114 my ($self, $para) = @_;
3115
3116 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3117
3118 $self->{scroll_to} = $para;
3119 $self->update;
3120}
3121
2324sub clear { 3122sub clear {
2325 my ($self) = @_; 3123 my ($self) = @_;
3124
3125 my (undef, undef, @other) = @{ $self->{children} };
3126 $self->remove ($_) for @other;
2326 3127
2327 $self->{par} = []; 3128 $self->{par} = [];
2328 $self->{height} = 0; 3129 $self->{height} = 0;
2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3130 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2330} 3131}
2331 3132
2332sub add_paragraph { 3133sub add_paragraph {
2333 my ($self, $color, $text, $indent) = @_; 3134 my $self = shift;
2334 3135
2335 for my $line (split /\n/, $text) { 3136 for my $para (@_) {
2336 my ($w, $h) = $self->text_size ($line); 3137 $para = {
3138 fg => [1, 1, 1, 1],
3139 indent => 0,
3140 markup => "",
3141 widget => [],
3142 ref $para ? %$para : (markup => $para),
3143 w => 1e10,
3144 wrapped => 1,
3145 };
3146
3147 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3148 push @{$self->{par}}, $para;
3149 }
3150
3151 if (my $max = $self->{max_par}) {
3152 shift @{$self->{par}} while @{$self->{par}} > $max;
3153 }
3154
3155 $self->{need_reflow}++;
3156 $self->update;
3157}
3158
3159sub scroll_to_bottom {
3160 my ($self) = @_;
3161
3162 $self->{scroll_to} = $#{$self->{par}};
3163 $self->update;
3164}
3165
3166sub force_uptodate {
3167 my ($self) = @_;
3168
3169 if (delete $self->{need_reflow}) {
3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3171
3172 my $height = 0;
3173
3174 for my $para (@{$self->{par}}) {
3175 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3176 my $layout = $self->get_layout ($para);
3177 my ($w, $h) = $layout->size;
3178
3179 $para->{w} = $w + $para->{indent};
3180 $para->{h} = $h;
3181 $para->{wrapped} = $layout->has_wrapped;
3182 }
3183
3184 $para->{y} = $height;
3185 $height += $para->{h};
3186 }
3187
2337 $self->{height} += $h; 3188 $self->{height} = $height;
2338 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3189 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2339 }
2340 3190
2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3191 delete $self->{texture};
3192 }
3193
3194 if (my $paridx = delete $self->{scroll_to}) {
3195 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3196 }
2342} 3197}
2343 3198
2344sub update { 3199sub update {
2345 my ($self) = @_; 3200 my ($self) = @_;
2346 3201
… …
2348 3203
2349 return unless $self->{h} > 0; 3204 return unless $self->{h} > 0;
2350 3205
2351 delete $self->{texture}; 3206 delete $self->{texture};
2352 3207
2353 $ROOT->on_post_alloc ($self, sub { 3208 $ROOT->on_post_alloc ($self => sub {
3209 $self->force_uptodate;
3210
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3211 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355 3212
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 { 3213 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2383 glClearColor 0.5, 0.5, 0.5, 0; 3214 glClearColor 0, 0, 0, 0;
2384 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2385 3216
3217 package CFPlus::UI::Base;
3218 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3219 (0, 0, $self->{w}, $self->{h});
3220
3221 my $top = int $self->{children}[1]{range}[0];
3222
3223 my $paridx = 0;
3224 my $top_paragraph;
2386 my $top = int $self->{children}[1]{range}[0]; 3225 my $top = int $self->{children}[1]{range}[0];
2387 3226
2388 my $y0 = $top; 3227 my $y0 = $top;
2389 my $y1 = $top + $H; 3228 my $y1 = $top + $H;
2390 3229
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}}) { 3230 for my $para (@{$self->{par}}) {
2402 my $h = $par->[1]; 3231 my $h = $para->{h};
3232 my $y = $para->{y};
2403 3233
2404 if ($y0 < $y + $h && $y < $y1) { 3234 if ($y0 < $y + $h && $y < $y1) {
2405 $layout->set_foreground (@{ $par->[2] }); 3235 my $layout = $self->get_layout ($para);
2406 $layout->set_width ($W - $par->[3]);
2407 $layout->set_markup ($par->[4]);
2408 3236
2409 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3237 $layout->render ($para->{indent}, $y - $y0);
2410 3238
2411 glRasterPos $par->[3], $y - $y0; 3239 if (my @w = @{ $para->{widget} }) {
2412 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3240 my @s = $layout->get_shapes;
3241
3242 for (@w) {
3243 my ($dx, $dy) = splice @s, 0, 2, ();
3244
3245 $_->{x} = $dx + $para->{indent};
3246 $_->{y} = $dy + $y - $y0;
3247
3248 $_->draw;
3249 }
3250 }
2413 } 3251 }
2414 3252
2415 $y += $h; 3253 $paridx++;
3254 $top_paragraph ||= $paridx if $y >= $top;
2416 } 3255 }
2417 3256
2418 glDisable GL_BLEND; 3257 $self->{top_paragraph} = $top_paragraph;
2419 }; 3258 };
2420 }); 3259 });
2421} 3260}
2422 3261
3262sub reconfigure {
3263 my ($self) = @_;
3264
3265 $self->SUPER::reconfigure;
3266
3267 $_->{w} = 1e10 for @{ $self->{par} };
3268 $self->reflow;
3269}
3270
2423sub _draw { 3271sub _draw {
2424 my ($self) = @_; 3272 my ($self) = @_;
2425 3273
2426 glEnable GL_TEXTURE_2D; 3274 glEnable GL_TEXTURE_2D;
2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2428 glColor 1, 1, 1, 1; 3276 glColor 0, 0, 0, 1;
2429 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3277 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2430 glDisable GL_TEXTURE_2D; 3278 glDisable GL_TEXTURE_2D;
2431 3279
2432 $self->{children}[1]->draw; 3280 $self->{children}[1]->draw;
2433
2434} 3281}
2435 3282
2436############################################################################# 3283#############################################################################
2437 3284
2438package CFClient::UI::Animator; 3285package CFPlus::UI::Animator;
2439 3286
2440use CFClient::OpenGL; 3287use CFPlus::OpenGL;
2441 3288
2442our @ISA = CFClient::UI::Bin::; 3289our @ISA = CFPlus::UI::Bin::;
2443 3290
2444sub moveto { 3291sub moveto {
2445 my ($self, $x, $y) = @_; 3292 my ($self, $x, $y) = @_;
2446 3293
2447 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3294 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2475 glPopMatrix; 3322 glPopMatrix;
2476} 3323}
2477 3324
2478############################################################################# 3325#############################################################################
2479 3326
2480package CFClient::UI::Flopper; 3327package CFPlus::UI::Flopper;
2481 3328
2482our @ISA = CFClient::UI::Button::; 3329our @ISA = CFPlus::UI::Button::;
2483 3330
2484sub new { 3331sub new {
2485 my $class = shift; 3332 my $class = shift;
2486 3333
2487 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
2488 state => 0, 3335 state => 0,
2489 connect_activate => \&toggle_flopper, 3336 on_activate => \&toggle_flopper,
2490 @_ 3337 @_
2491 ); 3338 );
2492 3339
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 3340 $self
2499} 3341}
2500 3342
2501sub toggle_flopper { 3343sub toggle_flopper {
2502 my ($self) = @_; 3344 my ($self) = @_;
2503 3345
2504 # TODO: use animation 3346 $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} 3347}
2516 3348
2517############################################################################# 3349#############################################################################
2518 3350
2519package CFClient::UI::Tooltip; 3351package CFPlus::UI::Tooltip;
2520 3352
2521our @ISA = CFClient::UI::Bin::; 3353our @ISA = CFPlus::UI::Bin::;
2522 3354
2523use CFClient::OpenGL; 3355use CFPlus::OpenGL;
2524 3356
2525sub new { 3357sub new {
2526 my $class = shift; 3358 my $class = shift;
2527 3359
2528 $class->SUPER::new ( 3360 $class->SUPER::new (
… …
2532} 3364}
2533 3365
2534sub set_tooltip_from { 3366sub set_tooltip_from {
2535 my ($self, $widget) = @_; 3367 my ($self, $widget) = @_;
2536 3368
3369 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3370 if $widget->{tooltip} =~ /^#(.*)$/;
3371
3372 my $tooltip = $widget->{tooltip};
3373
3374 if ($ENV{CFPLUS_DEBUG} & 2) {
3375 $tooltip .= "\n\n" . (ref $widget) . "\n"
3376 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3377 . "req $widget->{req_w} $widget->{req_h}\n"
3378 . "visible $widget->{visible}";
3379 }
3380
3381 $tooltip =~ s/^\n+//;
3382 $tooltip =~ s/\n+$//;
3383
2537 $self->add (new CFClient::UI::Label 3384 $self->add (new CFPlus::UI::Label
2538 markup => $widget->{tooltip}, 3385 markup => $tooltip,
2539 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3386 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540 fontsize => 0.8, 3387 fontsize => 0.8,
2541 fg => [0, 0, 0, 1], 3388 style => 1, # FLAG_INVERSE
2542 ellipsise => 0, 3389 ellipsise => 0,
2543 font => ($widget->{tooltip_font} || $::FONT_PROP), 3390 font => ($widget->{tooltip_font} || $::FONT_PROP),
2544 ); 3391 );
2545} 3392}
2546 3393
… …
2550 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3397 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2551 3398
2552 ($w + 4, $h + 4) 3399 ($w + 4, $h + 4)
2553} 3400}
2554 3401
2555sub size_allocate { 3402sub invoke_size_allocate {
2556 my ($self, $w, $h) = @_; 3403 my ($self, $w, $h) = @_;
2557 3404
2558 $self->SUPER::size_allocate ($w - 4, $h - 4); 3405 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3406}
3407
3408sub invoke_visibility_change {
3409 my ($self, $visible) = @_;
3410
3411 return unless $visible;
3412
3413 $self->{root}->on_post_alloc ("move_$self" => sub {
3414 my $widget = $self->{owner}
3415 or return;
3416
3417 if ($widget->{visible}) {
3418 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3419
3420 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3421 if $x + $self->{w} > $self->{root}{w};
3422
3423 $self->move_abs ($x, $y);
3424 } else {
3425 $self->hide;
3426 }
3427 });
2559} 3428}
2560 3429
2561sub _draw { 3430sub _draw {
2562 my ($self) = @_; 3431 my ($self) = @_;
2563 3432
… …
2580 glVertex $w, $h; 3449 glVertex $w, $h;
2581 glVertex $w, 0; 3450 glVertex $w, 0;
2582 glEnd; 3451 glEnd;
2583 3452
2584 glTranslate 2 - 0.375, 2 - 0.375; 3453 glTranslate 2 - 0.375, 2 - 0.375;
3454
2585 $self->SUPER::_draw; 3455 $self->SUPER::_draw;
2586} 3456}
2587 3457
2588############################################################################# 3458#############################################################################
2589 3459
2590package CFClient::UI::Face; 3460package CFPlus::UI::Face;
2591 3461
2592our @ISA = CFClient::UI::Base::; 3462our @ISA = CFPlus::UI::DrawBG::;
2593 3463
2594use CFClient::OpenGL; 3464use CFPlus::OpenGL;
2595 3465
2596sub new { 3466sub new {
2597 my $class = shift; 3467 my $class = shift;
2598 3468
2599 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3470 size_w => 32,
3471 size_h => 8,
2600 aspect => 1, 3472 aspect => 1,
3473 can_events => 0,
2601 @_, 3474 @_,
2602 ); 3475 );
2603 3476
2604 if ($self->{anim} && $self->{animspeed}) { 3477 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 3478 CFPlus::weaken (my $widget = $self);
2606 3479
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2607 $self->{timer} = Event->timer ( 3482 $self->{timer} = Event->timer (
2608 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2609 hard => 1, 3483 parked => 1,
2610 interval => $self->{animspeed},
2611 cb => sub { 3484 cb => sub {
3485 return unless $::CONN && $widget;
3486
2612 ++$widget->{frame}; 3487 ++$widget->{frame};
3488 $widget->update_face;
2613 $widget->update; 3489 $widget->update;
3490
3491 $widget->update_timer;
2614 }, 3492 },
2615 ); 3493 );
3494
3495 $self->update_face;
3496 $self->update_timer;
2616 } 3497 }
2617 3498
2618 $self 3499 $self
2619} 3500}
2620 3501
3502sub update_timer {
3503 my ($self) = @_;
3504
3505 return unless $self->{timer};
3506
3507 if ($self->{visible}) {
3508 $self->{timer}->at (
3509 $self->{anim_start}
3510 + $self->{animspeed}
3511 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3512 );
3513 $self->{timer}->start;
3514 } else {
3515 $self->{timer}->stop;
3516 }
3517}
3518
3519sub update_face {
3520 my ($self) = @_;
3521
3522 return unless $::CONN;
3523
3524 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3525 if ($anim && @$anim) {
3526 delete $self->{wait_face};
3527 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3528 }
3529 }
3530}
3531
2621sub size_request { 3532sub size_request {
2622 (32, 8) 3533 my ($self) = @_;
3534
3535 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) {
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3539 } else {
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3541 $self->realloc;
3542 });
3543 }
3544 }
3545 }
3546
3547 ($self->{size_w} || 8, $self->{size_h} || 8)
2623} 3548}
2624 3549
2625sub update { 3550sub update {
2626 my ($self) = @_; 3551 my ($self) = @_;
2627 3552
2628 return unless $self->{visible}; 3553 return unless $self->{visible};
2629 3554
2630 $self->SUPER::update; 3555 $self->SUPER::update;
2631} 3556}
2632 3557
3558sub invoke_visibility_change {
3559 my ($self) = @_;
3560
3561 $self->update_timer;
3562
3563 0
3564}
3565
2633sub _draw { 3566sub _draw {
2634 my ($self) = @_; 3567 my ($self) = @_;
2635 3568
2636 return unless $::CONN; 3569 return unless $::CONN;
2637 3570
2638 my $face; 3571 $self->SUPER::_draw;
2639 3572
2640 if ($self->{frame}) {
2641 my $anim = $::CONN->{anim}[$self->{anim}]; 3573 my $faceid = $::CONN->{faceid}[$self->{face}]
2642 3574 or return;
2643 $face = $anim->[ $self->{frame} % @$anim ]
2644 if $anim && @$anim;
2645 }
2646 3575
2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3576 my $tex = $::CONN->{texture}[$faceid];
2648 3577
2649 if ($tex) { 3578 if ($tex) {
2650 glEnable GL_TEXTURE_2D; 3579 glEnable GL_TEXTURE_2D;
2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2652 glColor 1, 1, 1, 1; 3581 glColor 0, 0, 0, 1;
2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3582 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2654 glDisable GL_TEXTURE_2D; 3583 glDisable GL_TEXTURE_2D;
2655 } 3584 }
2656} 3585}
2657 3586
2658sub DESTROY { 3587sub destroy {
2659 my ($self) = @_; 3588 my ($self) = @_;
2660 3589
2661 $self->{timer}->cancel 3590 (delete $self->{timer})->cancel
2662 if $self->{timer}; 3591 if $self->{timer};
2663 3592
2664 $self->SUPER::DESTROY; 3593 $self->SUPER::destroy;
2665} 3594}
2666 3595
2667############################################################################# 3596#############################################################################
2668 3597
2669package CFClient::UI::InventoryItem; 3598package CFPlus::UI::Buttonbar;
2670 3599
2671our @ISA = CFClient::UI::HBox::; 3600our @ISA = CFPlus::UI::HBox::;
2672 3601
2673sub _item_to_desc { 3602# 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 3603
2779############################################################################# 3604#############################################################################
2780 3605
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; 3606package CFPlus::UI::Menu;
2833 3607
2834our @ISA = CFClient::UI::FancyFrame::; 3608our @ISA = CFPlus::UI::Toplevel::;
2835 3609
2836use CFClient::OpenGL; 3610use CFPlus::OpenGL;
2837 3611
2838sub new { 3612sub new {
2839 my $class = shift; 3613 my $class = shift;
2840 3614
2841 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
2842 items => [], 3616 items => [],
2843 z => 100, 3617 z => 100,
2844 @_, 3618 @_,
2845 ); 3619 );
2846 3620
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3621 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2848 3622
2849 for my $item (@{ $self->{items} }) { 3623 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3624 my ($widget, $cb, $tooltip) = @$item;
2851 3625
2852 # handle various types of items, only text for now 3626 # handle various types of items, only text for now
2853 if (!ref $widget) { 3627 if (!ref $widget) {
3628 if ($widget =~ /\t/) {
3629 my ($left, $right) = split /\t/, $widget, 2;
3630
2854 $widget = new CFClient::UI::Label 3631 $widget = new CFPlus::UI::HBox
2855 can_hover => 1, 3632 can_hover => 1,
2856 can_events => 1, 3633 can_events => 1,
3634 tooltip => $tooltip,
3635 children => [
3636 (new CFPlus::UI::Label markup => $left, expand => 1),
3637 (new CFPlus::UI::Label markup => $right, align => +1),
3638 ],
3639 ;
3640
3641 } else {
3642 $widget = new CFPlus::UI::Label
3643 can_hover => 1,
3644 can_events => 1,
2857 text => $widget; 3645 markup => $widget,
3646 tooltip => $tooltip;
3647 }
2858 } 3648 }
2859 3649
2860 $self->{item}{$widget} = $item; 3650 $self->{item}{$widget} = $item;
2861 3651
2862 $self->{vbox}->add ($widget); 3652 $self->{vbox}->add ($widget);
… …
2874 # maybe save $GRAB? must be careful about events... 3664 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3665 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3666 $self->{button} = $ev->{button};
2877 3667
2878 $self->show; 3668 $self->show;
2879 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3669 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 3670}
2881 3671
2882sub mouse_motion { 3672sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3673 my ($self, $ev, $x, $y) = @_;
2884 3674
2885 # TODO: should use vbox->find_widget or so 3675 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3676 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3677 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3678
3679 0
3680}
3681
2890sub button_up { 3682sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3683 my ($self, $ev, $x, $y) = @_;
2892 3684
2893 if ($ev->{button} == $self->{button}) { 3685 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3686 undef $GRAB;
2895 $self->hide; 3687 $self->hide;
2896 3688
2897 $self->emit ("popdown"); 3689 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3690 $self->{hover}[1]->() if $self->{hover};
3691 } else {
3692 return 0
3693 }
3694
2899 } 3695 1
2900} 3696}
2901 3697
2902############################################################################# 3698#############################################################################
2903 3699
2904package CFClient::UI::Statusbox; 3700package CFPlus::UI::Multiplexer;
2905 3701
2906our @ISA = CFClient::UI::VBox::; 3702our @ISA = CFPlus::UI::Container::;
2907 3703
2908sub new { 3704sub new {
2909 my $class = shift; 3705 my $class = shift;
2910 3706
2911 $class->SUPER::new ( 3707 my $self = $class->SUPER::new (
3708 @_,
3709 );
3710
3711 $self->{current} = $self->{children}[0]
3712 if @{ $self->{children} };
3713
3714 $self
3715}
3716
3717sub add {
3718 my ($self, @widgets) = @_;
3719
3720 $self->SUPER::add (@widgets);
3721
3722 $self->{current} = $self->{children}[0]
3723 if @{ $self->{children} };
3724}
3725
3726sub get_current_page {
3727 my ($self) = @_;
3728
3729 $self->{current}
3730}
3731
3732sub set_current_page {
3733 my ($self, $page_or_widget) = @_;
3734
3735 my $widget = ref $page_or_widget
3736 ? $page_or_widget
3737 : $self->{children}[$page_or_widget];
3738
3739 $self->{current} = $widget;
3740 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3741
3742 $self->emit (page_changed => $self->{current});
3743
3744 $self->realloc;
3745}
3746
3747sub visible_children {
3748 $_[0]{current}
3749}
3750
3751sub size_request {
3752 my ($self) = @_;
3753
3754 $self->{current}->size_request
3755}
3756
3757sub invoke_size_allocate {
3758 my ($self, $w, $h) = @_;
3759
3760 $self->{current}->configure (0, 0, $w, $h);
3761
3762 1
3763}
3764
3765sub _draw {
3766 my ($self) = @_;
3767
3768 $self->{current}->draw;
3769}
3770
3771#############################################################################
3772
3773package CFPlus::UI::Notebook;
3774
3775our @ISA = CFPlus::UI::VBox::;
3776
3777sub new {
3778 my $class = shift;
3779
3780 my $self = $class->SUPER::new (
3781 buttonbar => (new CFPlus::UI::Buttonbar),
3782 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3783 # filter => # will be put between multiplexer and $self
3784 @_,
3785 );
3786
3787 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3788 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3789
3790 $self
3791}
3792
3793sub add {
3794 my ($self, $title, $widget, $tooltip) = @_;
3795
3796 CFPlus::weaken $self;
3797
3798 $self->{buttonbar}->add (new CFPlus::UI::Button
3799 markup => $title,
3800 tooltip => $tooltip,
3801 on_activate => sub { $self->set_current_page ($widget) },
3802 );
3803
3804 $self->{multiplexer}->add ($widget);
3805}
3806
3807sub get_current_page {
3808 my ($self) = @_;
3809
3810 $self->{multiplexer}->get_current_page
3811}
3812
3813sub set_current_page {
3814 my ($self, $page) = @_;
3815
3816 $self->{multiplexer}->set_current_page ($page);
3817 $self->emit (page_changed => $self->{multiplexer}{current});
3818}
3819
3820#############################################################################
3821
3822package CFPlus::UI::Selector;
3823
3824use utf8;
3825
3826our @ISA = CFPlus::UI::Button::;
3827
3828sub new {
3829 my $class = shift;
3830
3831 my $self = $class->SUPER::new (
3832 options => [], # [value, title, longdesc], ...
3833 value => undef,
3834 @_,
3835 );
3836
3837 $self->_set_value ($self->{value});
3838
3839 $self
3840}
3841
3842sub invoke_button_down {
3843 my ($self, $ev) = @_;
3844
3845 my @menu_items;
3846
3847 for (@{ $self->{options} }) {
3848 my ($value, $title, $tooltip) = @$_;
3849
3850 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3851 }
3852
3853 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3854}
3855
3856sub _set_value {
3857 my ($self, $value) = @_;
3858
3859 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3860 or return;
3861
3862 $self->{value} = $item->[0];
3863 $self->set_markup ("$item->[1] ⇓");
3864 $self->set_tooltip ($item->[2]);
3865}
3866
3867sub set_value {
3868 my ($self, $value) = @_;
3869
3870 return unless $self->{value} ne $value;
3871
3872 $self->_set_value ($value);
3873 $self->emit (changed => $value);
3874}
3875
3876#############################################################################
3877
3878package CFPlus::UI::Statusbox;
3879
3880our @ISA = CFPlus::UI::VBox::;
3881
3882sub new {
3883 my $class = shift;
3884
3885 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3886 fontsize => 0.8,
2913 @_, 3887 @_,
2914 ) 3888 );
3889
3890 CFPlus::weaken (my $this = $self);
3891
3892 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3893
3894 $self
2915} 3895}
2916 3896
2917sub reorder { 3897sub reorder {
2918 my ($self) = @_; 3898 my ($self) = @_;
2919 my $NOW = time; 3899 my $NOW = Time::HiRes::time;
3900
3901 # freeze display when hovering over any label
3902 return if $CFPlus::UI::TOOLTIP->{owner}
3903 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3904 values %{ $self->{item} };
2920 3905
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3906 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3907 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3908 }
2924 3909
… …
2927 my @items = sort { 3912 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3913 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3914 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3915 } values %{ $self->{item} };
2931 3916
3917 $self->{timer}->interval (1);
3918
2932 my $count = 10 + 1; 3919 my $count = 10 + 1;
2933 for my $item (@items) { 3920 for my $item (@items) {
2934 last unless --$count; 3921 last unless --$count;
2935 3922
2936 push @widgets, $item->{label} ||= do { 3923 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3924 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3925 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3926 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3927 : $item->{text};
2941 3928
2942 for ($short) { 3929 for ($short) {
2943 s/^\s+//; 3930 s/^\s+//;
2944 s/\s+/ /g; 3931 s/\s+/ /g;
2945 } 3932 }
2946 3933
2947 new CFClient::UI::Label 3934 new CFPlus::UI::Label
2948 markup => $short, 3935 markup => $short,
2949 tooltip => $item->{tooltip}, 3936 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3937 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3938 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3939 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3940 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3941 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3942 can_events => 1,
2956 can_hover => 1 3943 can_hover => 1
2957 }; 3944 };
3945
3946 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3947 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3948 $label->update;
3949 $label->set_max_size (undef, $label->{req_h} * $diff)
3950 if $diff < 1;
3951 $self->{timer}->interval (1/30);
3952 } else {
3953 $label->{fg}[3] = $item->{fg}[3] || 1;
3954 }
3955
3956 push @widgets, $label;
2958 } 3957 }
2959 3958
2960 $self->clear; 3959 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3960 $self->SUPER::add (reverse @widgets);
2962} 3961}
… …
2965 my ($self, $text, %arg) = @_; 3964 my ($self, $text, %arg) = @_;
2966 3965
2967 $text =~ s/^\s+//; 3966 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3967 $text =~ s/\s+$//;
2969 3968
3969 return unless $text;
3970
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 3971 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2971 3972
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3973 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 3974
2974 if (my $item = $self->{item}{$group}) { 3975 if (my $item = $self->{item}{$group}) {
2975 if ($item->{text} eq $text) { 3976 if ($item->{text} eq $text) {
2976 $item->{count}++; 3977 $item->{count}++;
2977 } else { 3978 } else {
2978 $item->{count} = 1; 3979 $item->{count} = 1;
2979 $item->{text} = $item->{tooltip} = $text; 3980 $item->{text} = $item->{tooltip} = $text;
2980 } 3981 }
2981 $item->{id} = ++$self->{id}; 3982 $item->{id} += 0.2;#d#
2982 $item->{timeout} = $timeout; 3983 $item->{timeout} = $timeout;
2983 delete $item->{label}; 3984 delete $item->{label};
2984 } else { 3985 } else {
2985 $self->{item}{$group} = { 3986 $self->{item}{$group} = {
2986 id => ++$self->{id}, 3987 id => ++$self->{id},
… …
2992 count => 1, 3993 count => 1,
2993 %arg, 3994 %arg,
2994 }; 3995 };
2995 } 3996 }
2996 3997
3998 $ROOT->on_refresh (reorder => sub {
2997 $self->reorder; 3999 $self->reorder;
4000 });
2998} 4001}
2999 4002
3000sub reconfigure { 4003sub reconfigure {
3001 my ($self) = @_; 4004 my ($self) = @_;
3002 4005
… …
3005 4008
3006 $self->reorder; 4009 $self->reorder;
3007 $self->SUPER::reconfigure; 4010 $self->SUPER::reconfigure;
3008} 4011}
3009 4012
4013sub destroy {
4014 my ($self) = @_;
4015
4016 $self->{timer}->cancel;
4017
4018 $self->SUPER::destroy;
4019}
4020
3010############################################################################# 4021#############################################################################
3011 4022
3012package CFClient::UI::Root; 4023package CFPlus::UI::Root;
3013 4024
3014our @ISA = CFClient::UI::Container::; 4025our @ISA = CFPlus::UI::Container::;
3015 4026
4027use List::Util qw(min max);
4028
3016use CFClient::OpenGL; 4029use CFPlus::OpenGL;
3017 4030
3018sub new { 4031sub new {
3019 my $class = shift; 4032 my $class = shift;
3020 4033
3021 $class->SUPER::new ( 4034 my $self = $class->SUPER::new (
4035 visible => 1,
3022 @_, 4036 @_,
3023 ) 4037 );
3024}
3025 4038
3026sub configure { 4039 CFPlus::weaken ($self->{root} = $self);
3027 my ($self, $x, $y, $w, $h) = @_;
3028 4040
3029 $self->{w} = $w; 4041 $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} 4042}
3039 4043
3040sub size_request { 4044sub size_request {
3041 my ($self) = @_; 4045 my ($self) = @_;
3042 4046
3043 ($self->{w}, $self->{h}) 4047 ($self->{w}, $self->{h})
3044} 4048}
3045 4049
4050sub _to_pixel {
4051 my ($coord, $size, $max) = @_;
4052
4053 $coord =
4054 $coord eq "center" ? ($max - $size) * 0.5
4055 : $coord eq "max" ? $max
4056 : $coord;
4057
4058 $coord = 0 if $coord < 0;
4059 $coord = $max - $size if $coord > $max - $size;
4060
4061 int $coord + 0.5
4062}
4063
3046sub size_allocate { 4064sub invoke_size_allocate {
3047 my ($self, $w, $h) = @_; 4065 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 4066
3055 for my $child ($self->children) { 4067 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4068 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 4069
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4070 $X = $child->{force_x} if exists $child->{force_x};
3059 if exists $child->{req_x}; 4071 $Y = $child->{force_y} if exists $child->{force_y};
3060 4072
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4073 $X = _to_pixel $X, $W, $self->{w};
3062 if exists $child->{req_y}; 4074 $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 4075
3067 $child->configure ($X, $Y, $W, $H); 4076 $child->configure ($X, $Y, $W, $H);
3068 } 4077 }
4078
4079 1
3069} 4080}
3070 4081
3071sub coord2local { 4082sub coord2local {
3072 my ($self, $x, $y) = @_; 4083 my ($self, $x, $y) = @_;
3073 4084
… …
3081} 4092}
3082 4093
3083sub update { 4094sub update {
3084 my ($self) = @_; 4095 my ($self) = @_;
3085 4096
3086 $self->check_size;
3087 $::WANT_REFRESH++; 4097 $::WANT_REFRESH++;
3088} 4098}
3089 4099
3090sub add { 4100sub add {
3091 my ($self, @children) = @_; 4101 my ($self, @children) = @_;
3092 4102
3093 for my $child (@children) {
3094 $child->{toplevel} = 1; 4103 $_->{is_toplevel} = 1
3095 4104 for @children;
3096 # integerise window positions
3097 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y};
3099 }
3100 4105
3101 $self->SUPER::add (@children); 4106 $self->SUPER::add (@children);
4107}
4108
4109sub remove {
4110 my ($self, @children) = @_;
4111
4112 $self->SUPER::remove (@children);
4113
4114 delete $self->{is_toplevel}
4115 for @children;
3102 4116
3103 while (@children) { 4117 while (@children) {
3104 my $w = pop @children; 4118 my $w = pop @children;
3105 push @children, $w->children; 4119 push @children, $w->children;
3106 $w->{visible} = 1; 4120 $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 } 4121 }
3120} 4122}
3121 4123
3122sub on_refresh { 4124sub on_refresh {
3123 my ($self, $id, $cb) = @_; 4125 my ($self, $id, $cb) = @_;
… …
3137 while ($self->{refresh_hook}) { 4139 while ($self->{refresh_hook}) {
3138 $_->() 4140 $_->()
3139 for values %{delete $self->{refresh_hook}}; 4141 for values %{delete $self->{refresh_hook}};
3140 } 4142 }
3141 4143
3142 if ($self->{check_size}) { 4144 if ($self->{realloc}) {
3143 my @queue = ([], []); 4145 my %queue;
4146 my @queue;
4147 my $widget;
3144 4148
3145 for (;;) { 4149 outer:
3146 if ($self->{check_size}) { 4150 while () {
3147 # heuristic: check containers last 4151 if (my $realloc = delete $self->{realloc}) {
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4152 for $widget (values %$realloc) {
3149 for values %{delete $self->{check_size}} 4153 $widget->{visible} or next; # do not resize invisible widgets
4154
4155 $queue{$widget+0}++ and next; # duplicates are common
4156
4157 push @{ $queue[$widget->{visible}] }, $widget;
4158 }
3150 } 4159 }
3151 4160
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4161 while () {
4162 @queue or last outer;
3153 4163
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4164 $widget = pop @{ $queue[-1] || [] }
3155 ? @$widget{qw(user_w user_h)} 4165 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 4166
4167 pop @queue;
4168 }
4169
4170 delete $queue{$widget+0};
4171
4172 my ($w, $h) = $widget->size_request;
4173
4174 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4175 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4176
4177 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4178 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4179
4180 $w = $widget->{force_w} if exists $widget->{force_w};
4181 $h = $widget->{force_h} if exists $widget->{force_h};
4182
4183 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4184 || delete $widget->{force_realloc}) {
3162 $widget->{req_w} = $w; 4185 $widget->{req_w} = $w;
3163 $widget->{req_h} = $h; 4186 $widget->{req_h} = $h;
3164 4187
3165 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4188 $self->{size_alloc}{$widget+0} = $widget;
3166 4189
3167 $widget->{parent}->check_size
3168 if $widget->{parent}; 4190 if (my $parent = $widget->{parent}) {
4191 $self->{realloc}{$parent+0} = $parent
4192 unless $queue{$parent+0};
4193
4194 $parent->{force_size_alloc} = 1;
4195 $self->{size_alloc}{$parent+0} = $parent;
4196 }
3169 } 4197 }
4198
4199 delete $self->{realloc}{$widget+0};
3170 } 4200 }
3171 } 4201 }
3172 4202
3173 while ($self->{size_alloc}) { 4203 while (my $size_alloc = delete $self->{size_alloc}) {
3174 for (values %{delete $self->{size_alloc}}) { 4204 my @queue = sort { $b->{visible} <=> $a->{visible} }
3175 my ($widget, $w, $h) = @$_; 4205 values %$size_alloc;
4206
4207 while () {
4208 my $widget = pop @queue || last;
4209
4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 4211
3177 $w = 0 if $w < 0; 4212 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 4213 $h = 0 if $h < 0;
3179 4214
4215 $w = max $widget->{min_w}, $w;
4216 $h = max $widget->{min_h}, $h;
4217
4218# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4219# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4220
4221 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4222 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4223
4224 $w = int $w + 0.5;
4225 $h = int $h + 0.5;
4226
4227 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4228 $widget->{old_w} = $widget->{w};
4229 $widget->{old_h} = $widget->{h};
4230
3180 $widget->{w} = $w; 4231 $widget->{w} = $w;
3181 $widget->{h} = $h; 4232 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h); 4233
3183 $widget->emit (size_allocate => $w, $h); 4234 $widget->emit (size_allocate => $w, $h);
4235 }
3184 } 4236 }
3185 } 4237 }
3186 4238
3187 while ($self->{post_alloc_hook}) { 4239 while ($self->{post_alloc_hook}) {
3188 $_->() 4240 $_->()
… …
3197 glLoadIdentity; 4249 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4250 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 4251 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 4252 glLoadIdentity;
3201 4253
4254 {
4255 package CFPlus::UI::Base;
4256
4257 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4258 (0, 0, $self->{w}, $self->{h});
4259
3202 $self->_draw; 4260 $self->_draw;
4261 }
3203} 4262}
3204 4263
3205############################################################################# 4264#############################################################################
3206 4265
3207package CFClient::UI; 4266package CFPlus::UI;
3208 4267
3209$ROOT = new CFClient::UI::Root; 4268$ROOT = new CFPlus::UI::Root;
3210$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4269$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3211 4270
32121 42711
3213 4272

Diff Legend

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