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.64 by root, Tue Apr 11 13:38:22 2006 UTC vs.
Revision 1.94 by root, Thu Apr 13 23:07:57 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
79} 100}
80 101
81sub move { 102sub move {
82 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
83 $self->{x} = $x; 104 $self->{x} = $x;
… …
92sub size_request { 113sub size_request {
93 require Carp; 114 require Carp;
94 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
95} 116}
96 117
97sub size_allocate { 118sub _size_allocate {
98 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
99 125
100 $self->{w} = $w; 126 $self->{w} = $w;
101 $self->{h} = $h; 127 $self->{h} = $h;
102}
103 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
104# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
105sub translate { 139sub translate {
106 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
107 141
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
109} 143}
110 144
111sub focus_in { 145sub focus_in {
112 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
113 149
114 my $focus = $FOCUS; $FOCUS = $self; 150 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus; 151 $focus->update if $focus;
116 $FOCUS->update; 152 $FOCUS->update;
117} 153}
… …
125 $focus->update if $focus; #? 161 $focus->update if $focus; #?
126} 162}
127 163
128sub mouse_motion { } 164sub mouse_motion { }
129sub button_up { } 165sub button_up { }
130sub button_down { }
131sub key_down { } 166sub key_down { }
132sub key_up { } 167sub key_up { }
168
169sub button_down {
170 my ($self, $ev, $x, $y) = @_;
171
172 $self->focus_in;
173}
133 174
134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139 180
140sub draw { 181sub draw {
141 my ($self) = @_; 182 my ($self) = @_;
142 183
184 return unless $self->{h} && $self->{w};
185
143 glPushMatrix; 186 glPushMatrix;
144 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
145 $self->_draw; 188 $self->_draw;
189 glPopMatrix;
190
146 if ($self == $HOVER) { 191 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4; 192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
148 glEnable GL_BLEND; 195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
149 glBegin GL_QUADS; 197 glBegin GL_QUADS;
150 glVertex 0 , 0; 198 glVertex $x , $y;
151 glVertex $self->{w}, 0; 199 glVertex $x + $self->{w}, $y;
152 glVertex $self->{w}, $self->{h}; 200 glVertex $x + $self->{w}, $y + $self->{h};
153 glVertex 0 , $self->{h}; 201 glVertex $x , $y + $self->{h};
154 glEnd; 202 glEnd;
155 glDisable GL_BLEND; 203 glDisable GL_BLEND;
156 } 204 }
157 glPopMatrix;
158} 205}
159 206
160sub _draw { 207sub _draw {
161 my ($self) = @_; 208 my ($self) = @_;
162 209
163 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
164}
165
166sub bbox {
167 my ($self) = @_;
168 my ($w, $h) = $self->size_request;
169 (
170 $self->{x},
171 $self->{y},
172 $self->{x} = $w,
173 $self->{y} = $h
174 )
175} 211}
176 212
177sub find_widget { 213sub find_widget {
178 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
179 215
… …
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183 219
184 () 220 ()
185} 221}
186 222
187sub del_parent { $_[0]->{parent} = undef }
188
189sub set_parent { 223sub set_parent {
190 my ($self, $par) = @_; 224 my ($self, $par) = @_;
191 225
192 $self->{parent} = $par; 226 $self->{parent} = $par;
193 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
202 236
203 $self->{parent}->update 237 $self->{parent}->update
204 if $self->{parent}; 238 if $self->{parent};
205} 239}
206 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
207sub DESTROY { 254sub DESTROY {
208 my ($self) = @_; 255 my ($self) = @_;
209 256
210 #$self->deactivate; 257 #$self->deactivate;
211} 258}
212 259
213############################################################################# 260#############################################################################
214 261
262package CFClient::UI::DrawBG;
263
264our @ISA = CFClient::UI::Base::;
265
266use strict;
267use SDL::OpenGL;
268
269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
282 my ($self) = @_;
283
284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
298}
299
300#############################################################################
301
302package CFClient::UI::Empty;
303
304our @ISA = CFClient::UI::Base::;
305
306sub size_request {
307 (0, 0)
308}
309
310sub draw { }
311
312#############################################################################
313
215package CFClient::Widget::Container; 314package CFClient::UI::Container;
216 315
217our @ISA = CFClient::Widget::; 316our @ISA = CFClient::UI::Base::;
218 317
219sub new { 318sub new {
220 my ($class, %arg) = @_; 319 my ($class, %arg) = @_;
221 320
222 my $children = delete $arg{children} || []; 321 my $children = delete $arg{children} || [];
223 322
224 my $self = $class->SUPER::new (children => []); 323 my $self = $class->SUPER::new (children => [], %arg);
225 $self->add ($_) for @$children; 324 $self->add ($_) for @$children;
226 325
227 $self 326 $self
228} 327}
229 328
230sub add { 329sub add {
231 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
232 331
233 $chld->{expand} = $expand;
234 $chld->set_parent ($self); 332 $chld->set_parent ($self);
235 333
236 @{$self->{children}} = 334 $self->{children} = [
237 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
238 @{$self->{children}}, $chld; 336 @{$self->{children}}, $chld
337 ];
239 338
240 $self->size_allocate ($self->{w}, $self->{h}) 339 $self->{w} = $self->{h} = -1;
241 if $self->{w}; #TODO: check for "realised state" 340 $self->update;
242} 341}
243 342
244sub remove { 343sub remove {
245 my ($self, $widget) = @_; 344 my ($self, $widget) = @_;
246 345
247 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
248 347
249 $self->size_allocate ($self->{w}, $self->{h}); 348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
250} 349}
251 350
252sub find_widget { 351sub find_widget {
253 my ($self, $x, $y) = @_; 352 my ($self, $x, $y) = @_;
254 353
… …
271 $_->draw for @{$self->{children}}; 370 $_->draw for @{$self->{children}};
272} 371}
273 372
274############################################################################# 373#############################################################################
275 374
276package CFClient::Widget::Bin; 375package CFClient::UI::Bin;
277 376
278our @ISA = CFClient::Widget::Container::; 377our @ISA = CFClient::UI::Container::;
378
379sub new {
380 my ($class, %arg) = @_;
381
382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
383
384 $class->SUPER::new (children => [$child], %arg)
385}
386
387sub add {
388 my ($self, $widget) = @_;
389
390 $self->{children} = [];
391
392 $self->SUPER::add ($widget);
393}
394
395sub remove {
396 my ($self, $widget) = @_;
397
398 $self->SUPER::remove ($widget);
399
400 $self->{children} = [new CFClient::UI::Empty]
401 unless @{$self->{children}};
402}
279 403
280sub child { $_[0]->{children}[0] } 404sub child { $_[0]->{children}[0] }
281 405
282sub size_request { 406sub size_request {
283 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 407 $_[0]{children}[0]->size_request
284} 408}
285 409
286sub size_allocate { 410sub size_allocate {
287 my ($self, $w, $h) = @_; 411 my ($self, $x, $y, $w, $h) = @_;
288 412
289 $self->SUPER::size_allocate ($w, $h); 413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
290 $self->{children}[0]->size_allocate ($w, $h) 415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
291 if $self->{children}[0]
292} 416}
293 417
294############################################################################# 418#############################################################################
295 419
296package CFClient::Widget::Window; 420package CFClient::UI::Window;
297 421
298our @ISA = CFClient::Widget::Bin::; 422our @ISA = CFClient::UI::Bin::;
299 423
300use SDL::OpenGL; 424use SDL::OpenGL;
301 425
302sub new { 426sub new {
303 my ($class, %arg) = @_; 427 my ($class, %arg) = @_;
… …
321 $self->{w}, $self->{h}, sub { $self->child->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
322 ); 446 );
323} 447}
324 448
325sub size_allocate { 449sub size_allocate {
326 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
327 451
328 $self->{w} = $w; 452 $self->_size_allocate ($x, $y, $w, $h) or return;
329 $self->{h} = $h;
330 453
331 $self->child->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
332 455
333 $self->render_chld; 456 $self->render_chld;
334} 457}
335 458
336sub _draw { 459sub _draw {
… …
340 463
341 my $tex = $self->{texture} 464 my $tex = $self->{texture}
342 or return; 465 or return;
343 466
344 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
345 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
347 471
348 $tex->draw_quad (0, 0, $w, $h); 472 $tex->draw_quad (0, 0, $w, $h);
349 473
… …
351 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
352} 476}
353 477
354############################################################################# 478#############################################################################
355 479
356package CFClient::Widget::Frame; 480package CFClient::UI::Frame;
357 481
358our @ISA = CFClient::Widget::Bin::; 482our @ISA = CFClient::UI::Bin::;
359 483
360use SDL::OpenGL; 484use SDL::OpenGL;
361 485
362sub size_request { 486sub size_request {
363 my ($self) = @_; 487 my ($self) = @_;
… …
368 492
369 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
370} 494}
371 495
372sub size_allocate { 496sub size_allocate {
373 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
374 498
375 $self->{w} = $w; 499 $self->_size_allocate ($x, $y, $w, $h) or return;
376 $self->{h} = $h;
377 500
378 $self->child->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
379 $self->child->move (2, 2);
380} 502}
381 503
382sub _draw { 504sub _draw {
383 my ($self) = @_; 505 my ($self) = @_;
384 506
… …
397 $chld->draw; 519 $chld->draw;
398} 520}
399 521
400############################################################################# 522#############################################################################
401 523
402package CFClient::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
403 525
404our @ISA = CFClient::Widget::Bin::; 526our @ISA = CFClient::UI::Bin::;
405 527
406use SDL::OpenGL; 528use SDL::OpenGL;
407 529
408my @tex = 530my @tex =
409 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
410 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
411 533
412sub size_request { 534sub size_request {
413 my ($self) = @_; 535 my ($self) = @_;
414 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
415 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
416 540
417 $h += $tex[1]->{height}; 541 $h += $tex[1]->{h};
418 $h += $tex[4]->{height}; 542 $h += $tex[4]->{h};
419 $w += $tex[2]->{width}; 543 $w += $tex[2]->{w};
420 $w += $tex[3]->{width}; 544 $w += $tex[3]->{w};
421 545
422 ($w, $h) 546 ($w, $h)
423} 547}
424 548
425sub size_allocate { 549sub size_allocate {
426 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
427 551
428 $self->SUPER::size_allocate ($w, $h); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
429 553
430 $h -= $tex[1]->{height}; 554 $h -= $tex[1]{h};
431 $h -= $tex[4]->{height}; 555 $h -= $tex[4]{h};
432 $w -= $tex[2]->{width}; 556 $w -= $tex[2]{w};
433 $w -= $tex[3]->{width}; 557 $w -= $tex[3]{w};
434 558
435 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
436 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
437 561
438 $self->child->size_allocate ($w, $h); 562 my $child = $self->child;
439 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
440} 613}
441 614
442sub _draw { 615sub _draw {
443 my ($self) = @_; 616 my ($self) = @_;
444 617
445 my ($w, $h) = ($self->{w}, $self->{h}); 618 my ($w, $h) = ($self->{w}, $self->{h});
446 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
447 620
448 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
449 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
452 625
453 my $top = $tex[1]; 626 my $top = $tex[1];
454 $top->draw_quad (0, 0, $w, $top->{height}); 627 $top->draw_quad (0, 0, $w, $top->{h});
455 628
456 my $left = $tex[3]; 629 my $left = $tex[3];
457 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
458 631
459 my $right = $tex[2]; 632 my $right = $tex[2];
460 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
461 634
462 my $bottom = $tex[4]; 635 my $bottom = $tex[4];
463 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
464 637
465 my $bg = $tex[0]; 638 my $bg = $tex[0];
639
466 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
469 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
470 642
471 my $rep_x = $cw / $bg->{width}; 643 my $rep_x = $cw / $bg->{w};
472 my $rep_y = $ch / $bg->{height}; 644 my $rep_y = $ch / $bg->{h};
473 645
474 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
475 647
648 glDisable GL_TEXTURE_2D;
476 glDisable GL_BLEND; 649 glDisable GL_BLEND;
477 glDisable GL_TEXTURE_2D;
478 650
479 $self->child->draw; 651 $self->child->draw;
480 652
481} 653}
482 654
483############################################################################# 655#############################################################################
484 656
485package CFClient::Widget::Table; 657package CFClient::UI::Table;
486 658
487our @ISA = CFClient::Widget::Bin::; 659our @ISA = CFClient::UI::Base::;
660
661use List::Util qw(max sum);
488 662
489use SDL::OpenGL; 663use SDL::OpenGL;
664
665sub new {
666 my $class = shift;
667
668 $class->SUPER::new (
669 col_expand => [],
670 @_
671 )
672}
490 673
491sub add { 674sub add {
492 my ($self, $x, $y, $chld) = @_; 675 my ($self, $x, $y, $chld) = @_;
493 my $old_chld = $self->{children}[$y][$x];
494 676
495 $self->{children}[$y][$x] = $chld; 677 $self->{children}[$y][$x] = $chld;
496 $chld->set_parent ($self); 678 $chld->set_parent ($self);
679
680 $self->{w} = $self->{h} = -1;
497 $self->update; 681 $self->update;
498} 682}
499 683
500sub max_row_height { 684sub get_wh {
501 my ($self, $row) = @_; 685 my ($self) = @_;
502 686
503 my $hs = 0; 687 my (@w, @h);
504 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 688
689 for my $y (0 .. $#{$self->{children}}) {
505 my $c = $self->{children}->[$row]->[$xi]; 690 my $row = $self->{children}[$y]
506 if ($c) { 691 or next;
692
693 for my $x (0 .. $#$row) {
694 my $widget = $row->[$x]
695 or next;
507 my ($w, $h) = $c->size_request; 696 my ($w, $h) = $widget->size_request;
508 if ($hs < $h) { $hs = $h } 697
698 $w[$x] = max $w[$x], $w;
699 $h[$y] = max $h[$y], $h;
509 } 700 }
510 } 701 }
511 return $hs;
512}
513 702
514sub max_col_width { 703 (\@w, \@h)
704}
705
706sub size_request {
515 my ($self, $col) = @_; 707 my ($self) = @_;
516 708
709 my ($ws, $hs) = $self->get_wh;
710
711 (
712 (sum @$ws),
713 (sum @$hs),
714 )
715}
716
717sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721
722 my ($ws, $hs) = $self->get_wh;
723
724 my $req_w = sum @$ws;
725 my $req_h = sum @$hs;
726
727 # TODO: nicer code && do row_expand
728 my @col_expand = @{$self->{col_expand}};
729 @col_expand = (1) x @$ws unless @col_expand;
730 my $col_expand = (sum @col_expand) || 1;
731
732 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
735
736 my $y;
737
738 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r]
740 or next;
741
517 my $ws = 0; 742 my $x = 0;
518 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 743 my $row_h = $hs->[$r];
519 my $c = ($self->{children}->[$yi] || [])->[$col]; 744
520 if ($c) { 745 for my $c (0 .. $#$row) {
521 my ($w, $h) = $c->size_request; 746 my $col_w = $ws->[$c];
522 if ($ws < $w) { $ws = $w } 747
748 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
751
752 $x += $col_w;
523 } 753 }
754
755 $y += $row_h;
524 } 756 }
525 return $ws; 757
526} 758}
759
760sub find_widget {
761 my ($self, $x, $y) = @_;
762
763 $x -= $self->{x};
764 $y -= $self->{y};
765
766 my $res;
767
768 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
769 $res = $_->find_widget ($x, $y)
770 and return $res;
771 }
772
773 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
774}
775
776sub _draw {
777 my ($self) = @_;
778
779 for (grep $_, @{$self->{children}}) {
780 $_->draw for grep $_, @$_;
781 }
782}
783
784#############################################################################
785
786package CFClient::UI::HBox;
787
788# TODO: wrap into common Box base class
789
790our @ISA = CFClient::UI::Container::;
527 791
528sub size_request { 792sub size_request {
529 my ($self) = @_; 793 my ($self) = @_;
530 794
795 my @alloc = map [$_->size_request], @{$self->{children}};
796
797 (
798 (List::Util::sum map $_->[0], @alloc),
799 (List::Util::max map $_->[1], @alloc),
800 )
801}
802
803sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h);
807
531 my ($hs, $ws) = (0, 0); 808 ($h, $w) = ($w, $h);
532 809
533 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 810 my $children = $self->{children};
534 $hs += $self->max_row_height ($yi);
535 }
536 811
537 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 812 my @h = map +($_->size_request)[0], @$children;
538 my $wm = 0; 813
539 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 814 my $req_h = List::Util::sum @h;
540 $wm += $self->max_col_width ($xi) 815
816 if ($req_h > $h) {
817 # ah well, not enough space
818 $_ *= $h / $req_h for @h;
819 } else {
820 my $exp = List::Util::sum map $_->{expand}, @$children;
821 $exp ||= 1;
822
823 for (0 .. $#$children) {
824 my $child = $children->[$_];
825
826 my $alloc_h = $h[$_];
827 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828 $h[$_] = $alloc_h;
541 } 829 }
542 if ($ws < $wm) { $ws = $wm }
543 } 830 }
544
545 return ($ws, $hs);
546}
547
548sub _draw {
549 my ($self) = @_;
550 831
551 my $y = 0; 832 my $y = 0;
552 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 833 for (0 .. $#$children) {
834 my $child = $children->[$_];
553 my $x = 0; 835 my $h = $h[$_];
836 $child->size_allocate ($y, 0, $h, $w);
554 837
555 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 838 $y += $h;
556
557 my $c = $self->{children}->[$yi]->[$xi];
558 if ($c) {
559 $c->move ($x, $y, 0); #TODO: Move to size_request
560 $c->draw if $c;
561 }
562
563 $x += $self->max_col_width ($xi);
564 }
565
566 $y += $self->max_row_height ($yi);
567 } 839 }
568} 840}
569 841
570############################################################################# 842#############################################################################
571 843
572package CFClient::Widget::VBox; 844package CFClient::UI::VBox;
573 845
846# TODO: wrap into common Box base class
847
574our @ISA = CFClient::Widget::Container::; 848our @ISA = CFClient::UI::Container::;
575
576use SDL::OpenGL;
577 849
578sub size_request { 850sub size_request {
579 my ($self) = @_; 851 my ($self) = @_;
580 852
581 my @alloc = map [$_->size_request], @{$self->{children}}; 853 my @alloc = map [$_->size_request], @{$self->{children}};
… …
585 (List::Util::sum map $_->[1], @alloc), 857 (List::Util::sum map $_->[1], @alloc),
586 ) 858 )
587} 859}
588 860
589sub size_allocate { 861sub size_allocate {
590 my ($self, $w, $h) = @_; 862 my ($self, $x, $y, $w, $h) = @_;
591 863
592 $self->w ($w); 864 $self->_size_allocate ($x, $y, $w, $h);
593 $self->h ($h);
594 865
595 my $exp; 866 my $children = $self->{children};
596 my @oth; 867
597 # find expand widget 868 my @h = map +($_->size_request)[1], @$children;
598 for (@{$self->{children}}) { 869
599 if ($_->{expand}) { 870 my $req_h = List::Util::sum @h;
871
872 if ($req_h > $h) {
873 # ah well, not enough space
874 $_ *= $h / $req_h for @h;
875 } else {
876 my $exp = List::Util::sum map $_->{expand}, @$children;
600 $exp = $_; 877 $exp ||= 1;
601 last; 878
879 for (0 .. $#$children) {
880 my $child = $children->[$_];
881
882 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
602 } 883 }
603 push @oth, $_;
604 }
605
606 my ($ow, $oh);
607
608 # get sizes of other widgets
609 for (@oth) {
610 my ($w, $h) = $_->size_request;
611 $oh += $h;
612 if ($ow < $w) { $ow = $w }
613 } 884 }
614 885
615 my $y = 0; 886 my $y = 0;
616 for (@{$self->{children}}) { 887 for (0 .. $#$children) {
617 $_->move (0, $y); 888 my $child = $children->[$_];
618 889 my $h = $h[$_];
619 if ($_ == $exp) {
620 $_->size_allocate ($w, $h - $oh);
621 $y += $h - $oh;
622 } else {
623 my ($cw, $h) = $_->size_request;
624 $_->size_allocate ($w, $h); 890 $child->size_allocate (0, $y, $w, $h);
891
625 $y += $h; 892 $y += $h;
626 }
627 } 893 }
628} 894}
629 895
630############################################################################# 896#############################################################################
631 897
632package CFClient::Widget::Label; 898package CFClient::UI::Label;
633 899
634our @ISA = CFClient::Widget::; 900our @ISA = CFClient::UI::Base::;
635 901
636use SDL::OpenGL; 902use SDL::OpenGL;
637 903
638sub new { 904sub new {
639 my ($class, %arg) = @_; 905 my ($class, %arg) = @_;
640 906
641 # TODO: color, and make height, xyz etc. optional
642 my $self = $class->SUPER::new ( 907 my $self = $class->SUPER::new (
643 color => [1, 1, 1], 908 fg => [1, 1, 1],
644 height => $::FONTSIZE, 909 height => $::FONTSIZE,
645 text => "", 910 text => "",
911 align => -1,
912 padding => 2,
646 layout => new CFClient::Layout, 913 layout => new CFClient::Layout,
647 %arg 914 %arg
648 ); 915 );
649 916
650 $self->set_text ($self->{text}); 917 $self->set_text ($self->{text});
651 918
652 $self 919 $self
653} 920}
654 921
922sub escape_text {
923 local $_ = $_[1];
924
925 s/&/&amp;/g;
926 s/>/&gt;/g;
927 s/</&lt;/g;
928
929 $_[1]
930}
931
655sub set_text { 932sub set_text {
656 my ($self, $text) = @_; 933 my ($self, $text) = @_;
657 934
658 $self->{text} = $text; 935 $self->{text} = $text;
659 $self->{layout}->set_markup ($text); 936 $self->{layout}->set_markup ($text);
660 937
661 delete $self->{texture}; 938 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
940 $self->update;
662} 941}
663 942
664sub get_text { 943sub get_text {
665 my ($self, $text) = @_; 944 my ($self, $text) = @_;
666 945
… …
670sub size_request { 949sub size_request {
671 my ($self) = @_; 950 my ($self) = @_;
672 951
673 $self->{layout}->set_width; 952 $self->{layout}->set_width;
674 $self->{layout}->set_height ($self->{height}); 953 $self->{layout}->set_height ($self->{height});
675 $self->{layout}->size 954 my ($w, $h) = $self->{layout}->size;
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 955
677# ( 956 (
678# $self->{texture}{width}, 957 $w + $self->{padding} * 2,
679# $self->{texture}{height}, 958 $h + $self->{padding} * 2,
680# ) 959 )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686} 960}
687 961
688sub size_allocate { 962sub size_allocate {
689 my ($self, $w, $h) = @_; 963 my ($self, $x, $y, $w, $h) = @_;
690 964
691 $self->SUPER::size_allocate ($w, $h); 965 $self->_size_allocate ($x, $y, $w, $h) or return;
966
692 delete $self->{texture}; 967 delete $self->{texture};
968}
969
970sub update {
971 my ($self) = @_;
972
973 delete $self->{texture};
974 $self->SUPER::update;
693} 975}
694 976
695sub _draw { 977sub _draw {
696 my ($self) = @_; 978 my ($self) = @_;
697 979
698 my $tex = $self->{texture} ||= do { 980 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w}); 981 $self->{layout}->set_width ($self->{w});
982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
700 new_from_layout CFClient::Texture $self->{layout}; 983 new_from_layout CFClient::Texture $self->{layout}
701 }; 984 };
985
986 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990
991 glColor @{$self->{fg}};
992
993 my $x =
994 $self->{align} < 0 ? $self->{padding}
995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996 : ($self->{w} - $tex->{w}) * 0.5;
997
998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
999 $tex->draw_quad (0, 0);
1000
1001 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND;
1003}
1004
1005#############################################################################
1006
1007package CFClient::UI::Entry;
1008
1009our @ISA = CFClient::UI::Label::;
1010
1011use SDL;
1012use SDL::OpenGL;
1013
1014sub new {
1015 my $class = shift;
1016
1017 $class->SUPER::new (
1018 fg => [1, 1, 1],
1019 bg => [0, 0, 0, 0.2],
1020 active_bg => [1, 1, 1, 0.5],
1021 active_fg => [0, 0, 0],
1022 @_
1023 )
1024}
1025
1026sub _set_text {
1027 my ($self, $text) = @_;
1028
1029 $self->{last_activity} = $::NOW;
1030
1031 $self->{text} = $text;
1032 $self->{layout}->set_width ($self->{w});
1033 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1034
1035 $text =~ s/./*/g if $self->{hidden};
1036
1037 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1038
1039 $text = substr $text, 0, $self->{cursor};
1040 utf8::encode $text;
1041
1042 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1043}
1044
1045sub size_request {
1046 my ($self) = @_;
1047
1048 my ($w, $h) = $self->SUPER::size_request;
1049
1050 ($w + 1, $h) # add 1 for cursor
1051}
1052
1053sub size_allocate {
1054 my ($self, $x, $y, $w, $h) = @_;
1055
1056 $self->SUPER::size_allocate ($x, $y, $w, $h);
1057
1058 $self->_set_text ($self->{text});
1059}
1060
1061sub set_text {
1062 my ($self, $text) = @_;
1063
1064 $self->{cursor} = length $text;
1065 $self->_set_text ($text);
1066 $self->update;
1067}
1068
1069sub key_down {
1070 my ($self, $ev) = @_;
1071
1072 my $mod = $ev->key_mod;
1073 my $sym = $ev->key_sym;
1074
1075 my $uni = $ev->key_unicode;
1076
1077 my $text = $self->get_text;
1078
1079 if ($sym == SDLK_BACKSPACE) {
1080 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1081 } elsif ($sym == SDLK_DELETE) {
1082 substr $text, $self->{cursor}, 1, "";
1083 } elsif ($sym == SDLK_LEFT) {
1084 --$self->{cursor} if $self->{cursor};
1085 } elsif ($sym == SDLK_RIGHT) {
1086 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1087 } elsif ($sym == SDLK_HOME) {
1088 $self->{cursor} = 0;
1089 } elsif ($sym == SDLK_END) {
1090 $self->{cursor} = length $text;
1091 } elsif ($uni) {
1092 substr $text, $self->{cursor}++, 0, chr $uni;
1093 }
1094
1095 $self->_set_text ($text);
1096 $self->update;
1097}
1098
1099sub focus_in {
1100 my ($self) = @_;
1101
1102 $self->{last_activity} = $::NOW;
1103
1104 $self->SUPER::focus_in;
1105}
1106
1107sub button_down {
1108 my ($self, $ev, $x, $y) = @_;
1109
1110 $self->SUPER::button_down ($ev, $x, $y);
1111
1112 my $idx = $self->{layout}->xy_to_index ($x, $y);
1113
1114 # byte-index to char-index
1115 my $text = $self->{text};
1116 utf8::encode $text;
1117 $self->{cursor} = length substr $text, 0, $idx;
1118
1119 $self->_set_text ($self->{text});
1120 $self->update;
1121}
1122
1123sub mouse_motion {
1124 my ($self, $ev, $x, $y) = @_;
1125# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1126}
1127
1128sub _draw {
1129 my ($self) = @_;
1130
1131 local $self->{fg} = $self->{fg};
1132
1133 if ($FOCUS == $self) {
1134 glColor @{$self->{active_bg}};
1135 $self->{fg} = $self->{active_fg};
1136 } else {
1137 glColor @{$self->{bg}};
1138 }
1139
1140 glEnable GL_BLEND;
1141 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1142 glBegin GL_QUADS;
1143 glVertex 0 , 0;
1144 glVertex 0 , $self->{h};
1145 glVertex $self->{w}, $self->{h};
1146 glVertex $self->{w}, 0;
1147 glEnd;
1148 glDisable GL_BLEND;
1149
1150 $self->SUPER::_draw;
1151
1152 #TODO: force update every cursor change :(
1153 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1154 glColor @{$self->{fg}};
1155 glBegin GL_LINES;
1156 glVertex $self->{cur_x}, $self->{cur_y};
1157 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1158 glEnd;
1159 }
1160}
1161
1162#############################################################################
1163
1164package CFClient::UI::Button;
1165
1166our @ISA = CFClient::UI::Label::;
1167
1168use SDL;
1169use SDL::OpenGL;
1170
1171my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1173 qw(b1_button_active.png);
1174
1175sub new {
1176 my $class = shift;
1177
1178 $class->SUPER::new (
1179 padding => 4,
1180 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2],
1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5],
1184# border_fg => [1, 1, 0],
1185 @_
1186 )
1187}
1188
1189sub button_up {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($x >= 0 && $x < $self->{w}
1193 && $y >= 0 && $y < $self->{h}) {
1194 $self->emit ("activate");
1195 }
1196}
1197
1198sub _draw {
1199 my ($self) = @_;
1200
1201 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
702 1203
703 glEnable GL_BLEND; 1204 glEnable GL_BLEND;
704 glEnable GL_TEXTURE_2D; 1205 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207
1208 if ($GRAB == $self) {
1209 $self->{fg} = $self->{active_fg};
1210 }
1211
1212 glBindTexture GL_TEXTURE_2D, $tex->{name};
706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
707 1214
708 glColor @{$self->{color}}; 1215 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
709 1216
710 $tex->draw_quad (0, 0); 1217 glDisable GL_TEXTURE_2D;
711
712 glDisable GL_BLEND; 1218 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D;
714}
715 1219
716############################################################################# 1220 $self->SUPER::_draw;
1221}
717 1222
718package CFClient::Widget::Entry; 1223#############################################################################
719 1224
1225package CFClient::UI::CheckBox;
1226
720our @ISA = CFClient::Widget::Label::; 1227our @ISA = CFClient::UI::DrawBG::;
721 1228
722use SDL; 1229use SDL;
723use SDL::OpenGL; 1230use SDL::OpenGL;
724 1231
725sub key_down { 1232sub new {
1233 my $class = shift;
1234
1235 $class->SUPER::new (
1236 padding => 2,
1237 fg => [1, 1, 1],
1238 active_fg => [1, 1, 0],
1239 state => 0,
1240 @_
1241 )
1242}
1243
1244sub size_request {
726 my ($self, $ev) = @_; 1245 my ($self) = @_;
727 1246
728 my $mod = $ev->key_mod; 1247 ($self->{padding} * 2 + 6) x 2
729 my $sym = $ev->key_sym; 1248}
730 1249
731 my $uni = $ev->key_unicode; 1250sub size_allocate {
1251 my ($self, $x, $y, $w, $h) = @_;
732 1252
733 my $text = $self->get_text; 1253 $self->_size_allocate ($x, $y, $w, $h);
734
735 if ($sym == SDLK_BACKSPACE) {
736 substr $text, -1, 1, '';
737 } elsif ($uni) {
738 $text .= chr $uni;
739 }
740
741 $self->set_text ($text);
742} 1254}
743 1255
744sub button_down { 1256sub button_down {
1257 my ($self, $ev, $x, $y) = @_;
1258
1259 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1260 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1261 $self->{state} = !$self->{state};
1262 $self->emit (changed => $self->{state});
1263 }
1264}
1265
1266sub _draw {
745 my ($self, $ev) = @_; 1267 my ($self) = @_;
746 1268
747 $self->focus_in; 1269 $self->SUPER::_draw;
1270
1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276
1277 glBegin GL_LINE_LOOP;
1278 glVertex 0 , 0;
1279 glVertex 0 , $s;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283
1284 if ($self->{state}) {
1285 glBegin GL_LINES;
1286 glVertex 0 , 0;
1287 glVertex $s, $s;
1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1290 glEnd;
1291 }
1292}
1293
1294#############################################################################
1295
1296package CFClient::UI::Slider;
1297
1298use strict;
1299
1300use SDL::OpenGL;
1301
1302our @ISA = CFClient::UI::DrawBG::;
1303
1304sub new {
1305 my $class = shift;
1306
1307 # range [value, low, high, page]
1308
1309 my $self = $class->SUPER::new (
1310 fg => [1, 1, 1],
1311 active_fg => [0, 0, 0],
1312 range => [0, 0, 100, 10],
1313 req_w => 40,
1314 req_h => 10,
1315 vertical => 0,
1316 @_
1317 );
1318
1319 $self
1320}
1321
1322sub size_request {
1323 my ($self) = @_;
1324
1325 my $w = $self->{req_w};
1326 my $h = $self->{req_h};
1327
1328 $self->{vertical} ? ($h, $w) : ($w, $h)
1329}
1330
1331sub button_down {
1332 my ($self, $ev, $x, $y) = @_;
1333
1334 $self->SUPER::button_down ($ev, $x, $y);
1335 $self->mouse_motion ($ev, $x, $y);
748} 1336}
749 1337
750sub mouse_motion { 1338sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_; 1339 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1340
1341 if ($GRAB == $self) {
1342 my ($value, $lo, $hi, $page) = @{$self->{range}};
1343
1344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345
1346 $x = $x * ($hi - $lo) / $w + $lo;
1347 $x = $lo if $x < $lo;
1348 $x = $hi - $page if $x > $hi - $page;
1349 $self->{range}[0] = $x;
1350
1351 $self->emit (changed => $x);
1352 $self->update;
1353 }
753} 1354}
754 1355
755sub _draw { 1356sub _draw {
756 my ($self) = @_; 1357 my ($self) = @_;
757 1358
758 if ($FOCUS == $self) { 1359 $self->SUPER::_draw ();
759 glColor 1, 1, 1; 1360
760 } else { 1361 my ($w, $h) = @$self{qw(w h)};
761 glColor 0.7, 0.7, 0.7; 1362
1363 if ($self->{vertical}) {
1364 # draw a vertical slider like a rotated horizontal slider
1365
1366 glRotate 90, 0, 0, 1;
1367 glTranslate 0, -$self->{w}, 0;
1368
1369 ($w, $h) = ($h, $w);
762 } 1370 }
1371
1372 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374
1375 my ($value, $lo, $hi, $page) = @{$self->{range}};
1376
1377 $page = int $page * $w / ($hi - $lo);
1378 $value = int +($value - $lo) * $w / ($hi - $lo);
1379
1380 $w -= $page;
1381 $page &= ~1;
1382 glTranslate $page * 0.5, 0, 0;
1383 $page ||= 2;
1384
1385 glColor @$fg;
1386 glBegin GL_LINES;
1387 glVertex 0, 0; glVertex 0, $h;
1388 glVertex $w - 1, 0; glVertex $w - 1, $h;
1389 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390 glEnd;
1391
1392 my $knob_a = $value - $page * 0.5;
1393 my $knob_b = $value + $page * 0.5;
763 1394
764 glBegin GL_QUADS; 1395 glBegin GL_QUADS;
765 glVertex 0 , 0; 1396 glColor @$fg;
766 glVertex 0 , $self->{h} - 1; 1397 glVertex $knob_a, 0;
767 glVertex $self->{w} - 1, $self->{h} - 1; 1398 glVertex $knob_a, $h;
768 glVertex $self->{w} - 1, 0; 1399 glVertex $knob_b, $h;
1400 glVertex $knob_b, 0;
1401
1402 if ($knob_a < $knob_b - 2) {
1403 glColor @$bg;
1404 glVertex $knob_a + 1, 1;
1405 glVertex $knob_a + 1, $h - 1;
1406 glVertex $knob_b - 1, $h - 1;
1407 glVertex $knob_b - 1, 1;
1408 }
769 glEnd; 1409 glEnd;
770
771 $self->SUPER::_draw;
772} 1410}
773 1411
774############################################################################# 1412#############################################################################
775 1413
776package CFClient::Widget::MapWidget; 1414package CFClient::UI::MapWidget;
777 1415
778use strict; 1416use strict;
779 1417
780use List::Util qw(min max); 1418use List::Util qw(min max);
781 1419
782use SDL; 1420use SDL;
783use SDL::OpenGL; 1421use SDL::OpenGL;
784use SDL::OpenGL::Constants;
785 1422
786our @ISA = CFClient::Widget::; 1423our @ISA = CFClient::UI::Base::;
787 1424
788sub new { 1425sub new {
789 my $class = shift; 1426 my $class = shift;
790 1427
791 $class->SUPER::new (z => -1, @_) 1428 $class->SUPER::new (
1429 z => -1,
1430 list => (glGenLists 1),
1431 @_
1432 )
792} 1433}
793 1434
794sub key_down { 1435sub key_down {
795 print "MAPKEYDOWN\n"; 1436 print "MAPKEYDOWN\n";
796} 1437}
… …
798sub key_up { 1439sub key_up {
799} 1440}
800 1441
801sub size_request { 1442sub size_request {
802 ( 1443 (
803 1 + int $::WIDTH / 32, 1444 1 + 32 * int $::WIDTH / 32,
804 1 + int $::HEIGHT / 32, 1445 1 + 32 * int $::HEIGHT / 32,
805 ) 1446 )
806} 1447}
807 1448
1449sub update {
1450 my ($self) = @_;
1451
1452 $self->{need_update} = 1;
1453 $self->SUPER::update;
1454}
1455
808sub _draw { 1456sub draw {
809 my ($self) = @_; 1457 my ($self) = @_;
810 1458
1459 $self->{need_update}++;#d#
1460 if (delete $self->{need_update}) {
1461 glNewList $self->{list}, GL_COMPILE;
1462
1463 my $sw = int $::WIDTH / 32;
1464 my $sh = int $::HEIGHT / 32;
1465
1466 $::MAP->draw (0, 0, $sw, $sh) if $::MAP;
1467
1468 if (0) {
1469
811 my $mx = $::CONN->{mapx}; 1470 my $mx = $::CONN->{mapx};
812 my $my = $::CONN->{mapy}; 1471 my $my = $::CONN->{mapy};
813 1472
814 my $map = $::CONN->{map}; 1473 my $map = $::CONN->{map};
815 1474
816 my ($xofs, $yofs); 1475 my ($xofs, $yofs);
817 1476
818 my $sw = 1 + int $::WIDTH / 32; 1477 my $sw = 1 + int $::WIDTH / 32;
819 my $sh = 1 + int $::HEIGHT / 32; 1478 my $sh = 1 + int $::HEIGHT / 32;
820 1479
821 if ($::CONN->{mapw} > $sw) { 1480 if ($::CONN->{mapw} > $sw) {
822 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1481 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
823 } else { 1482 } else {
824 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1483 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
825 } 1484 }
826 1485
827 if ($::CONN->{maph} > $sh) { 1486 if ($::CONN->{maph} > $sh) {
828 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1487 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
829 } else { 1488 } else {
830 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1489 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
831 } 1490 }
832 1491
833 glEnable GL_TEXTURE_2D; 1492 glEnable GL_TEXTURE_2D;
834 glEnable GL_BLEND; 1493 glEnable GL_BLEND;
1494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1496 glColor 1, 1, 1, 1;
836 1497
837 my $sw4 = ($sw + 3) & ~3; 1498 my $sw4 = ($sw + 3) & ~3;
838 my $darkness = "\x00" x ($sw4 * $sh); 1499 my $darkness = "\x00" x ($sw4 * $sh);
839 1500
840 for my $x (0 .. $sw - 1) { 1501 for my $x (0 .. $sw - 1) {
841 my $row = $map->[$x + $xofs]; 1502 my $row = $map->[$x + $xofs];
842 for my $y (0 .. $sh - 1) { 1503 for my $y (0 .. $sh - 1) {
843 1504
844 my $cell = $row->[$y + $yofs] 1505 my $cell = $row->[$y + $yofs]
845 or next; 1506 or next;
846 1507
847 my $dark = $cell->[0]; 1508 my $dark = $cell->[0];
848 if ($dark < 0) { 1509 if ($dark < 0) {
849 substr $darkness, $y * $sw4 + $x, 1, chr 224; 1510 substr $darkness, $y * $sw4 + $x, 1, chr 224;
850 } else { 1511 } else {
851 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark; 1512 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
852 } 1513 }
853 1514
854 for my $num (grep $_, @$cell[1,2,3]) { 1515 for my $num (grep $_, @$cell[1,2,3]) {
855 my $tex = $::CONN->{face}[$num]{texture} || next; 1516 my $tex = $::CONN->{face}[$num]{texture} || next;
856 1517
857 my $w = $tex->{width}; 1518 my ($w, $h) = @$tex{qw(w h)};
858 my $h = $tex->{height};
859 1519
860 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1520 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1521 }
861 } 1522 }
862 } 1523 }
863 }
864 1524
865# if (1) { # higher quality darkness
866# $lighting =~ s/(.)/$1$1$1/gs;
867# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
868#
869# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
870#
871# $lighting = $pb->get_pixels;
872# $lighting =~ s/(.)../$1/gs;
873# }
874
875 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
876 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
877 1526
1527 if ($::CFG->{fow_smooth}) { # smooth fog of war
1528 my @conv = (
1529 0.1, 0.1, 0.1,
1530 0.1, 0.2, 0.1,
1531 0.1, 0.1, 0.1,
1532 );
1533 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1534 glConvolutionFilter2D GL_CONVOLUTION_2D,
1535 GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT,
1536 pack "f*", @conv;
1537 glEnable GL_CONVOLUTION_2D;
1538 }
1539
878 $darkness = new CFClient::Texture 1540 $darkness = new CFClient::Texture
879 width => $sw4, 1541 w => $sw4,
880 height => $sh, 1542 h => $sh,
881 data => $darkness, 1543 data => $darkness,
882 internalformat => GL_ALPHA, 1544 internalformat => GL_ALPHA,
883 format => GL_ALPHA; 1545 format => GL_ALPHA;
884 1546
885 glColor 0.45, 0.45, 0.45, 1; 1547 glColor +($::CFG->{fow_intensity}) x 3, 1;
886 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1548 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
887 1549
1550 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1551
888 glDisable GL_TEXTURE_2D; 1552 glDisable GL_TEXTURE_2D;
889 glDisable GL_BLEND; 1553 glDisable GL_BLEND;
1554 }
1555
1556 glEndList;
1557 }
1558
1559 glCallList $self->{list};
1560
1561 if ($FOCUS != $self) {
1562 glEnable GL_BLEND;
1563 glColor 0, 0, 1, 0.4;
1564 glBegin GL_QUADS;
1565 glVertex 0, 0;
1566 glVertex 0, $::HEIGHT;
1567 glVertex $::WIDTH, $::HEIGHT;
1568 glVertex $::WIDTH, 0;
1569 glEnd;
1570 glDisable GL_BLEND;
1571 }
890} 1572}
891 1573
892my %DIR = ( 1574my %DIR = (
893 SDLK_KP8, [1, "north"], 1575 SDLK_KP8, [1, "north"],
894 SDLK_KP9, [2, "northeast"], 1576 SDLK_KP9, [2, "northeast"],
… …
910 1592
911 my $mod = $ev->key_mod; 1593 my $mod = $ev->key_mod;
912 my $sym = $ev->key_sym; 1594 my $sym = $ev->key_sym;
913 1595
914 if ($sym == SDLK_KP5) { 1596 if ($sym == SDLK_KP5) {
915 $::CONN->send ("command stay fire"); 1597 $::CONN->user_send ("command stay fire");
1598 } elsif ($sym == SDLK_a) {
1599 $::CONN->user_send ("command apply");
916 } elsif (exists $DIR{$sym}) { 1600 } elsif (exists $DIR{$sym}) {
917 if ($mod & KMOD_SHIFT) { 1601 if ($mod & KMOD_SHIFT) {
918 $self->{shft}++; 1602 $self->{shft}++;
919 $::CONN->send ("command fire $DIR{$sym}[0]"); 1603 $::CONN->user_send ("command fire $DIR{$sym}[0]");
920 } elsif ($mod & KMOD_CTRL) { 1604 } elsif ($mod & KMOD_CTRL) {
921 $self->{ctrl}++; 1605 $self->{ctrl}++;
922 $::CONN->send ("command run $DIR{$sym}[0]"); 1606 $::CONN->user_send ("command run $DIR{$sym}[0]");
923 } else { 1607 } else {
924 $::CONN->send ("command $DIR{$sym}[1]"); 1608 $::CONN->user_send ("command $DIR{$sym}[1]");
925 } 1609 }
926 } 1610 }
927} 1611}
928 1612
929sub key_up { 1613sub key_up {
… …
931 1615
932 my $mod = $ev->key_mod; 1616 my $mod = $ev->key_mod;
933 my $sym = $ev->key_sym; 1617 my $sym = $ev->key_sym;
934 1618
935 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1619 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
936 $::CONN->send ("command fire_stop"); 1620 $::CONN->user_send ("command fire_stop");
937 } 1621 }
938 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1622 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
939 $::CONN->send ("command run_stop"); 1623 $::CONN->user_send ("command run_stop");
940 } 1624 }
941} 1625}
942 1626
943############################################################################# 1627#############################################################################
944 1628
945package CFClient::Widget::Animator; 1629package CFClient::UI::Animator;
946 1630
947use SDL::OpenGL; 1631use SDL::OpenGL;
948 1632
949our @ISA = CFClient::Widget::Bin::; 1633our @ISA = CFClient::UI::Bin::;
950 1634
951sub moveto { 1635sub moveto {
952 my ($self, $x, $y) = @_; 1636 my ($self, $x, $y) = @_;
953 1637
954 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1638 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
982 glPopMatrix; 1666 glPopMatrix;
983} 1667}
984 1668
985############################################################################# 1669#############################################################################
986 1670
987package CFClient::Widget::Toplevel; 1671package CFClient::UI::Toplevel;
988 1672
989our @ISA = CFClient::Widget::Container::; 1673our @ISA = CFClient::UI::Container::;
990 1674
991sub size_request { 1675sub size_request {
992 ($::WIDTH, $::HEIGHT) 1676 ($::WIDTH, $::HEIGHT)
993} 1677}
994 1678
995sub size_allocate { 1679sub size_allocate {
996 my ($self, $w, $h) = @_; 1680 my ($self, $x, $y, $w, $h) = @_;
997 1681
998 $self->SUPER::size_allocate ($w, $h); 1682 $self->_size_allocate ($x, $y, $w, $h);
999 1683
1000 $_->size_allocate ($_->size_request) 1684 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1001 for @{$self->{children}}; 1685 for @{$self->{children}};
1002} 1686}
1003 1687
1004sub translate { 1688sub translate {
1005 my ($self, $x, $y) = @_; 1689 my ($self, $x, $y) = @_;
… …
1008} 1692}
1009 1693
1010sub update { 1694sub update {
1011 my ($self) = @_; 1695 my ($self) = @_;
1012 1696
1013 $self->size_allocate ($self->size_request); 1697 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1014 ::refresh (); 1698 ::refresh ();
1015} 1699}
1016 1700
1017sub add { 1701sub add {
1018 my ($self, $widget) = @_; 1702 my ($self, $widget) = @_;
1019 1703
1020 $self->SUPER::add ($widget); 1704 $self->SUPER::add ($widget);
1021 1705
1022 $widget->size_allocate ($widget->size_request); 1706 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1023} 1707}
1024 1708
1025sub draw { 1709sub draw {
1026 my ($self) = @_; 1710 my ($self) = @_;
1027 1711
1028 $self->_draw; 1712 $self->_draw;
1029} 1713}
1030 1714
1031############################################################################# 1715#############################################################################
1032 1716
1033package CFClient::Widget; 1717package CFClient::UI;
1034 1718
1035$TOPLEVEL = new CFClient::Widget::Toplevel; 1719$TOPLEVEL = new CFClient::UI::Toplevel;
1036 1720
10371 17211
1038 1722

Diff Legend

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