[ViewVC] Diff of: cvs/kgsueme/kgsueme/game.pl

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.96 by pcg, Sat May 29 02:01:43 2004 UTC vs.
Revision 1.97 by pcg, Sat May 29 06:38:27 2004 UTC

…		…
185		185
186	use KGS::Constants;	186	use KGS::Constants;
187	use KGS::Game::Board;	187	use KGS::Game::Board;
188		188
189	use Gtk2::GoBoard;	189	use Gtk2::GoBoard;
		190	use Gtk2::GoBoard::Constants;
190		191
191	use Glib::Object::Subclass	192	use Glib::Object::Subclass
192	Gtk2::Window;	193	Gtk2::Window;
193		194
194	use base KGS::Listener::Game;	195	use base KGS::Listener::Game;
…		…
288	sub event_update_users {	289	sub event_update_users {
289	my ($self, $add, $update, $remove) = @_;	290	my ($self, $add, $update, $remove) = @_;
290		291
291	# $self->{userlist}->update ($add, $update, $remove);	292	# $self->{userlist}->update ($add, $update, $remove);
292		293
		294	$self->{challenge}{$_->{name}} && (delete $self->{challenge}{$_->{name}})->{inlay}->destroy
		295	for @$remove;
		296
293	$self->{users_inlay}->refresh;	297	$self->{users_inlay}->refresh;
294		298
295	my %important;	299	my %important;
296	$important{$self->{user1}{name}}++;	300	$important{$self->{user1}{name}}++;
297	$important{$self->{user2}{name}}++;	301	$important{$self->{user2}{name}}++;
…		…
303	}	307	}
304	if (my @users = grep $important{$_->{name}}, @$remove) {	308	if (my @users = grep $important{$_->{name}}, @$remove) {
305	$self->{chat}->append_text ("\n<header>Parts:</header>");	309	$self->{chat}->append_text ("\n<header>Parts:</header>");
306	$self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;	310	$self->{chat}->append_text (" <user>" . $_->as_string . "</user>") for @users;
307	}	311	}
308
309	}	312	}
310		313
311	sub join {	314	sub join {
312	my ($self) = @_;	315	my ($self) = @_;
313	return if $self->{joined};	316	return if $self->{joined};
314		317
315	$self->SUPER::join;	318	$self->SUPER::join;
		319	}
		320
		321	sub update_cursor {
		322	my ($self) = @_;
		323
		324	my $move = int $self->{moveadj}->get_value;
		325	my $cb;
		326
		327	my $running = $move == @{$self->{path}}
		328	&& $self->is_active;
		329
		330	warn "plaiyng $self->{playing} running $running teach $self->{teacher}\n";
		331	warn !($self->{playing} && $running);
		332	warn $self->{teacher} ne $self->{app}{conn};
		333	if (!($self->{playing} && $running) && $self->{teacher} ne $self->{app}{conn}) {
		334	warn "A\n";
		335	$self->{board}->set (cursor_mask => 0, cursor_value => 0);
		336	} elsif ($self->{user1}{name} eq $self->{conn}{name}) {
		337	warn "B\n";
		338	$self->{board}->set (cursor_mask => MARK_B \| MARK_W, cursor_value => MARK_B \| MARK_GRAYED);
		339	$cb = sub {
		340	$self->send (upd_tree =>
		341	channel => $self->{channel},
		342	tree => $self->gen_move_tree (COLOUR_BLACK, $_[0], $_[1]),
		343	);
		344	};
		345	} elsif ($self->{user2}{name} eq $self->{conn}{name}) {
		346	warn "C\n";
		347	$self->{board}->set (cursor_mask => MARK_B \| MARK_W, cursor_value => MARK_W \| MARK_GRAYED);
		348	$cb = sub {
		349	$self->send (upd_tree =>
		350	channel => $self->{channel},
		351	tree => $self->gen_move_tree (COLOUR_WHITE, $_[0], $_[1]),
		352	);
		353	};
		354	}
		355
		356	$self->{board_click} = $cb;
316	}	357	}
317		358
318	sub update_board {	359	sub update_board {
319	my ($self) = @_;	360	my ($self) = @_;
320	return unless $self->{path};	361	return unless $self->{path};
…		…
338	? $self->{lastmove_time} : 0	379	? $self->{lastmove_time} : 0
339	);	380	);
340	}	381	}
341		382
342	$self->{board}->set_board ($self->{cur_board});	383	$self->{board}->set_board ($self->{cur_board});
		384
		385	$self->update_cursor;
343	}	386	}
344		387
345	sub event_update_tree {	388	sub event_update_tree {
346	my ($self) = @_;	389	my ($self) = @_;
347		390
…		…
401		444
402	sub event_join {	445	sub event_join {
403	my ($self) = @_;	446	my ($self) = @_;
404		447
405	$self->SUPER::event_join (@_);	448	$self->SUPER::event_join (@_);
		449	$self->init_tree;
406	$self->event_update_game;	450	$self->event_update_game;
407	}	451	}
408		452
409	sub event_part {	453	sub event_part {
410	my ($self) = @_;	454	my ($self) = @_;
…		…
423		467
424	$self->SUPER::event_update_game;	468	$self->SUPER::event_update_game;
425		469
426	return unless $self->{joined};	470	return unless $self->{joined};
427		471
		472	$self->{playing} = $self->{teacher} eq $self->{conn}{name}
		473	\|\| $self->is_playing ($self->{conn}{name});
		474
428	my $title = defined $self->{channel}	475	my $title = defined $self->{channel}
429	? $self->owner->as_string . " " . $self->opponent_string	476	? $self->owner->as_string . " " . $self->opponent_string
430	: "Game Window";	477	: "Game Window";
431	$self->set_title("KGS Game $title");	478	$self->set_title("KGS Game $title");
432	$self->{title}->set_text ($title);	479	$self->{title}->set_text ($title);
…		…
437	# show board	484	# show board
438	if ($self->is_inprogress) {	485	if ($self->is_inprogress) {
439	if (!$self->{boardbox}->parent) {	486	if (!$self->{boardbox}->parent) {
440	$self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});	487	$self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
441	$self->{left}->add ($self->{boardbox});	488	$self->{left}->add ($self->{boardbox});
		489	$self->{board}->signal_connect (button_release => sub {
		490	warn "XXX @_\n";#d#
		491	if ($_[1] == 1) {
		492	$self->{board_click}->($_[2], $_[3]) if $self->{board_click};
		493	}
		494	});
442	}	495	}
443	if (my $ch = delete $self->{challenge}) {	496	if (my $ch = delete $self->{challenge}) {
444	(delete $_->{inlay})->clear for values %$ch;	497	(delete $_->{inlay})->destroy for values %$ch;
445	}	498	}
		499	$self->update_cursor;
446	}	500	}
447		501
448	$self->{left}->show_all;	502	$self->{left}->show_all;
449		503
450	$self->{rules_inlay}->refresh;	504	$self->{rules_inlay}->refresh;
…		…
544	. "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)	598	. "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
545	. "</infoblock>"	599	. "</infoblock>"
546	);	600	);
547	}	601	}
548		602
		603	sub inject_new_game {
		604	my ($self, $msg) = @_;
		605
		606	$self->{chat}->append_text ("\n<header>ACK from server ($msg->{cid} == $self->{cid})</header>");
		607	delete $self->{cid};
		608	}
		609
