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.40 by root, Sun Apr 9 21:41:11 2006 UTC vs.
Revision 1.63 by root, Tue Apr 11 13:29:24 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
11 16
12# class methods for events 17# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
15sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
16sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
17 74
18sub new { 75sub new {
19 my $class = shift; 76 my $class = shift;
20 77
21 bless { @_ }, $class 78 bless { @_ }, $class
… …
42 99
43 $self->{w} = $w; 100 $self->{w} = $w;
44 $self->{h} = $h; 101 $self->{h} = $h;
45} 102}
46 103
104# translate global koordinates to local coordinate system
105sub translate {
106 my ($self, $x, $y) = @_;
107
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
109}
110
47sub focus_in { 111sub focus_in {
48 my ($widget) = @_; 112 my ($self) = @_;
49 $FOCUS = $widget; 113
114 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus;
116 $FOCUS->update;
50} 117}
51 118
52sub focus_out { 119sub focus_out {
53 my ($widget) = @_; 120 my ($self) = @_;
54}
55 121
56sub key_down { 122 return unless $FOCUS == $self;
57 my ($widget, $sdlev) = @_;
58}
59 123
60sub key_up { 124 my $focus = $FOCUS; undef $FOCUS;
61 my ($widget, $sdlev) = @_; 125 $focus->update if $focus; #?
62} 126}
63 127
128sub mouse_motion { }
129sub button_up { }
64sub button_down { 130sub button_down { }
65 my ($widget, $sdlev) = @_; 131sub key_down { }
66} 132sub key_up { }
67 133
68sub button_up {
69 my ($widget, $sdlev) = @_;
70}
71
72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77 139
78sub draw { 140sub draw {
79 my ($self) = @_; 141 my ($self) = @_;
80 142
81 glPushMatrix; 143 glPushMatrix;
82 glTranslate $self->{x}, $self->{y}, 0; 144 glTranslate $self->{x}, $self->{y}, 0;
83 $self->_draw; 145 $self->_draw;
146 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4;
148 glEnable GL_BLEND;
149 glBegin GL_QUADS;
150 glVertex 0 , 0;
151 glVertex $self->{w}, 0;
152 glVertex $self->{w}, $self->{h};
153 glVertex 0 , $self->{h};
154 glEnd;
155 glDisable GL_BLEND;
156 }
84 glPopMatrix; 157 glPopMatrix;
85} 158}
86 159
87sub _draw { 160sub _draw {
88 my ($self) = @_; 161 my ($self) = @_;
… …
137 #$self->deactivate; 210 #$self->deactivate;
138} 211}
139 212
140############################################################################# 213#############################################################################
141 214
142package Crossfire::Client::Widget::Container; 215package CFClient::Widget::Container;
143 216
144our @ISA = Crossfire::Client::Widget::; 217our @ISA = CFClient::Widget::;
145 218
146sub new { 219sub new {
147 my ($class, @widgets) = @_; 220 my ($class, @widgets) = @_;
148 221
149 my $self = $class->SUPER::new (children => []); 222 my $self = $class->SUPER::new (children => []);
… …
160 233
161 @{$self->{children}} = 234 @{$self->{children}} =
162 sort { $a->{z} <=> $b->{z} } 235 sort { $a->{z} <=> $b->{z} }
163 @{$self->{children}}, $chld; 236 @{$self->{children}}, $chld;
164 237
165 $self->size_allocate ($self->{w}, $self->{h}); 238 $self->size_allocate ($self->{w}, $self->{h})
239 if $self->{w}; #TODO: check for "realised state"
166} 240}
167 241
168sub remove { 242sub remove {
169 my ($self, $widget) = @_; 243 my ($self, $widget) = @_;
170 244
… …
174} 248}
175 249
176sub find_widget { 250sub find_widget {
177 my ($self, $x, $y) = @_; 251 my ($self, $x, $y) = @_;
178 252
253 $x -= $self->{x};
254 $y -= $self->{y};
255
179 my $res; 256 my $res;
180 257
181 for (@{ $self->{children} }) { 258 for (reverse @{ $self->{children} }) {
182 $res = $_->find_widget ($x, $y) 259 $res = $_->find_widget ($x, $y)
183 and return $res; 260 and return $res;
184 } 261 }
185 262
186 () 263 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
187}
188
189sub size_request {
190 my ($self) = @_;
191
192 my ($hs, $ws) = (0, 0);
193 for (@{$self->{children} || []}) {
194 my ($w, $h) = $_->size_request;
195 $hs += $h;
196 if ($ws < $w) { $ws = $w }
197 }
198
199 return ($ws, $hs);
200} 264}
201 265
202sub _draw { 266sub _draw {
203 my ($self) = @_; 267 my ($self) = @_;
204 268
205 $_->draw for @{$self->{children}}; 269 $_->draw for @{$self->{children}};
206} 270}
207 271
208############################################################################# 272#############################################################################
209 273
210package Crossfire::Client::Widget::Bin; 274package CFClient::Widget::Bin;
211 275
212our @ISA = Crossfire::Client::Widget::Container::; 276our @ISA = CFClient::Widget::Container::;
213 277
214sub child { $_[0]->{children}[0] } 278sub child { $_[0]->{children}[0] }
215 279
216sub size_request { 280sub size_request {
217 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 281 $_[0]{children}[0]->size_request if $_[0]{children}[0];
218} 282}
219 283
220sub size_allocate { 284sub size_allocate {
221 my ($self, $w, $h) = @_; 285 my ($self, $w, $h) = @_;
286
222 $self->SUPER::size_allocate ($w, $h); 287 $self->SUPER::size_allocate ($w, $h);
223 $self->{children}[0]->size_allocate ($w, $h) 288 $self->{children}[0]->size_allocate ($w, $h)
224 if $self->{children}[0] 289 if $self->{children}[0]
225} 290}
226 291
227############################################################################# 292#############################################################################
228 293
229package Crossfire::Client::Widget::Toplevel; 294package CFClient::Widget::Window;
230 295
231our @ISA = Crossfire::Client::Widget::Container::; 296our @ISA = CFClient::Widget::Bin::;
297
298use SDL::OpenGL;
299
300sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_;
302
303 my $self = $class->SUPER::new;
304
305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306}
232 307
233sub update { 308sub update {
234 my ($self) = @_; 309 my ($self) = @_;
235 310
236 ::refresh (); 311 # we want to do this delayed...
237}
238
239#############################################################################
240
241package Crossfire::Client::Widget::Window;
242
243our @ISA = Crossfire::Client::Widget::Bin::;
244
245use SDL::OpenGL;
246
247sub add {
248 my ($self, $chld) = @_;
249 warn "ADD $chld\n";
250 $self->SUPER::add ($chld);
251 $chld->set_parent ($self);
252}
253
254sub remove {
255 my ($self) = @_;
256 # TODO FIXME: removing a child from a window will crash, see render_chld
257 # $self->update;
258}
259
260sub update {
261 my ($self) = @_;
262 $self->render_chld; 312 $self->render_chld;
313 $self->SUPER::update;
263} 314}
264 315
265sub render_chld { 316sub render_chld {
266 my ($self) = @_; 317 my ($self) = @_;
267 my $chld = $self->get;
268 my ($w, $h) = $self->size_request;
269 318
270 require Carp;
271 Carp::cluck "RENDERCHI $w $h";
272 warn "RENDERCHI $w $h\n";
273 $self->{texture} = 319 $self->{texture} =
274 Crossfire::Client::Texture->new_from_opengl ( 320 CFClient::Texture->new_from_opengl (
275 $w, $h, sub { $chld->draw } 321 $self->{w}, $self->{h}, sub { $self->child->draw }
276 ); 322 );
277 $self->{texture}->upload;
278}
279
280sub size_request {
281 my ($self) = @_;
282 ($self->w, $self->h)
283} 323}
284 324
285sub size_allocate { 325sub size_allocate {
286 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
287 327
288 $self->w ($w); 328 $self->{w} = $w;
289 $self->h ($h); 329 $self->{h} = $h;
330
290 $self->get->size_allocate ($w, $h); 331 $self->child->size_allocate ($w, $h);
291 332
292 $self->update; #TODO: Move this to the size_request event propably? 333 $self->render_chld;
293} 334}
294 335
295sub _draw { 336sub _draw {
296 my ($self) = @_; 337 my ($self) = @_;
297 338
… …
301 or return; 342 or return;
302 343
303 glEnable GL_BLEND; 344 glEnable GL_BLEND;
304 glEnable GL_TEXTURE_2D; 345 glEnable GL_TEXTURE_2D;
305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
306 glBindTexture GL_TEXTURE_2D, $tex->{name};
307 347
308 glBegin GL_QUADS; 348 $tex->draw_quad (0, 0, $w, $h);
309 glTexCoord 0, 0; glVertex 0, 0;
310 glTexCoord 0, 1; glVertex 0, $h;
311 glTexCoord 1, 1; glVertex $w, $h;
312 glTexCoord 1, 0; glVertex $w, 0;
313 glEnd;
314 349
315 glDisable GL_BLEND; 350 glDisable GL_BLEND;
316 glDisable GL_TEXTURE_2D; 351 glDisable GL_TEXTURE_2D;
317} 352}
318 353
319############################################################################# 354#############################################################################
320 355
321package Crossfire::Client::Widget::Frame; 356package CFClient::Widget::Frame;
322 357
323our @ISA = Crossfire::Client::Widget::Bin::; 358our @ISA = CFClient::Widget::Bin::;
324 359
325use SDL::OpenGL; 360use SDL::OpenGL;
326 361
327sub size_request { 362sub size_request {
328 my ($self) = @_; 363 my ($self) = @_;
… …
334 map { $_ + 4 } $chld->size_request; 369 map { $_ + 4 } $chld->size_request;
335} 370}
336 371
337sub size_allocate { 372sub size_allocate {
338 my ($self, $w, $h) = @_; 373 my ($self, $w, $h) = @_;
339 374
340 $self->w ($w); 375 $self->{w} = $w;
341 $self->h ($h); 376 $self->{h} = $h;
342 377
343 $self->child->size_allocate ($w - 4, $h - 4); 378 $self->child->size_allocate ($w - 4, $h - 4);
344 $self->child->move (2, 2); 379 $self->child->move (2, 2);
345} 380}
346 381
… …
351 386
352 my ($w, $h) = $chld->size_request; 387 my ($w, $h) = $chld->size_request;
353 388
354 glBegin GL_QUADS; 389 glBegin GL_QUADS;
355 glColor 0, 0, 0; 390 glColor 0, 0, 0;
356 glTexCoord 0, 0; glVertex 0 , 0; 391 glVertex 0 , 0;
357 glTexCoord 0, 1; glVertex 0 , $h + 4; 392 glVertex 0 , $h + 4;
358 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 393 glVertex $w + 4 , $h + 4;
359 glTexCoord 1, 0; glVertex $w + 4 , 0; 394 glVertex $w + 4 , 0;
360 glEnd; 395 glEnd;
361 396
362 $chld->draw; 397 $chld->draw;
363} 398}
364 399
365############################################################################# 400#############################################################################
366 401
367package Crossfire::Client::Widget::FancyFrame; 402package CFClient::Widget::FancyFrame;
368 403
369our @ISA = Crossfire::Client::Widget::Frame::; 404our @ISA = CFClient::Widget::Bin::;
370 405
371use SDL::OpenGL; 406use SDL::OpenGL;
372 407
373sub new { 408my @tex =
374 my ($self, $theme) = @_;
375 $self = $self->SUPER::new;
376
377 $self->{txts} = [
378 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 409 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
379 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png) 410 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
380 ];
381 $self
382}
383 411
384sub size_request { 412sub size_request {
385 my ($self) = @_; 413 my ($self) = @_;
386 414
387 my ($w, $h) = $self->SUPER::size_request; 415 my ($w, $h) = $self->SUPER::size_request;
388 416
389 $h += $self->{txts}->[1]->{height}; 417 $h += $tex[1]->{height};
390 $h += $self->{txts}->[4]->{height}; 418 $h += $tex[4]->{height};
391 $w += $self->{txts}->[2]->{width}; 419 $w += $tex[2]->{width};
392 $w += $self->{txts}->[3]->{width}; 420 $w += $tex[3]->{width};
393 421
394 ($w, $h) 422 ($w, $h)
395} 423}
396 424
397sub size_allocate { 425sub size_allocate {
398 my ($self, $w, $h) = @_; 426 my ($self, $w, $h) = @_;
399 427
400 $self->SUPER::size_allocate ($w, $h); 428 $self->SUPER::size_allocate ($w, $h);
401 429
402 $h -= $self->{txts}->[1]->{height}; 430 $h -= $tex[1]->{height};
403 $h -= $self->{txts}->[4]->{height}; 431 $h -= $tex[4]->{height};
404 $w -= $self->{txts}->[2]->{width}; 432 $w -= $tex[2]->{width};
405 $w -= $self->{txts}->[3]->{width}; 433 $w -= $tex[3]->{width};
406 434
407 $h = $h < 0 ? 0 : $h; 435 $h = $h < 0 ? 0 : $h;
408 $w = $w < 0 ? 0 : $w; 436 $w = $w < 0 ? 0 : $w;
409 warn "CHILD:$w $h\n"; 437
410 $self->child->size_allocate ($w, $h); 438 $self->child->size_allocate ($w, $h);
411 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 439 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
412} 440}
413 441
414sub _draw { 442sub _draw {
415 my ($self) = @_; 443 my ($self) = @_;
416 444
417 my ($w, $h) = ($self->w, $self->h); 445 my ($w, $h) = ($self->{w}, $self->{h});
418 my ($cw, $ch) = ($self->child->w, $self->child->h); 446 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
419 447
420 glEnable GL_BLEND; 448 glEnable GL_BLEND;
421 glEnable GL_TEXTURE_2D; 449 glEnable GL_TEXTURE_2D;
422 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
423 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
424 452
425 my $top = $self->{txts}->[1]; 453 my $top = $tex[1];
426 glBindTexture GL_TEXTURE_2D, $top->{name}; 454 $top->draw_quad (0, 0, $w, $top->{height});
427 455
428 glBegin GL_QUADS;
429 glTexCoord 0, 0; glVertex 0 , 0;
430 glTexCoord 0, 1; glVertex 0 , $top->{height};
431 glTexCoord 1, 1; glVertex $w , $top->{height};
432 glTexCoord 1, 0; glVertex $w , 0;
433 glEnd;
434
435 my $left = $self->{txts}->[3]; 456 my $left = $tex[3];
436 glBindTexture GL_TEXTURE_2D, $left->{name}; 457 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
437 458
438 glBegin GL_QUADS;
439 glTexCoord 0, 0; glVertex 0 , $top->{height};
440 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
441 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
442 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
443 glEnd;
444
445 my $right = $self->{txts}->[2]; 459 my $right = $tex[2];
446 glBindTexture GL_TEXTURE_2D, $right->{name}; 460 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
447 461
448 glBegin GL_QUADS;
449 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
450 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
451 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
452 glTexCoord 1, 0; glVertex $w , $top->{height};
453 glEnd;
454
455 my $bottom = $self->{txts}->[4]; 462 my $bottom = $tex[4];
456 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 463 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
457 464
458 glBegin GL_QUADS; 465 my $bg = $tex[0];
459 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
460 glTexCoord 0, 1; glVertex 0 , $h;
461 glTexCoord 1, 1; glVertex $w , $h;
462 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
463 glEnd;
464
465 my $bg = $self->{txts}->[0];
466 glBindTexture GL_TEXTURE_2D, $bg->{name}; 466 glBindTexture GL_TEXTURE_2D, $bg->{name};
467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
469 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 469 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
470 470
471 my $rep_x = $cw / $bg->{width}; 471 my $rep_x = $cw / $bg->{width};
472 my $rep_y = $ch / $bg->{height}; 472 my $rep_y = $ch / $bg->{height};
473 473
474 glBegin GL_QUADS; 474 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
475 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
476 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
477 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
478 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
479 glEnd;
480 475
481 glDisable GL_BLEND; 476 glDisable GL_BLEND;
482 glDisable GL_TEXTURE_2D; 477 glDisable GL_TEXTURE_2D;
483 478
484 $self->child->draw; 479 $self->child->draw;
485 480
486} 481}
487 482
488############################################################################# 483#############################################################################
489 484
490package Crossfire::Client::Widget::Table; 485package CFClient::Widget::Table;
491 486
492our @ISA = Crossfire::Client::Widget::Bin::; 487our @ISA = CFClient::Widget::Bin::;
493 488
494use SDL::OpenGL; 489use SDL::OpenGL;
495 490
496sub add { 491sub add {
497 my ($self, $x, $y, $chld) = @_; 492 my ($self, $x, $y, $chld) = @_;
… …
572 } 567 }
573} 568}
574 569
575############################################################################# 570#############################################################################
576 571
577package Crossfire::Client::Widget::VBox; 572package CFClient::Widget::VBox;
578 573
579our @ISA = Crossfire::Client::Widget::Container::; 574our @ISA = CFClient::Widget::Container::;
580 575
581use SDL::OpenGL; 576use SDL::OpenGL;
577
578sub size_request {
579 my ($self) = @_;
580
581 my @alloc = map [$_->size_request], @{$self->{children}};
582
583 (
584 (List::Util::max map $_->[0], @alloc),
585 (List::Util::sum map $_->[1], @alloc),
586 )
587}
582 588
583sub size_allocate { 589sub size_allocate {
584 my ($self, $w, $h) = @_; 590 my ($self, $w, $h) = @_;
585 591
586 $self->w ($w); 592 $self->w ($w);
… …
619 $y += $h; 625 $y += $h;
620 } 626 }
621 } 627 }
622} 628}
623 629
624sub _draw {
625 my ($self) = @_;
626
627 my ($x, $y);
628 for (@{$self->{children} || []}) {
629 $_->draw;
630 $y += $_->h;
631 }
632}
633
634############################################################################# 630#############################################################################
635 631
636package Crossfire::Client::Widget::Label; 632package CFClient::Widget::Label;
637 633
638our @ISA = Crossfire::Client::Widget::; 634our @ISA = CFClient::Widget::;
639 635
640use SDL::OpenGL; 636use SDL::OpenGL;
641 637
642sub new { 638sub new {
643 my ($class, $x, $y, $z, $height, $text) = @_; 639 my ($class, $x, $y, $z, $height, $text) = @_;
644 640
641 $height ||= $::FONTSIZE;
642
645 # TODO: color, and make height, xyz etc. optional 643 # TODO: color, and make height, xyz etc. optional
646 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 644 my $self = $class->SUPER::new (
645 color => [1, 1, 1],
646 x => $x,
647 y => $y,
648 z => $z,
649 height => $height,
650 layout => new CFClient::Layout $height,
651 );
647 652
648 $self->set_text ($text); 653 $self->set_text ($text);
649 654
650 $self 655 $self
651} 656}
652 657
653sub set_text { 658sub set_text {
654 my ($self, $text) = @_; 659 my ($self, $text) = @_;
655 660
656 $self->{text} = $text; 661 $self->{text} = $text;
657 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 662 $self->{layout}->set_markup ($text);
658 663
659 $self->update; 664 delete $self->{texture};
660} 665}
661 666
662sub get_text { 667sub get_text {
663 my ($self, $text) = @_; 668 my ($self, $text) = @_;
664 669
… …
666} 671}
667 672
668sub size_request { 673sub size_request {
669 my ($self) = @_; 674 my ($self) = @_;
670 675
671 ( 676 $self->{layout}->set_width;
677 $self->{layout}->size
678# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
679# (
672 $self->{texture}{width}, 680# $self->{texture}{width},
673 $self->{texture}{height}, 681# $self->{texture}{height},
674 ) 682# )
683# } else {
684# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
685#
686# ($w, $h)
687# }
688}
689
690sub size_allocate {
691 my ($self, $w, $h) = @_;
692
693 $self->SUPER::size_allocate ($w, $h);
694 delete $self->{texture};
675} 695}
676 696
677sub _draw { 697sub _draw {
678 my ($self) = @_; 698 my ($self) = @_;
679 699
680 my $tex = $self->{texture}; 700 my $tex = $self->{texture} ||= do {
701 $self->{layout}->set_width ($self->{w});
702 new_from_layout CFClient::Texture $self->{layout};
703 };
681 704
682 glEnable GL_BLEND; 705 glEnable GL_BLEND;
683 glEnable GL_TEXTURE_2D; 706 glEnable GL_TEXTURE_2D;
684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 707 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
686 glBindTexture GL_TEXTURE_2D, $tex->{name};
687 709
688 glColor 1, 0, 0, 1; # TODO color 710 glColor @{$self->{color}};
689 711
690 glBegin GL_QUADS; 712 $tex->draw_quad (0, 0);
691 glTexCoord 0, 0; glVertex 0 , 0;
692 glTexCoord 0, 1; glVertex 0 , $tex->{height};
693 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
694 glTexCoord 1, 0; glVertex $tex->{width}, 0;
695 glEnd;
696 713
697 glDisable GL_BLEND; 714 glDisable GL_BLEND;
698 glDisable GL_TEXTURE_2D; 715 glDisable GL_TEXTURE_2D;
699} 716}
700 717
701############################################################################# 718#############################################################################
702 719
703package Crossfire::Client::Widget::TextEntry; 720package CFClient::Widget::Entry;
704 721
705our @ISA = Crossfire::Client::Widget::Label::; 722our @ISA = CFClient::Widget::Label::;
706 723
707use SDL; 724use SDL;
708use SDL::OpenGL; 725use SDL::OpenGL;
709 726
710sub key_down { 727sub key_down {
711 my ($self, $ev) = @_; 728 my ($self, $ev) = @_;
712 729
713 my $mod = $ev->key_mod; 730 my $mod = $ev->key_mod;
714 my $sym = $ev->key_sym; 731 my $sym = $ev->key_sym;
715 732
716 $ev->set_unicode (1);
717 my $uni = $ev->key_unicode; 733 my $uni = $ev->key_unicode;
718 734
719 my $text = $self->get_text; 735 my $text = $self->get_text;
720 736
721 if ($sym == SDLK_BACKSPACE) { 737 if ($sym == SDLK_BACKSPACE) {
722 substr $text, -1, 1, ''; 738 substr $text, -1, 1, '';
723
724 } elsif ($uni) { 739 } elsif ($uni) {
725 $text .= chr $uni; 740 $text .= chr $uni;
726 } 741 }
742
727 $self->set_text ($text); 743 $self->set_text ($text);
728} 744}
729 745
730############################################################################# 746sub button_down {
747 my ($self, $ev) = @_;
731 748
749 $self->focus_in;
750}
751
752sub mouse_motion {
753 my ($self, $ev, $x, $y) = @_;
754 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
755}
756
757sub _draw {
758 my ($self) = @_;
759
760 if ($FOCUS == $self) {
761 glColor 1, 1, 1;
762 } else {
763 glColor 0.7, 0.7, 0.7;
764 }
765
766 glBegin GL_QUADS;
767 glVertex 0 , 0;
768 glVertex 0 , $self->{h} - 1;
769 glVertex $self->{w} - 1, $self->{h} - 1;
770 glVertex $self->{w} - 1, 0;
771 glEnd;
772
773 $self->SUPER::_draw;
774}
775
776#############################################################################
777
732package Crossfire::Client::Widget::MapWidget; 778package CFClient::Widget::MapWidget;
733 779
734use strict; 780use strict;
735 781
736use List::Util qw(min max); 782use List::Util qw(min max);
737 783
738use SDL; 784use SDL;
739use SDL::OpenGL; 785use SDL::OpenGL;
740use SDL::OpenGL::Constants; 786use SDL::OpenGL::Constants;
741 787
742our @ISA = Crossfire::Client::Widget::; 788our @ISA = CFClient::Widget::;
743 789
744sub key_down { 790sub key_down {
745 print "MAPKEYDOWN\n"; 791 print "MAPKEYDOWN\n";
746} 792}
747 793
748sub key_up { 794sub key_up {
749} 795}
750 796
751sub size_request { 797sub size_request {
752 798 (
753} 799 1 + int $::WIDTH / 32,
754 800 1 + int $::HEIGHT / 32,
755sub size_allocate { 801 )
756} 802}
757 803
758sub _draw { 804sub _draw {
759 my ($self) = @_; 805 my ($self) = @_;
760 806
… …
783 glEnable GL_TEXTURE_2D; 829 glEnable GL_TEXTURE_2D;
784 glEnable GL_BLEND; 830 glEnable GL_BLEND;
785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
786 832
787 my $sw4 = ($sw + 3) & ~3; 833 my $sw4 = ($sw + 3) & ~3;
788 my $lighting = "\x00" x ($sw4 * $sh); 834 my $darkness = "\x00" x ($sw4 * $sh);
789 835
790 for my $x (0 .. $sw - 1) { 836 for my $x (0 .. $sw - 1) {
837 my $row = $map->[$x + $xofs];
791 for my $y (0 .. $sh - 1) { 838 for my $y (0 .. $sh - 1) {
792 839
793 my $cell = $map->[$x + $xofs][$y + $yofs] 840 my $cell = $row->[$y + $yofs]
794 or next; 841 or next;
795 842
796 my $darkness = $cell->[0] * (1 / 255); 843 my $dark = $cell->[0];
797 if ($darkness < 0) { 844 if ($dark < 0) {
798 $darkness = 0.15; 845 substr $darkness, $y * $sw4 + $x, 1, chr 224;
846 } else {
847 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
799 } 848 }
800 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
801 849
802 for my $num (grep $_, @$cell[1,2,3]) { 850 for my $num (grep $_, @$cell[1,2,3]) {
803 my $tex = $::CONN->{face}[$num]{texture} || next; 851 my $tex = $::CONN->{face}[$num]{texture} || next;
804 852
805 glBindTexture GL_TEXTURE_2D, $tex->{name};
806
807 my $w = $tex->{width}; 853 my $w = $tex->{width};
808 my $h = $tex->{height}; 854 my $h = $tex->{height};
809 855
810 my $px = ($x + 1) * 32 - $w; 856 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
811 my $py = ($y + 1) * 32 - $h;
812
813 glBegin GL_QUADS;
814 glTexCoord 0, 0; glVertex $px , $py;
815 glTexCoord 0, 1; glVertex $px , $py + $h;
816 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
817 glTexCoord 1, 0; glVertex $px + $w, $py;
818 glEnd;
819 } 857 }
820 } 858 }
821 } 859 }
822 860
823# if (1) { # higher quality darkness 861# if (1) { # higher quality darkness
… …
828# 866#
829# $lighting = $pb->get_pixels; 867# $lighting = $pb->get_pixels;
830# $lighting =~ s/(.)../$1/gs; 868# $lighting =~ s/(.)../$1/gs;
831# } 869# }
832 870
833 $lighting = new Crossfire::Client::Texture 871 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
873
874 $darkness = new CFClient::Texture
834 width => $sw4, 875 width => $sw4,
835 height => $sh, 876 height => $sh,
836 data => $lighting, 877 data => $darkness,
837 internalformat => GL_ALPHA4, 878 internalformat => GL_ALPHA,
838 format => GL_ALPHA; 879 format => GL_ALPHA;
839 880
840 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 881 glColor 0.45, 0.45, 0.45, 1;
841 glColor 0, 0, 0, 0.75; 882 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
843 glBindTexture GL_TEXTURE_2D, $lighting->{name};
844 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
845 glBegin GL_QUADS;
846 glTexCoord 0, 0; glVertex 0 , 0;
847 glTexCoord 0, 1; glVertex 0 , $sh * 32;
848 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
849 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
850 glEnd;
851 883
852 glDisable GL_TEXTURE_2D; 884 glDisable GL_TEXTURE_2D;
853 glDisable GL_BLEND; 885 glDisable GL_BLEND;
854} 886}
855 887
… …
904 } 936 }
905} 937}
906 938
907############################################################################# 939#############################################################################
908 940
909package Crossfire::Client::Widget::Animator; 941package CFClient::Widget::Animator;
910 942
911use SDL::OpenGL; 943use SDL::OpenGL;
912 944
913our @ISA = Crossfire::Client::Widget::Bin::; 945our @ISA = CFClient::Widget::Bin::;
914 946
915sub moveto { 947sub moveto {
916 my ($self, $x, $y) = @_; 948 my ($self, $x, $y) = @_;
917 949
918 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 950 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
919 $self->{speed} = 0.2; 951 $self->{speed} = 0.001;
920 $self->{time} = 1; 952 $self->{time} = 1;
921 953
922 ::animation_start $self; 954 ::animation_start $self;
923} 955}
924 956
… …
939 971
940sub _draw { 972sub _draw {
941 my ($self) = @_; 973 my ($self) = @_;
942 974
943 glPushMatrix; 975 glPushMatrix;
944 glRotate $self->{time} * 10000, 0, 1, 0; 976 glRotate $self->{time} * 1000, 0, 1, 0;
945 $self->{children}[0]->draw; 977 $self->{children}[0]->draw;
946 glPopMatrix; 978 glPopMatrix;
947} 979}
948 980
9491; 981#############################################################################
950 982
983package CFClient::Widget::Toplevel;
984
985our @ISA = CFClient::Widget::Container::;
986
987sub size_request {
988 ($::WIDTH, $::HEIGHT)
989}
990
991sub size_allocate {
992 my ($self, $w, $h) = @_;
993
994 $self->SUPER::size_allocate ($w, $h);
995
996 $_->size_allocate ($_->size_request)
997 for @{$self->{children}};
998}
999
1000sub translate {
1001 my ($self, $x, $y) = @_;
1002
1003 ($x, $y)
1004}
1005
1006sub update {
1007 my ($self) = @_;
1008
1009 $self->size_allocate ($self->size_request);
1010 ::refresh ();
1011}
1012
1013sub add {
1014 my ($self, $widget) = @_;
1015
1016 $self->SUPER::add ($widget);
1017
1018 $widget->size_allocate ($widget->size_request);
1019}
1020
1021sub draw {
1022 my ($self) = @_;
1023
1024 $self->_draw;
1025}
1026
1027#############################################################################
1028
1029package CFClient::Widget;
1030
1031$TOPLEVEL = new CFClient::Widget::Toplevel;
1032
10331
1034

Diff Legend

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