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

Diff Legend

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