549	sub draw_challenge {	610	sub draw_challenge {
550	my ($self, $c) = @_;	611	my ($self, $id) = @_;
551		612
		613	my $challenge = $self->{challenge}{$id};
		614
552	my $inlay = $c->{inlay};	615	my $inlay = $challenge->{inlay};
553	my $challenge = $c->{challenge};
554	my $rules = $challenge->{rules};	616	my $rules = $challenge->{rules};
		617
		618	my $as_black = $challenge->{user1}{name} eq $self->{conn}{name} ? 1 : 0;;
		619	my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
		620
		621	my ($size, $time, $interval, $count);
		622
		623	if (!$self->{channel}) {
		624	$inlay->append_text ("\nNotes: ");
		625	$inlay->append_entry (\$channel->{notes}, 20, "");
		626	$inlay->append_text ("\nGlobal Offer: ");
		627	$inlay->append_optionmenu (\$challenge->{flags},
		628	0 => "No",
		629	2 => "Yes",
		630	);
		631	} else {
		632	$inlay->append_text ("\nNotes: " . util::toxml $channel->{notes});
		633	}
		634
		635	$inlay->append_text ("\nType: ");
		636	$inlay->append_optionmenu (
		637	\$challenge->{type},
		638	GAMETYPE_DEMONSTRATION , "Demonstration",
		639	GAMETYPE_DEMONSTRATION \| GAMETYPE_PRIVATE, "Demonstration (P)",
		640	GAMETYPE_TEACHING , "Teaching",
		641	GAMETYPE_TEACHING \| GAMETYPE_PRIVATE, "Teaching (P)",
		642	GAMETYPE_SIMUL , "Simul (not yet!)",
		643	GAMETYPE_FREE , "Free",
		644	GAMETYPE_RATED , "Rated",
		645	sub {
		646	$size->set_history (2) if $_[0] eq GAMETYPE_RATED;
		647	},
		648	);
		649
		650	if ($self->{channel}) {
		651	$inlay->append_text ("\nMy Colour: ");
		652	$inlay->append_optionmenu (
		653	\$as_black,
		654	0 => "White",
		655	1 => "Black",
		656	sub {
		657	if ($challenge->{$_[0] ? "user1" : "user2"}{name} ne $self->{conn}{name}) {
		658	($challenge->{user1}, $challenge->{user2}) = ($challenge->{user2}, $challenge->{user1});
		659	}
		660	}
		661	);
		662	}
		663
		664	$inlay->append_text ("\nRuleset: ");
		665	$inlay->append_optionmenu (
		666	\$challenge->{rules}{ruleset},
		667	RULESET_JAPANESE , "Japanese",
		668	RULESET_CHINESE , "Chinese",
		669	RULESET_AGA , "AGA",
		670	RULESET_NEW_ZEALAND, "New Zealand",
		671	);
		672
		673	$inlay->append_text ("\nSize: ");
		674	$size = $inlay->append_optionmenu (
		675	\$challenge->{rules}{size}, 9 => 9, 13 => 13, 19 => 19, map +($_, $_), 2..38
		676	);
		677
		678	if ($self->{channel}) {
		679	$inlay->append_text ("\nHandicap: ");
		680	$inlay->append_optionmenu (\$challenge->{rules}{handicap}, map +($_, $_), 0..9);
		681
		682	$inlay->append_text ("\nKomi: ");
		683	$inlay->append_entry (\$challenge->{rules}{komi}, 5);
		684	}
		685
		686	$inlay->append_text ("\nTimesys: ");
		687	$inlay->append_optionmenu (
		688	\$challenge->{rules}{timesys},
		689	&TIMESYS_NONE => "None",
		690	&TIMESYS_ABSOLUTE => "Absolute",
		691	&TIMESYS_BYO_YOMI => "Byo Yomi",
		692	&TIMESYS_CANADIAN => "Canadian",
		693	sub {
		694	my ($new) = @_;
		695
		696	if ($new eq TIMESYS_NONE) {
		697	$time->hide;
		698	$interval->hide;
		699	$count->hide;
		700	} else {
		701	$time->show;
		702	$time->set_text ($self->{app}{defaults}{time});
		703	if ($new eq TIMESYS_ABSOLUTE) {
		704	$interval->hide;
		705	$count->hide;
		706	} else {
		707	$interval->show;
		708	$count->show;
		709	if ($new eq TIMESYS_BYO_YOMI) {
		710	$interval->set_text ($self->{app}{defaults}{byo_time});
		711	$count->set_text ($self->{app}{defaults}{byo_period});
		712	} elsif ($new eq TIMESYS_CANADIAN) {
		713	$interval->set_text ($self->{app}{defaults}{can_time});
		714	$count->set_text ($self->{app}{defaults}{can_period});
		715	}
		716	}
		717	}
		718	}
		719	);
		720
		721	$inlay->append_text ("\nMain Time: ");
		722	$time = $inlay->append_entry (\$challenge->{rules}{time}, 5);
		723	$inlay->append_text ("\nInterval: ");
		724	$interval = $inlay->append_entry (\$challenge->{rules}{interval}, 3);
		725	$inlay->append_text ("\nPeriods/Stones: ");
		726	$count = $inlay->append_entry (\$challenge->{rules}{count}, 2);
		727
		728	$inlay->append_text ("\n");
		729
		730	if (!$self->{channel}) {
		731	$inlay->append_button ("Create Challenge", sub {
		732	$inlay->clear;
		733	$self->{cid} = $self->{conn}->alloc_clientid;
		734	$self->send (new_game =>
		735	channel => delete $self->{roomid},
		736	cid => $self->{cid},
		737	type => $challenge->{type},
		738	flags => $challenge->{flags},
		739	rules => $challenge->{rules},
		740	notes => $challenge->{notes},
		741	);
		742	});
		743	} else {
		744	$inlay->append_button ("OK", sub {
		745	$inlay->clear;
		746	$self->send (challenge =>
		747	channel => $self->{channel},
		748	challenge => $challenge,
		749	);
		750	});
		751	if (exists $self->{challenge}{""}) {
		752	$inlay->append_button ("Reject", sub {
		753	$inlay->clear;
		754	$self->send (reject_challenge =>
		755	channel => $self->{channel},
		756	name => $opponent->{name},
		757	);
		758	});
		759	}
		760	}
		761	}
		762
		763	sub draw_users {
		764	my ($self, $inlay) = @_;
		765
		766	for (sort keys %{$self->{users}}) {
		767	$inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
		768	}
		769	}
		770
		771	sub event_challenge {
		772	my ($self, $challenge) = @_;
555		773
556	my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};	774	my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
557	my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};	775	my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
558		776
559	$inlay->append_text ("\n<challenge>Challenge to <user>" . $opponent->as_string . "</user></challenge>");	777	my $id = $opponent->{name};
560	$inlay->append_text ("\nHandicap: $rules->{handicap}");
561		778
562	#bless( (
563	# gametype => 3,
564	# user1 => bless( {
565	# flags => 2633,
566	# name => 'dorkusx'
567	# }, 'KGS::User' ),
568	# rules => bless( {
569	# count => 5,
570	# time => 900,
571	# timesys => 2,
572	# interval => 30,
573	# komi => '6.5',
574	# size => 19,
575	# ruleset => 0,
576	# handicap => 0
577	# }, 'KGS::Rules' ),
578	# user2 => bless( {
579	# flags => 436220808,
580	# name => 'Nerdamus'
581	# }, 'KGS::User' )
582	# ), 'KGS::Challenge' )
583	}
584
585	sub draw_users {
586	my ($self, $inlay) = @_;
587
588	for (sort keys %{$self->{users}}) {
589	$inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
590	}
591	}
592
593	sub event_challenge {
594	my ($self, $challenge) = @_;
595
596	my $as_black = $challenge->{user1}{name} eq $self->{conn}{name};
597	my $opponent = $as_black ? $challenge->{user2} : $challenge->{user1};
598
599	my $c = $self->{challenge}{$opponent->{name}} \|\|= {};
600
601	$c->{inlay} \|\|= $self->{chat}->new_inlay;
602	$c->{challenge} = $challenge;	779	$self->{challenge}{$id} = $challenge;
603		780	$self->{chat}->new_switchable_inlay (
		781	exists $self->{challenge}{""} ? "Challenge from $opponent->{name}" : "Challenge to $opponent->{name}",
		782	sub {
		783	$self->{challenge}{$id}{inlay} = $_[0];
604	$self->draw_challenge ($c);	784	$self->draw_challenge ($id);
605		785	},
606	# require KGS::Listener::Debug;	786	!exists $self->{challenge}{""} # only open when not offerer
607	# $self->{chat}->append_text ("\n".KGS::Listener::Debug::dumpval($challenge));	787	);
608	}	788	}
609		789
610	1;	790	1;
611		791

Diff Legend

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

Comparing kgsueme/kgsueme/game.pl (file contents): Revision 1.96 by pcg, Sat May 29 02:01:43 2004 UTC vs. Revision 1.97 by pcg, Sat May 29 06:38:27 2004 UTC

Diff Legend

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.96 by pcg, Sat May 29 02:01:43 2004 UTC vs.
Revision 1.97 by pcg, Sat May 29 06:38:27 2004 UTC