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.221 by root, Mon May 22 03:48:50 2006 UTC vs.
Revision 1.408 by root, Sun Jul 22 15:26:01 2007 UTC

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

Diff Legend

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