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.47 by root, Sun Apr 9 22:24:43 2006 UTC vs.
Revision 1.82 by root, Wed Apr 12 02:00:06 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines