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.225 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.359 by root, Fri Dec 8 15:07:08 2006 UTC

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

Diff Legend

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